aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am23
-rw-r--r--configure.ac119
-rw-r--r--contrib/README.md2
-rw-r--r--contrib/bitcoin-qt.pro1
-rw-r--r--contrib/devtools/README.md11
-rwxr-xr-xcontrib/devtools/fix-copyright-headers.py53
-rw-r--r--contrib/gitian-descriptors/boost-linux.yml23
-rw-r--r--contrib/gitian-descriptors/boost-win.yml86
-rw-r--r--contrib/gitian-descriptors/boost-win32.yml65
-rw-r--r--contrib/gitian-descriptors/deps-linux.yml34
-rw-r--r--contrib/gitian-descriptors/deps-win.yml128
-rw-r--r--contrib/gitian-descriptors/deps-win32.yml101
-rw-r--r--contrib/gitian-descriptors/gitian-linux.yml20
-rw-r--r--contrib/gitian-descriptors/gitian-win.yml97
-rw-r--r--contrib/gitian-descriptors/gitian-win32.yml62
-rw-r--r--contrib/gitian-descriptors/protobuf-win.yml65
-rw-r--r--contrib/gitian-descriptors/protobuf-win32.yml45
-rw-r--r--contrib/gitian-descriptors/qt-win.yml92
-rw-r--r--contrib/gitian-descriptors/qt-win32.yml60
-rw-r--r--contrib/linearize/example-linearize.cfg2
-rw-r--r--contrib/linearize/linearize.py4
-rwxr-xr-xcontrib/verifysfbinaries/verify.sh2
-rw-r--r--doc/README.md6
-rw-r--r--doc/README_windows.txt5
-rw-r--r--doc/build-osx.md14
-rw-r--r--doc/build-unix.md8
-rw-r--r--doc/release-notes.md305
-rw-r--r--doc/release-notes/release-notes-0.3.12.md13
-rw-r--r--doc/release-notes/release-notes-0.3.13.md26
-rw-r--r--doc/release-notes/release-notes-0.3.14.md11
-rw-r--r--doc/release-notes/release-notes-0.3.15.md6
-rw-r--r--doc/release-notes/release-notes-0.3.16.md1
-rw-r--r--doc/release-notes/release-notes-0.3.17.md12
-rw-r--r--doc/release-notes/release-notes-0.3.18.md11
-rw-r--r--doc/release-notes/release-notes-0.3.19.md9
-rw-r--r--doc/release-notes/release-notes-0.3.20.1.md1
-rw-r--r--doc/release-notes/release-notes-0.3.20.2.md17
-rw-r--r--doc/release-notes/release-notes-0.3.20.md22
-rw-r--r--doc/release-notes/release-notes-0.3.21.md20
-rw-r--r--doc/release-notes/release-notes-0.3.22.md16
-rw-r--r--doc/release-notes/release-notes-0.3.23.md10
-rw-r--r--doc/release-notes/release-notes-0.3.24.md20
-rw-r--r--doc/release-notes/release-notes-0.4.0.md70
-rw-r--r--doc/release-notes/release-notes-0.4.1.md38
-rw-r--r--doc/release-notes/release-notes-0.4.2.md1
-rw-r--r--doc/release-notes/release-notes-0.4.3.md21
-rw-r--r--doc/release-notes/release-notes-0.4.4.md30
-rw-r--r--doc/release-notes/release-notes-0.4.5.md1
-rw-r--r--doc/release-notes/release-notes-0.4.6.md37
-rw-r--r--doc/release-notes/release-notes-0.5.0.md70
-rw-r--r--doc/release-notes/release-notes-0.5.1.md43
-rw-r--r--doc/release-notes/release-notes-0.5.2.md22
-rw-r--r--doc/release-notes/release-notes-0.5.3.md42
-rw-r--r--doc/release-notes/release-notes-0.5.4.md39
-rw-r--r--doc/release-notes/release-notes-0.5.5.md37
-rw-r--r--doc/release-notes/release-notes-0.6.0.md138
-rw-r--r--doc/release-notes/release-notes-0.6.1.md2
-rw-r--r--doc/release-notes/release-notes-0.6.2.md50
-rw-r--r--doc/release-notes/release-notes-0.6.3.md29
-rw-r--r--doc/release-notes/release-notes-0.7.0.md169
-rw-r--r--doc/release-notes/release-notes-0.7.1.md110
-rw-r--r--doc/release-notes/release-notes-0.7.2.md68
-rw-r--r--doc/release-notes/release-notes-0.8.0.md139
-rw-r--r--doc/release-notes/release-notes-0.8.1.md22
-rw-r--r--doc/release-notes/release-notes-0.8.2.md137
-rw-r--r--doc/release-notes/release-notes-0.8.3.md18
-rw-r--r--doc/release-notes/release-notes-0.8.4.md83
-rw-r--r--doc/release-notes/release-notes-0.8.5.md44
-rw-r--r--doc/release-notes/release-notes-0.8.6.md66
-rw-r--r--doc/release-process.md58
-rw-r--r--doc/tor.md2
-rw-r--r--qa/rpc-tests/README.md23
-rwxr-xr-xqa/rpc-tests/send.sh14
-rwxr-xr-xqa/rpc-tests/txnmall.sh150
-rw-r--r--qa/rpc-tests/util.sh2
-rwxr-xr-xqa/rpc-tests/walletbackup.sh293
-rwxr-xr-xshare/genbuild.sh10
-rw-r--r--share/setup.nsi.in41
-rw-r--r--src/Makefile.am19
-rw-r--r--src/Makefile.include15
-rw-r--r--src/addrman.cpp2
-rw-r--r--src/alert.cpp13
-rw-r--r--src/chainparams.cpp152
-rw-r--r--src/clientversion.h6
-rw-r--r--src/core.cpp28
-rw-r--r--src/core.h4
-rw-r--r--src/db.cpp19
-rw-r--r--src/init.cpp112
-rw-r--r--src/leveldbwrapper.cpp8
-rw-r--r--src/m4/bitcoin_qt.m433
-rw-r--r--src/main.cpp798
-rw-r--r--src/main.h46
-rw-r--r--src/miner.cpp14
-rw-r--r--src/net.cpp46
-rw-r--r--src/net.h3
-rw-r--r--src/netbase.cpp26
-rw-r--r--src/noui.cpp6
-rw-r--r--src/protocol.cpp10
-rw-r--r--src/qt/Makefile.am25
-rw-r--r--src/qt/aboutdialog.cpp38
-rw-r--r--src/qt/aboutdialog.h34
-rw-r--r--src/qt/addressbookpage.cpp12
-rw-r--r--src/qt/bitcoin.cpp32
-rw-r--r--src/qt/bitcoin.qrc1
-rw-r--r--src/qt/bitcoinaddressvalidator.cpp58
-rw-r--r--src/qt/bitcoinaddressvalidator.h22
-rw-r--r--src/qt/bitcoinamountfield.cpp21
-rw-r--r--src/qt/bitcoinamountfield.h4
-rw-r--r--src/qt/bitcoingui.cpp18
-rw-r--r--src/qt/bitcoingui.h5
-rw-r--r--src/qt/forms/aboutdialog.ui16
-rw-r--r--src/qt/forms/askpassphrasedialog.ui16
-rw-r--r--src/qt/forms/coincontroldialog.ui148
-rw-r--r--src/qt/forms/editaddressdialog.ui25
-rw-r--r--src/qt/forms/helpmessagedialog.ui128
-rw-r--r--src/qt/forms/intro.ui16
-rw-r--r--src/qt/forms/optionsdialog.ui144
-rw-r--r--src/qt/forms/overviewpage.ui4
-rw-r--r--src/qt/forms/receivecoinsdialog.ui94
-rw-r--r--src/qt/forms/rpcconsole.ui26
-rw-r--r--src/qt/forms/sendcoinsdialog.ui84
-rw-r--r--src/qt/forms/sendcoinsentry.ui20
-rw-r--r--src/qt/forms/signverifymessagedialog.ui9
-rw-r--r--src/qt/forms/transactiondescdialog.ui16
-rw-r--r--src/qt/guiconstants.h2
-rw-r--r--src/qt/guiutil.cpp61
-rw-r--r--src/qt/guiutil.h23
-rw-r--r--src/qt/intro.cpp2
-rw-r--r--src/qt/locale/bitcoin_ach.ts1515
-rw-r--r--src/qt/locale/bitcoin_af_ZA.ts592
-rw-r--r--src/qt/locale/bitcoin_ar.ts1806
-rw-r--r--src/qt/locale/bitcoin_be_BY.ts592
-rw-r--r--src/qt/locale/bitcoin_bg.ts1543
-rw-r--r--src/qt/locale/bitcoin_bs.ts588
-rw-r--r--src/qt/locale/bitcoin_ca.ts1613
-rw-r--r--src/qt/locale/bitcoin_ca_ES.ts1667
-rw-r--r--src/qt/locale/bitcoin_cs.ts1593
-rw-r--r--src/qt/locale/bitcoin_cy.ts1525
-rw-r--r--src/qt/locale/bitcoin_da.ts1623
-rw-r--r--src/qt/locale/bitcoin_de.ts1599
-rw-r--r--src/qt/locale/bitcoin_de_AT.ts612
-rw-r--r--src/qt/locale/bitcoin_el_GR.ts1647
-rw-r--r--src/qt/locale/bitcoin_en.ts373
-rw-r--r--src/qt/locale/bitcoin_eo.ts1595
-rw-r--r--src/qt/locale/bitcoin_es.ts634
-rw-r--r--src/qt/locale/bitcoin_es_CL.ts1633
-rw-r--r--src/qt/locale/bitcoin_es_MX.ts636
-rw-r--r--src/qt/locale/bitcoin_et.ts1569
-rw-r--r--src/qt/locale/bitcoin_eu_ES.ts1529
-rw-r--r--src/qt/locale/bitcoin_fa.ts1669
-rw-r--r--src/qt/locale/bitcoin_fa_IR.ts600
-rw-r--r--src/qt/locale/bitcoin_fi.ts1567
-rw-r--r--src/qt/locale/bitcoin_fr.ts638
-rw-r--r--src/qt/locale/bitcoin_fr_CA.ts1519
-rw-r--r--src/qt/locale/bitcoin_gl.ts1595
-rw-r--r--src/qt/locale/bitcoin_gu_IN.ts1517
-rw-r--r--src/qt/locale/bitcoin_he.ts706
-rw-r--r--src/qt/locale/bitcoin_hi_IN.ts1543
-rw-r--r--src/qt/locale/bitcoin_hr.ts612
-rw-r--r--src/qt/locale/bitcoin_hu.ts1579
-rw-r--r--src/qt/locale/bitcoin_id_ID.ts1589
-rw-r--r--src/qt/locale/bitcoin_it.ts801
-rw-r--r--src/qt/locale/bitcoin_ja.ts1596
-rw-r--r--src/qt/locale/bitcoin_kk_KZ.ts1519
-rw-r--r--src/qt/locale/bitcoin_ko_KR.ts1952
-rw-r--r--src/qt/locale/bitcoin_la.ts1573
-rw-r--r--src/qt/locale/bitcoin_lt.ts1607
-rw-r--r--src/qt/locale/bitcoin_lv_LV.ts1555
-rw-r--r--src/qt/locale/bitcoin_ms_MY.ts592
-rw-r--r--src/qt/locale/bitcoin_nb.ts648
-rw-r--r--src/qt/locale/bitcoin_nl.ts1701
-rw-r--r--src/qt/locale/bitcoin_pam.ts632
-rw-r--r--src/qt/locale/bitcoin_pl.ts626
-rw-r--r--src/qt/locale/bitcoin_pt_BR.ts1627
-rw-r--r--src/qt/locale/bitcoin_pt_PT.ts632
-rw-r--r--src/qt/locale/bitcoin_ro_RO.ts1767
-rw-r--r--src/qt/locale/bitcoin_ru.ts734
-rw-r--r--src/qt/locale/bitcoin_sk.ts616
-rw-r--r--src/qt/locale/bitcoin_sl_SI.ts608
-rw-r--r--src/qt/locale/bitcoin_sq.ts1645
-rw-r--r--src/qt/locale/bitcoin_sr.ts600
-rw-r--r--src/qt/locale/bitcoin_sv.ts1589
-rw-r--r--src/qt/locale/bitcoin_th_TH.ts1523
-rw-r--r--src/qt/locale/bitcoin_tr.ts1625
-rw-r--r--src/qt/locale/bitcoin_uk.ts620
-rw-r--r--src/qt/locale/bitcoin_vi.ts1523
-rw-r--r--src/qt/locale/bitcoin_vi_VN.ts1517
-rw-r--r--src/qt/locale/bitcoin_zh_CN.ts674
-rw-r--r--src/qt/locale/bitcoin_zh_TW.ts1120
-rw-r--r--src/qt/optionsdialog.cpp14
-rw-r--r--src/qt/optionsmodel.cpp108
-rw-r--r--src/qt/optionsmodel.h10
-rw-r--r--src/qt/overviewpage.cpp1
-rw-r--r--src/qt/paymentserver.cpp25
-rw-r--r--src/qt/paymentserver.h2
-rw-r--r--src/qt/qvalidatedlineedit.cpp60
-rw-r--r--src/qt/qvalidatedlineedit.h7
-rw-r--r--src/qt/receivecoinsdialog.cpp82
-rw-r--r--src/qt/receivecoinsdialog.h14
-rw-r--r--src/qt/recentrequeststablemodel.cpp85
-rw-r--r--src/qt/recentrequeststablemodel.h49
-rw-r--r--src/qt/res/icons/transaction_conflicted.pngbin0 -> 474 bytes
-rw-r--r--src/qt/rpcconsole.cpp9
-rw-r--r--src/qt/rpcconsole.h4
-rw-r--r--src/qt/sendcoinsdialog.cpp21
-rw-r--r--src/qt/sendcoinsentry.cpp13
-rw-r--r--src/qt/signverifymessagedialog.cpp5
-rw-r--r--src/qt/splashscreen.cpp4
-rw-r--r--src/qt/splashscreen.h2
-rw-r--r--src/qt/test/Makefile.am1
-rw-r--r--src/qt/transactiondesc.cpp15
-rw-r--r--src/qt/transactionfilterproxy.cpp13
-rw-r--r--src/qt/transactionfilterproxy.h4
-rw-r--r--src/qt/transactionrecord.cpp14
-rw-r--r--src/qt/transactionrecord.h3
-rw-r--r--src/qt/transactiontablemodel.cpp12
-rw-r--r--src/qt/transactiontablemodel.h4
-rw-r--r--src/qt/utilitydialog.cpp134
-rw-r--r--src/qt/utilitydialog.h69
-rw-r--r--src/qt/walletmodel.cpp36
-rw-r--r--src/qt/walletmodel.h44
-rw-r--r--src/rpcblockchain.cpp4
-rw-r--r--src/rpcdump.cpp35
-rw-r--r--src/rpcmisc.cpp6
-rw-r--r--src/rpcnet.cpp16
-rw-r--r--src/rpcprotocol.cpp10
-rw-r--r--src/rpcprotocol.h3
-rw-r--r--src/rpcrawtransaction.cpp6
-rw-r--r--src/rpcserver.cpp37
-rw-r--r--src/rpcserver.h9
-rw-r--r--src/rpcwallet.cpp38
-rw-r--r--src/script.cpp49
-rw-r--r--src/script.h23
-rw-r--r--src/sync.cpp13
-rw-r--r--src/test/accounting_tests.cpp2
-rw-r--r--src/test/base58_tests.cpp6
-rw-r--r--src/test/data/tx_invalid.json8
-rw-r--r--src/test/data/tx_valid.json28
-rw-r--r--src/test/miner_tests.cpp51
-rw-r--r--src/test/rpc_wallet_tests.cpp7
-rw-r--r--src/test/script_tests.cpp18
-rw-r--r--src/test/transaction_tests.cpp4
-rw-r--r--src/test/wallet_tests.cpp2
-rw-r--r--src/tinyformat.h1010
-rw-r--r--src/txdb.cpp4
-rw-r--r--src/txdb.h7
-rw-r--r--src/util.cpp95
-rw-r--r--src/util.h101
-rw-r--r--src/wallet.cpp271
-rw-r--r--src/wallet.h44
-rw-r--r--src/walletdb.cpp144
-rw-r--r--src/walletdb.h23
252 files changed, 58404 insertions, 25585 deletions
diff --git a/Makefile.am b/Makefile.am
index 243166b3f7..4f623f6c64 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,8 @@ GZIP_ENV="-9n"
BITCOIND_BIN=$(top_builddir)/src/bitcoind$(EXEEXT)
BITCOIN_QT_BIN=$(top_builddir)/src/qt/bitcoin-qt$(EXEEXT)
-BITCOIN_WIN_INSTALLER=$(PACKAGE)-$(PACKAGE_VERSION)-win32-setup$(EXEEXT)
+BITCOIN_CLI_BIN=$(top_builddir)/src/bitcoin-cli$(EXEEXT)
+BITCOIN_WIN_INSTALLER=$(PACKAGE)-$(PACKAGE_VERSION)-win$(WINDOWS_BITS)-setup$(EXEEXT)
OSX_APP=Bitcoin-Qt.app
OSX_DMG=Bitcoin-Qt.dmg
@@ -15,6 +16,8 @@ OSX_FANCY_PLIST=$(top_srcdir)/contrib/macdeploy/fancy.plist
OSX_INSTALLER_ICONS=$(top_srcdir)/src/qt/res/icons/bitcoin.icns
OSX_PLIST=$(top_srcdir)/share/qt/Info.plist #not installed
+DIST_DOCS = $(wildcard doc/*.md) $(wildcard doc/release-notes/*.md)
+
WINDOWS_PACKAGING = $(top_srcdir)/share/pixmaps/bitcoin.ico \
$(top_srcdir)/share/pixmaps/nsis-header.bmp \
$(top_srcdir)/share/pixmaps/nsis-wizard.bmp \
@@ -40,20 +43,16 @@ distcheck-hook:
distcleancheck:
@:
-$(BITCOIN_WIN_INSTALLER): $(BITCOIND_BIN) $(BITCOIN_QT_BIN)
- $(MAKE) distdir
+$(BITCOIN_WIN_INSTALLER): $(BITCOIND_BIN) $(BITCOIN_QT_BIN) $(BITCOIN_CLI_BIN)
$(MKDIR_P) $(top_builddir)/release
- $(INSTALL_STRIP_PROGRAM) $(top_builddir)/src/bitcoind$(EXEEXT) $(top_builddir)/release
- $(INSTALL_STRIP_PROGRAM) $(top_builddir)/src/qt/bitcoin-qt$(EXEEXT) $(top_builddir)/release
+ $(INSTALL_STRIP_PROGRAM) $(BITCOIND_BIN) $(top_builddir)/release
+ $(INSTALL_STRIP_PROGRAM) $(BITCOIN_QT_BIN) $(top_builddir)/release
+ $(INSTALL_STRIP_PROGRAM) $(BITCOIN_CLI_BIN) $(top_builddir)/release
@test -f $(MAKENSIS) && $(MAKENSIS) $(top_builddir)/share/setup.nsi || \
echo error: could not build $@
-$(BITCOIND_BIN):
- make -C $(top_srcdir)/src bitcoind$(EXEEXT)
-
-$(BITCOIN_QT_BIN):
- make -C $(top_srcdir)/src/qt bitcoin-qt$(EXEEXT)
-
+$(BITCOIND_BIN) $(BITCOIN_QT_BIN) $(BITCOIN_CLI_BIN):
+ make -C $(dir $@) $(notdir $@)
$(OSX_APP)/Contents/PkgInfo:
$(MKDIR_P) $(@D)
@@ -151,7 +150,7 @@ check-local:
@qa/pull-tester/run-bitcoind-for-test.sh $(JAVA) -jar $(JAVA_COMPARISON_TOOL) qa/tmp/compTool $(COMPARISON_TOOL_REORG_TESTS)
endif
-EXTRA_DIST = $(top_srcdir)/share/genbuild.sh qa/pull-tester/pull-tester.sh $(WINDOWS_PACKAGING) $(OSX_PACKAGING)
+EXTRA_DIST = $(top_srcdir)/share/genbuild.sh qa/pull-tester/pull-tester.sh $(DIST_DOCS) $(WINDOWS_PACKAGING) $(OSX_PACKAGING)
CLEANFILES = $(OSX_DMG) $(OSX_APP) $(BITCOIN_WIN_INSTALLER)
diff --git a/configure.ac b/configure.ac
index 9737b884b4..3ed4549a88 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,12 +1,12 @@
dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
AC_PREREQ([2.60])
define(_CLIENT_VERSION_MAJOR, 0)
-define(_CLIENT_VERSION_MINOR, 8)
-define(_CLIENT_VERSION_REVISION, 99)
+define(_CLIENT_VERSION_MINOR, 9)
+define(_CLIENT_VERSION_REVISION, 0)
define(_CLIENT_VERSION_BUILD, 0)
-define(_CLIENT_VERSION_IS_RELEASE, false)
+define(_CLIENT_VERSION_IS_RELEASE, true)
define(_COPYRIGHT_YEAR, 2014)
-AC_INIT([Bitcoin],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[info@bitcoin.org],[bitcoin])
+AC_INIT([Bitcoin Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[info@bitcoin.org],[bitcoin])
AC_CONFIG_AUX_DIR([src/build-aux])
AC_CONFIG_MACRO_DIR([src/m4])
AC_CANONICAL_HOST
@@ -24,6 +24,12 @@ m4_include([pkg.m4])
dnl faketime breaks configure and is only needed for make. Disable it here.
unset FAKETIME
+if test "x${CXXFLAGS+set}" = "xset"; then
+ CXXFLAGS_overridden=yes
+else
+ CXXFLAGS_overridden=no
+fi
+
dnl ==============================================================
dnl Setup for automake
dnl ==============================================================
@@ -92,7 +98,7 @@ AC_ARG_ENABLE([hardening],
AC_ARG_ENABLE([ccache],
[AS_HELP_STRING([--enable-ccache],
- [enable building with ccache (default is yes if ccache is found)])],
+ [use ccache for building (default is yes if ccache is found)])],
[use_ccache=$enableval],
[use_ccache=auto])
@@ -134,7 +140,9 @@ PKG_PROG_PKG_CONFIG
## TODO: Remove these hard-coded paths and flags. They are here for the sake of
## compatibility with the legacy buildsystem.
##
-CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wformat -Wformat-security -Wno-unused-parameter"
+if test "x$CXXFLAGS_overridden" = "xno"; then
+ CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wformat -Wformat-security -Wno-unused-parameter"
+fi
CPPFLAGS="$CPPFLAGS -DBOOST_SPIRIT_THREADSAFE -DHAVE_BUILD_INFO -D__STDC_FORMAT_MACROS"
AC_LANG_PUSH([C++])
@@ -167,6 +175,7 @@ case $host in
AC_CHECK_LIB([iphlpapi], [main],, AC_MSG_ERROR(lib missing))
AC_CHECK_LIB([crypt32], [main],, AC_MSG_ERROR(lib missing))
+ AX_CHECK_LINK_FLAG([[-static]],[LDFLAGS="$LDFLAGS -static"])
AX_CHECK_LINK_FLAG([[-static-libgcc]],[LDFLAGS="$LDFLAGS -static-libgcc"])
AX_CHECK_LINK_FLAG([[-static-libstdc++]],[LDFLAGS="$LDFLAGS -static-libstdc++"])
@@ -180,9 +189,17 @@ case $host in
AC_MSG_ERROR("windres not found")
fi
- CPPFLAGS="$CPPFLAGS -D_MT -DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB -D__USE_MINGW_ANSI_STDIO"
+ CPPFLAGS="$CPPFLAGS -D_MT -DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB"
LEVELDB_TARGET_FLAGS="TARGET_OS=OS_WINDOWS_CROSSCOMPILE"
- CXXFLAGS="$CXXFLAGS -w"
+ if test "x$CXXFLAGS_overridden" = "xno"; then
+ CXXFLAGS="$CXXFLAGS -w"
+ fi
+ case $host in
+ i?86-*) WINDOWS_BITS=32 ;;
+ x86_64-*) WINDOWS_BITS=64 ;;
+ *) AC_MSG_ERROR("Could not determine win32/win64 for installer") ;;
+ esac
+ AC_SUBST(WINDOWS_BITS)
;;
*darwin*)
TARGET_OS=darwin
@@ -274,20 +291,22 @@ AX_CHECK_LINK_FLAG([[-Wl,--large-address-aware]], [LDFLAGS="$LDFLAGS -Wl,--large
if test x$use_hardening != xno; then
AX_CHECK_COMPILE_FLAG([-Wstack-protector],[HARDENED_CXXFLAGS="$HARDENED_CXXFLAGS -Wstack-protector"])
+ AX_CHECK_COMPILE_FLAG([-fstack-protector-all],[HARDENED_CXXFLAGS="$HARDENED_CXXFLAGS -fstack-protector-all"])
AX_CHECK_COMPILE_FLAG([-fPIE],[HARDENED_CXXFLAGS="$HARDENED_CXXFLAGS -fPIE"])
- AX_CHECK_PREPROC_FLAG([-D_FORTIFY_SOURCE=2],[HARDENED_CPPFLAGS="$HARDENED_CPPFLAGS -D_FORTIFY_SOURCE=2"])
+ AX_CHECK_PREPROC_FLAG([-D_FORTIFY_SOURCE=2],[
+ AX_CHECK_PREPROC_FLAG([-U_FORTIFY_SOURCE],[
+ HARDENED_CPPFLAGS="$HARDENED_CPPFLAGS -U_FORTIFY_SOURCE"
+ ])
+ HARDENED_CPPFLAGS="$HARDENED_CPPFLAGS -D_FORTIFY_SOURCE=2"
+ ])
AX_CHECK_LINK_FLAG([[-Wl,--dynamicbase]], [HARDENED_LDFLAGS="$HARDENED_LDFLAGS -Wl,--dynamicbase"])
AX_CHECK_LINK_FLAG([[-Wl,--nxcompat]], [HARDENED_LDFLAGS="$HARDENED_LDFLAGS -Wl,--nxcompat"])
- AX_CHECK_LINK_FLAG([[-Wl,-z,relro]], [LDFLAGS="-Wl,-z,relro"])
- AX_CHECK_LINK_FLAG([[-Wl,-z,now]], [LDFLAGS="-Wl,-z,now"])
+ AX_CHECK_LINK_FLAG([[-Wl,-z,relro]], [HARDENED_LDFLAGS="$HARDENED_LDFLAGS -Wl,-z,relro"])
+ AX_CHECK_LINK_FLAG([[-Wl,-z,now]], [HARDENED_LDFLAGS="$HARDENED_LDFLAGS -Wl,-z,now"])
if test x$TARGET_OS != xwindows; then
- # -fstack-protector-all can produce broken binaries with mingw
- AX_CHECK_COMPILE_FLAG([-fno-stack-protector],[HARDENED_CXXFLAGS="$HARDENED_CXXFLAGS -fno-stack-protector"])
- AX_CHECK_COMPILE_FLAG([-fstack-protector-all],[HARDENED_CXXFLAGS="$HARDENED_CXXFLAGS -fstack-protector-all"])
-
# -pie will link successfully with MinGW, but it's unsupported and leads to undeterministic binaries
AX_CHECK_LINK_FLAG([[-pie]], [HARDENED_LDFLAGS="$HARDENED_LDFLAGS -pie"])
fi
@@ -313,6 +332,14 @@ AC_TRY_COMPILE([#include <sys/socket.h>],
[ AC_MSG_RESULT(no)]
)
+LEVELDB_CPPFLAGS=
+LIBLEVELDB=
+LIBMEMENV=
+AM_CONDITIONAL([EMBEDDED_LEVELDB],[true])
+AC_SUBST(LEVELDB_CPPFLAGS)
+AC_SUBST(LIBLEVELDB)
+AC_SUBST(LIBMEMENV)
+
if test x$enable_wallet != xno; then
dnl Check for libdb_cxx only if wallet enabled
BITCOIN_FIND_BDB48
@@ -423,6 +450,18 @@ if test x$boost_sleep != xyes; then
AC_MSG_ERROR(No working boost sleep implementation found. If on ubuntu 13.10 with libboost1.54-all-dev remove libboost.1.54-all-dev and use libboost1.53-all-dev)
fi
+AC_ARG_WITH([cli],
+ [AS_HELP_STRING([--with-cli],
+ [with CLI (default is yes)])],
+ [build_bitcoin_cli=$withval],
+ [build_bitcoin_cli=yes])
+
+AC_ARG_WITH([daemon],
+ [AS_HELP_STRING([--with-daemon],
+ [with daemon (default is yes)])],
+ [build_bitcoind=$withval],
+ [build_bitcoind=yes])
+
BITCOIN_QT_INIT
if test x$use_pkgconfig = xyes; then
@@ -459,13 +498,21 @@ fi
BITCOIN_QT_PATH_PROGS([PROTOC], [protoc],$protoc_bin_path)
+AC_MSG_CHECKING([whether to build bitcoind])
+AM_CONDITIONAL([BUILD_BITCOIND], [test x$build_bitcoind = xyes])
+AC_MSG_RESULT($build_bitcoind)
+
+AC_MSG_CHECKING([whether to build bitcoin-cli])
+AM_CONDITIONAL([BUILD_BITCOIN_CLI], [test x$build_bitcoin_cli = xyes])
+AC_MSG_RESULT($build_bitcoin_cli)
+
dnl sets $bitcoin_enable_qt, $bitcoin_enable_qt_test, $bitcoin_enable_qt_dbus
BITCOIN_QT_CONFIGURE([$use_pkgconfig], [qt4])
if test x$use_ipv6 = xyes; then
dnl Check for ipv6 build requirements
- AC_MSG_CHECKING(for IPV6 build support)
+ AC_MSG_CHECKING(for operating system IPv6 support)
AC_TRY_LINK([
#if defined(_WINDOWS)
#include <winsock2.h>
@@ -480,18 +527,17 @@ if test x$use_ipv6 = xyes; then
struct sockaddr_in6 addr;
#endif
int temp = socket(AF_INET6, SOCK_STREAM, 0);],
- [AC_MSG_RESULT(yes); have_ipv6=yes; AC_DEFINE(HAVE_IPV6, 1, [Define this symbol if you have ipv6 build support])],
+ [AC_MSG_RESULT(yes); have_ipv6=yes; AC_DEFINE(HAVE_IPV6, 1, [Define this symbol if you have operating system IPv6 support])],
[AC_MSG_RESULT(no)]; have_ipv6=no)
fi
AC_LANG_POP
if test "x$use_ccache" != "xno"; then
- AC_MSG_CHECKING(if ccache should be enabled)
+ AC_MSG_CHECKING(if ccache should be used)
if test x$CCACHE = x; then
if test "x$use_ccache" = "xyes"; then
AC_MSG_ERROR([ccache not found.]);
else
- AC_MSG_NOTICE([ccache not found. Falling back to default CC])
use_ccache=no
fi
else
@@ -513,32 +559,32 @@ else
fi
dnl enable ipv6 support
-AC_MSG_CHECKING([if ipv6 should be enabled])
+AC_MSG_CHECKING([whether to build with support for IPv6])
if test x$have_ipv6 = xno; then
if test x$use_ipv6 = xyes; then
- AC_MSG_ERROR("ipv6 requested but cannot be built. use --disable-ipv6")
+ AC_MSG_ERROR([IPv6 requested, but cannot be built. use --disable-ipv6])
fi
AC_MSG_RESULT(no)
else
if test x$use_ipv6 = xyes; then
AC_MSG_RESULT(yes)
- AC_DEFINE([USE_IPV6],[1],[Define if ipv6 support should be compiled in])
+ AC_DEFINE([USE_IPV6],[1],[Define if IPv6 support should be compiled in])
else
AC_MSG_RESULT(no)
fi
fi
dnl enable upnp support
-AC_MSG_CHECKING([if upnp should be enabled])
+AC_MSG_CHECKING([whether to build with support for UPnP])
if test x$have_miniupnpc = xno; then
if test x$use_upnp = xyes; then
- AC_MSG_ERROR("upnp requested but cannot be built. use --without-miniupnpc")
+ AC_MSG_ERROR("UPnP requested but cannot be built. use --without-miniupnpc")
fi
AC_MSG_RESULT(no)
else
if test x$use_upnp != xno; then
AC_MSG_RESULT(yes)
- AC_MSG_CHECKING([if upnp should be on by default])
+ AC_MSG_CHECKING([whether to build with UPnP enabled by default])
use_upnp=yes
upnp_setting=0
if test x$use_upnp_default != xno; then
@@ -546,7 +592,7 @@ else
upnp_setting=1
fi
AC_MSG_RESULT($use_upnp_default)
- AC_DEFINE_UNQUOTED([USE_UPNP],[$upnp_setting],[Define to 1 for upnp runtime support])
+ AC_DEFINE_UNQUOTED([USE_UPNP],[$upnp_setting],[UPnP support not compiled if undefined, otherwise value (0 or 1) determines default state])
if test x$TARGET_OS = xwindows; then
CPPFLAGS="$CPPFLAGS -DSTATICLIB"
fi
@@ -559,14 +605,14 @@ dnl these are only used when qt is enabled
if test x$bitcoin_enable_qt != xno; then
BUILD_QT=qt
dnl enable dbus support
- AC_MSG_CHECKING([if dbus should be enabled])
+ AC_MSG_CHECKING([whether to build GUI with support for D-Bus])
if test x$bitcoin_enable_qt_dbus != xno; then
AC_DEFINE([USE_DBUS],[1],[Define if dbus support should be compiled in])
fi
AC_MSG_RESULT($bitcoin_enable_qt_dbus)
dnl enable qr support
- AC_MSG_CHECKING([if qr should be enabled])
+ AC_MSG_CHECKING([whether to build GUI with support for QR codes])
if test x$have_qrencode = xno; then
if test x$use_qr == xyes; then
AC_MSG_ERROR("QR support requested but cannot be built. use --without-qrencode")
@@ -586,16 +632,25 @@ if test x$bitcoin_enable_qt != xno; then
AC_MSG_WARN("xgettext is required to update qt translations")
fi
- if test x$use_tests = xyes; then
+ AC_MSG_CHECKING([whether to build test_bitcoin-qt])
+ if test x$use_tests$bitcoin_enable_qt_test = xyesyes; then
+ AC_MSG_RESULT([yes])
BUILD_TEST_QT="test"
- if test x$bitcoin_enable_qt_test != xyes; then
- AC_MSG_ERROR("QT Test lib not found. Use --disable-tests or --without-qt.")
- fi
+ else
+ AC_MSG_RESULT([no])
fi
fi
+AC_MSG_CHECKING([whether to build test_bitcoin])
if test x$use_tests = xyes; then
+ AC_MSG_RESULT([yes])
BUILD_TEST="test"
+else
+ AC_MSG_RESULT([no])
+fi
+
+if test "x$use_tests$build_bitcoind$use_qt" = "xnonono"; then
+ AC_MSG_ERROR([No targets! Please specify at least one of: --enable-cli --enable-daemon --enable-gui or --enable-tests])
fi
AM_CONDITIONAL([TARGET_DARWIN], [test x$TARGET_OS = xdarwin])
diff --git a/contrib/README.md b/contrib/README.md
index 167b5df4e1..cd0dd3b023 100644
--- a/contrib/README.md
+++ b/contrib/README.md
@@ -52,7 +52,7 @@ tests each pull and when master is tested using jenkins.
### [Verify SF Binaries](/contrib/verifysfbinaries) ###
This script attempts to download and verify the signature file SHA256SUMS.asc from SourceForge.
-### [Developer tools](/control/devtools) ###
+### [Developer tools](/contrib/devtools) ###
Specific tools for developers working on this repository.
Contains the script `github-merge.sh` for merging github pull requests securely and signing them using GPG.
diff --git a/contrib/bitcoin-qt.pro b/contrib/bitcoin-qt.pro
index 8bfa4a18a5..3a72d10f47 100644
--- a/contrib/bitcoin-qt.pro
+++ b/contrib/bitcoin-qt.pro
@@ -4,6 +4,7 @@ FORMS += \
../src/qt/forms/askpassphrasedialog.ui \
../src/qt/forms/coincontroldialog.ui \
../src/qt/forms/editaddressdialog.ui \
+ ../src/qt/forms/helpmessagedialog.ui \
../src/qt/forms/intro.ui \
../src/qt/forms/openuridialog.ui \
../src/qt/forms/optionsdialog.ui \
diff --git a/contrib/devtools/README.md b/contrib/devtools/README.md
index 55d5d24cca..f0d25fd7a2 100644
--- a/contrib/devtools/README.md
+++ b/contrib/devtools/README.md
@@ -36,3 +36,14 @@ Configuring the github-merge tool for the bitcoin repository is done in the foll
git config githubmerge.testcmd "make -j4 check" (adapt to whatever you want to use for testing)
git config --global user.signingkey mykeyid (if you want to GPG sign)
+## fix-copyright-headers.py
+
+Every year newly updated files need to have its copyright headers updated to reflect the current year.
+If you run this script from src/ it will automatically update the year on the copyright header for all
+.cpp and .h files if these have a git commit from the current year.
+
+For example a file changed in 2014 (with 2014 being the current year):
+```// Copyright (c) 2009-2013 The Bitcoin developers```
+
+would be changed to:
+```// Copyright (c) 2009-2014 The Bitcoin developers``` \ No newline at end of file
diff --git a/contrib/devtools/fix-copyright-headers.py b/contrib/devtools/fix-copyright-headers.py
new file mode 100755
index 0000000000..52fdc99144
--- /dev/null
+++ b/contrib/devtools/fix-copyright-headers.py
@@ -0,0 +1,53 @@
+#!/usr/bin/env python
+'''
+Run this script inside of src/ and it will look for all the files
+that were changed this year that still have the last year in the
+copyright headers, and it will fix the headers on that file using
+a perl regex one liner.
+
+For example: if it finds something like this and we're in 2014
+
+// Copyright (c) 2009-2013 The Bitcoin developers
+
+it will change it to
+
+// Copyright (c) 2009-2014 The Bitcoin developers
+
+It will do this for all the files in the folder and its children.
+
+Author: @gubatron
+'''
+import os
+import time
+
+year = time.gmtime()[0]
+last_year = year - 1
+command = "perl -pi -e 's/%s The Bitcoin/%s The Bitcoin/' %s"
+listFilesCommand = "find . | grep %s"
+
+extensions = [".cpp",".h"]
+
+def getLastGitModifiedDate(filePath):
+ gitGetLastCommitDateCommand = "git log " + filePath +" | grep Date | head -n 1"
+ p = os.popen(gitGetLastCommitDateCommand)
+ result = ""
+ for l in p:
+ result = l
+ break
+ result = result.replace("\n","")
+ return result
+
+n=1
+for extension in extensions:
+ foundFiles = os.popen(listFilesCommand % extension)
+ for filePath in foundFiles:
+ filePath = filePath[1:-1]
+ if filePath.endswith(extension):
+ filePath = os.getcwd() + filePath
+ modifiedTime = getLastGitModifiedDate(filePath)
+ if len(modifiedTime) > 0 and str(year) in modifiedTime:
+ print n,"Last Git Modified: ", modifiedTime, " - ", filePath
+ os.popen(command % (last_year,year,filePath))
+ n = n + 1
+
+
diff --git a/contrib/gitian-descriptors/boost-linux.yml b/contrib/gitian-descriptors/boost-linux.yml
index 5d22294dd8..bd35346337 100644
--- a/contrib/gitian-descriptors/boost-linux.yml
+++ b/contrib/gitian-descriptors/boost-linux.yml
@@ -6,24 +6,30 @@ architectures:
- "i386"
- "amd64"
packages:
+- "g++"
- "unzip"
- "pkg-config"
- "libtool"
- "faketime"
- "bsdmainutils"
- "zip"
+- "libz-dev"
reference_datetime: "2011-01-30 00:00:00"
remotes: []
files:
- "boost_1_55_0.tar.bz2"
script: |
STAGING="$HOME/install"
+ TEMPDIR="$HOME/tmp"
export LIBRARY_PATH="$STAGING/lib"
+ export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1
+ export FAKETIME=$REFERENCE_DATETIME
+ export TZ=UTC
# Input Integrity Check
echo "fff00023dd79486d444c8e29922f4072e1d451fc5a4d2b6075852ead7f2b7b52 boost_1_55_0.tar.bz2" | shasum -c
mkdir -p "$STAGING"
- tar xjf boost_1_55_0.tar.bz2
+ tar --warning=no-timestamp -xjf boost_1_55_0.tar.bz2
cd boost_1_55_0
GCCVERSION=$(g++ -E -dM $(mktemp --suffix=.h) | grep __VERSION__ | cut -d ' ' -f 3 | cut -d '"' -f 2)
# note: bjam with -d+2 reveals that -O3 is implied by default, no need to provide it in cxxflags
@@ -34,9 +40,16 @@ script: |
./bootstrap.sh --without-icu
- ./bjam toolset=gcc threadapi=pthread threading=multi variant=release link=static runtime-link=shared --user-config=user-config.jam --without-mpi --without-python -sNO_BZIP2=1 --layout=tagged --build-type=complete --prefix="$STAGING" $MAKEOPTS install
+ ./bjam toolset=gcc threadapi=pthread threading=multi variant=release link=static runtime-link=shared --user-config=user-config.jam --without-mpi --without-python -sNO_BZIP2=1 --layout=tagged --build-type=complete --prefix="$STAGING" $MAKEOPTS -d+2 install
+ # post-process all generated libraries to be deterministic
+ # extract them to a temporary directory then re-build them deterministically
+ for LIB in $(find $STAGING -name \*.a); do
+ rm -rf $TEMPDIR && mkdir $TEMPDIR && cd $TEMPDIR
+ ar xv $LIB | cut -b5- > /tmp/list.txt
+ rm $LIB
+ ar crsD $LIB $(cat /tmp/list.txt)
+ done
+ #
cd "$STAGING"
- export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1
- export FAKETIME=$REFERENCE_DATETIME
- zip -r $OUTDIR/boost-linux${GBUILD_BITS}-1.55.0-gitian-r1.zip *
+ find | sort | zip -X@ $OUTDIR/boost-linux${GBUILD_BITS}-1.55.0-gitian-r1.zip
diff --git a/contrib/gitian-descriptors/boost-win.yml b/contrib/gitian-descriptors/boost-win.yml
new file mode 100644
index 0000000000..db5d6bab1d
--- /dev/null
+++ b/contrib/gitian-descriptors/boost-win.yml
@@ -0,0 +1,86 @@
+---
+name: "boost"
+suites:
+- "precise"
+architectures:
+- "amd64"
+packages:
+- "mingw-w64"
+- "g++-mingw-w64"
+- "faketime"
+- "zip"
+reference_datetime: "2011-01-30 00:00:00"
+remotes: []
+files:
+- "boost_1_55_0.tar.bz2"
+- "boost-mingw-gas-cross-compile-2013-03-03.patch"
+script: |
+ # Defines
+ export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1
+ export FAKETIME=$REFERENCE_DATETIME
+ export TZ=UTC
+ INDIR=$HOME/build
+ TEMPDIR=$HOME/tmp
+ # Input Integrity Check
+ echo "fff00023dd79486d444c8e29922f4072e1d451fc5a4d2b6075852ead7f2b7b52 boost_1_55_0.tar.bz2" | shasum -c
+ echo "d2b7f6a1d7051faef3c9cf41a92fa3671d905ef1e1da920d07651a43299f6268 boost-mingw-gas-cross-compile-2013-03-03.patch" | shasum -c
+
+ for BITS in 32 64; do # for architectures
+ #
+ INSTALLPREFIX=$HOME/staging${BITS}
+ BUILDDIR=$HOME/build${BITS}
+ if [ "$BITS" == "32" ]; then
+ HOST=i686-w64-mingw32
+ else
+ HOST=x86_64-w64-mingw32
+ fi
+ #
+ mkdir -p $INSTALLPREFIX $BUILDDIR
+ cd $BUILDDIR
+ #
+ tar --warning=no-timestamp -xjf $INDIR/boost_1_55_0.tar.bz2
+ cd boost_1_55_0
+ GCCVERSION=$($HOST-g++ -E -dM $(mktemp --suffix=.h) | grep __VERSION__ | cut -d ' ' -f 3 | cut -d '"' -f 2)
+ echo "using gcc : $GCCVERSION : $HOST-g++
+ :
+ <rc>$HOST-windres
+ <archiver>$HOST-ar
+ <cxxflags>-frandom-seed=boost1
+ <ranlib>$HOST-ranlib
+ ;" > user-config.jam
+ ./bootstrap.sh --without-icu
+
+ # Workaround: Upstream boost dev refuses to include patch that would allow Free Software cross-compile toolchain to work
+ # This patch was authored by the Fedora package developer and ships in Fedora's mingw32-boost.
+ # Please obtain the exact patch that matches the above sha256sum from one of the following mirrors.
+ #
+ # Read History: https://svn.boost.org/trac/boost/ticket/7262
+ # History Mirror: http://rose.makesad.us/~paulproteus/mirrors/7262%20Boost.Context%20fails%20to%20build%20using%20MinGW.html
+ #
+ # Patch: https://svn.boost.org/trac/boost/raw-attachment/ticket/7262/boost-mingw.patch
+ # Patch Mirror: http://wtogami.fedorapeople.org/boost-mingw-gas-cross-compile-2013-03-03.patch
+ # Patch Mirror: http://mindstalk.net/host/boost-mingw-gas-cross-compile-2013-03-03.patch
+ # Patch Mirror: http://rose.makesad.us/~paulproteus/mirrors/boost-mingw-gas-cross-compile-2013-03-03.patch
+ patch -p0 < $INDIR/boost-mingw-gas-cross-compile-2013-03-03.patch
+
+ # Bug Workaround: boost-1.54.0 broke the ability to disable zlib, still broken in 1.55
+ # https://svn.boost.org/trac/boost/ticket/9156
+ sed -i 's^\[ ac.check-library /zlib//zlib : <library>/zlib//zlib^^' libs/iostreams/build/Jamfile.v2
+ sed -i 's^<source>zlib.cpp <source>gzip.cpp \]^^' libs/iostreams/build/Jamfile.v2
+
+ # http://statmt.org/~s0565741/software/boost_1_52_0/libs/context/doc/html/context/requirements.html
+ # "For cross-compiling the lib you must specify certain additional properties at bjam command line: target-os, abi, binary-format, architecture and address-model."
+ ./bjam toolset=gcc binary-format=pe target-os=windows threadapi=win32 address-model=$BITS threading=multi variant=release link=static runtime-link=static --user-config=user-config.jam --without-mpi --without-python -sNO_BZIP2=1 -sNO_ZLIB=1 --layout=tagged --build-type=complete --prefix="$INSTALLPREFIX" $MAKEOPTS install
+ # post-process all generated libraries to be deterministic
+ # extract them to a temporary directory then re-build them deterministically
+ for LIB in $(find $INSTALLPREFIX -name \*.a); do
+ rm -rf $TEMPDIR && mkdir $TEMPDIR && cd $TEMPDIR
+ $HOST-ar xv $LIB | cut -b5- > /tmp/list.txt
+ rm $LIB
+ $HOST-ar crsD $LIB $(cat /tmp/list.txt)
+ done
+ #
+ cd "$INSTALLPREFIX"
+ find | sort | zip -X@ $OUTDIR/boost-win$BITS-1.55.0-gitian-r6.zip
+ done # for BITS in
+
diff --git a/contrib/gitian-descriptors/boost-win32.yml b/contrib/gitian-descriptors/boost-win32.yml
deleted file mode 100644
index 55e74ce3e1..0000000000
--- a/contrib/gitian-descriptors/boost-win32.yml
+++ /dev/null
@@ -1,65 +0,0 @@
----
-name: "boost"
-suites:
-- "precise"
-architectures:
-- "amd64"
-packages:
-- "mingw-w64"
-- "g++-mingw-w64"
-- "faketime"
-- "zip"
-reference_datetime: "2011-01-30 00:00:00"
-remotes: []
-files:
-- "boost_1_55_0.tar.bz2"
-- "boost-mingw-gas-cross-compile-2013-03-03.patch"
-script: |
- # Defines
- INSTALLPREFIX="$HOME/install"
- HOST=i686-w64-mingw32
- # Input Integrity Check
- echo "fff00023dd79486d444c8e29922f4072e1d451fc5a4d2b6075852ead7f2b7b52 boost_1_55_0.tar.bz2" | shasum -c
- echo "d2b7f6a1d7051faef3c9cf41a92fa3671d905ef1e1da920d07651a43299f6268 boost-mingw-gas-cross-compile-2013-03-03.patch" | shasum -c
-
- mkdir -p "$INSTALLPREFIX"
- tar xjf boost_1_55_0.tar.bz2
- cd boost_1_55_0
- GCCVERSION=$($HOST-g++ -E -dM $(mktemp --suffix=.h) | grep __VERSION__ | cut -d ' ' -f 3 | cut -d '"' -f 2)
- echo "using gcc : $GCCVERSION : $HOST-g++
- :
- <rc>$HOST-windres
- <archiver>$HOST-ar
- <cxxflags>-frandom-seed=boost1
- <ranlib>$HOST-ranlib
- ;" > user-config.jam
- ./bootstrap.sh --without-icu
-
- # Workaround: Upstream boost dev refuses to include patch that would allow Free Software cross-compile toolchain to work
- # This patch was authored by the Fedora package developer and ships in Fedora's mingw32-boost.
- # Please obtain the exact patch that matches the above sha256sum from one of the following mirrors.
- #
- # Read History: https://svn.boost.org/trac/boost/ticket/7262
- # History Mirror: http://rose.makesad.us/~paulproteus/mirrors/7262%20Boost.Context%20fails%20to%20build%20using%20MinGW.html
- #
- # Patch: https://svn.boost.org/trac/boost/raw-attachment/ticket/7262/boost-mingw.patch
- # Patch Mirror: http://wtogami.fedorapeople.org/boost-mingw-gas-cross-compile-2013-03-03.patch
- # Patch Mirror: http://mindstalk.net/host/boost-mingw-gas-cross-compile-2013-03-03.patch
- # Patch Mirror: http://rose.makesad.us/~paulproteus/mirrors/boost-mingw-gas-cross-compile-2013-03-03.patch
- patch -p0 < ../boost-mingw-gas-cross-compile-2013-03-03.patch
-
- # Bug Workaround: boost-1.54.0 broke the ability to disable zlib, still broken in 1.55
- # https://svn.boost.org/trac/boost/ticket/9156
- sed -i 's^\[ ac.check-library /zlib//zlib : <library>/zlib//zlib^^' libs/iostreams/build/Jamfile.v2
- sed -i 's^<source>zlib.cpp <source>gzip.cpp \]^^' libs/iostreams/build/Jamfile.v2
-
- # http://statmt.org/~s0565741/software/boost_1_52_0/libs/context/doc/html/context/requirements.html
- # Note: Might need these options in the future for 64bit builds.
- # "Please note that address-model=64 must be given to bjam command line on 64bit Windows for 64bit build; otherwise 32bit code will be generated."
- # "For cross-compiling the lib you must specify certain additional properties at bjam command line: target-os, abi, binary-format, architecture and address-model."
- ./bjam toolset=gcc binary-format=pe target-os=windows threadapi=win32 threading=multi variant=release link=static runtime-link=static --user-config=user-config.jam --without-mpi --without-python -sNO_BZIP2=1 -sNO_ZLIB=1 --layout=tagged --build-type=complete --prefix="$INSTALLPREFIX" $MAKEOPTS install
-
- cd "$INSTALLPREFIX"
- export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1
- export FAKETIME=$REFERENCE_DATETIME
- zip -r $OUTDIR/boost-win32-1.55.0-gitian-r6.zip *
diff --git a/contrib/gitian-descriptors/deps-linux.yml b/contrib/gitian-descriptors/deps-linux.yml
index 41d8d65fb7..908f9321a4 100644
--- a/contrib/gitian-descriptors/deps-linux.yml
+++ b/contrib/gitian-descriptors/deps-linux.yml
@@ -6,6 +6,7 @@ architectures:
- "i386"
- "amd64"
packages:
+- "g++"
- "unzip"
- "zip"
- "pkg-config"
@@ -22,7 +23,11 @@ files:
- "db-4.8.30.NC.tar.gz"
script: |
STAGING="$HOME/install"
+ TEMPDIR="$HOME/tmp"
OPTFLAGS='-O2'
+ export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1
+ export FAKETIME=$REFERENCE_DATETIME
+ export TZ=UTC
export LIBRARY_PATH="$STAGING/lib"
# Integrity Check
echo "f74f15e8c8ff11aa3d5bb5f276d202ec18d7246e95f961db76054199c69c1ae3 openssl-1.0.1e.tar.gz" | sha256sum -c
@@ -36,6 +41,7 @@ script: |
cd openssl-1.0.1e
# need -fPIC to avoid relocation error in 64 bit builds
./config no-shared no-zlib no-dso no-krb5 --openssldir=$STAGING -fPIC
+ # need to build OpenSSL with faketime because a timestamp is embedded into cversion.o
make
make install_sw
cd ..
@@ -47,18 +53,26 @@ script: |
rm -f $STAGING/lib/libminiupnpc.so* # no way to skip shared lib build
cd ..
#
- tar xjfm qrencode-3.4.3.tar.bz2
+ tar xjf qrencode-3.4.3.tar.bz2
cd qrencode-3.4.3
+ unset FAKETIME # unset fake time during configure, as it does some clock sanity tests
# need --with-pic to avoid relocation error in 64 bit builds
- ./configure --prefix=$STAGING --enable-static --disable-shared -with-pic --without-tools
+ ./configure --prefix=$STAGING --enable-static --disable-shared --with-pic --without-tools --disable-dependency-tracking
+ # Workaround to prevent re-configuring by make; make all files have a date in the past
+ find . -print0 | xargs -r0 touch -t 200001010000
+ export FAKETIME=$REFERENCE_DATETIME
make $MAKEOPTS install
cd ..
#
- tar xjfm protobuf-2.5.0.tar.bz2
+ tar xjf protobuf-2.5.0.tar.bz2
cd protobuf-2.5.0
mkdir -p $STAGING/host/bin
+ unset FAKETIME # unset fake time during configure, as it does some clock sanity tests
# need --with-pic to avoid relocation error in 64 bit builds
- ./configure --prefix=$STAGING --bindir=$STAGING/host/bin --enable-static --disable-shared --with-pic
+ ./configure --prefix=$STAGING --bindir=$STAGING/host/bin --enable-static --disable-shared --with-pic --without-zlib
+ # Workaround to prevent re-configuring by make; make all files have a date in the past
+ find . -print0 | xargs -r0 touch -t 200001010000
+ export FAKETIME=$REFERENCE_DATETIME
make $MAKEOPTS install
cd ..
#
@@ -66,9 +80,19 @@ script: |
cd db-4.8.30.NC/build_unix
# need --with-pic to avoid relocation error in 64 bit builds
../dist/configure --prefix=$STAGING --enable-cxx --disable-shared --with-pic
+ # Workaround to prevent re-configuring by make; make all files have a date in the past
+ find . -print0 | xargs -r0 touch -t 200001010000
make $MAKEOPTS library_build
make install_lib install_include
cd ../..
+ # post-process all generated libraries to be deterministic
+ # extract them to a temporary directory then re-build them deterministically
+ for LIB in $(find $STAGING -name \*.a); do
+ rm -rf $TEMPDIR && mkdir $TEMPDIR && cd $TEMPDIR
+ ar xv $LIB | cut -b5- > /tmp/list.txt
+ rm $LIB
+ ar crsD $LIB $(cat /tmp/list.txt)
+ done
#
cd $STAGING
- zip -r $OUTDIR/bitcoin-deps-linux${GBUILD_BITS}-gitian-r2.zip include lib bin host
+ find include lib bin host | sort | zip -X@ $OUTDIR/bitcoin-deps-linux${GBUILD_BITS}-gitian-r3.zip
diff --git a/contrib/gitian-descriptors/deps-win.yml b/contrib/gitian-descriptors/deps-win.yml
new file mode 100644
index 0000000000..87ebf3e87b
--- /dev/null
+++ b/contrib/gitian-descriptors/deps-win.yml
@@ -0,0 +1,128 @@
+---
+name: "bitcoin-deps"
+suites:
+- "precise"
+architectures:
+- "amd64"
+packages:
+- "mingw-w64"
+- "g++-mingw-w64"
+- "git-core"
+- "zip"
+- "faketime"
+- "psmisc"
+reference_datetime: "2011-01-30 00:00:00"
+remotes: []
+files:
+- "openssl-1.0.1e.tar.gz"
+- "db-4.8.30.NC.tar.gz"
+- "miniupnpc-1.8.tar.gz"
+- "zlib-1.2.8.tar.gz"
+- "libpng-1.6.8.tar.gz"
+- "qrencode-3.4.3.tar.bz2"
+script: |
+ #
+ export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1
+ export FAKETIME=$REFERENCE_DATETIME
+ export TZ=UTC
+ INDIR=$HOME/build
+ TEMPDIR=$HOME/tmp
+ # Input Integrity Check
+ echo "f74f15e8c8ff11aa3d5bb5f276d202ec18d7246e95f961db76054199c69c1ae3 openssl-1.0.1e.tar.gz" | sha256sum -c
+ echo "12edc0df75bf9abd7f82f821795bcee50f42cb2e5f76a6a281b85732798364ef db-4.8.30.NC.tar.gz" | sha256sum -c
+ echo "bc5f73c7b0056252c1888a80e6075787a1e1e9112b808f863a245483ff79859c miniupnpc-1.8.tar.gz" | sha256sum -c
+ echo "36658cb768a54c1d4dec43c3116c27ed893e88b02ecfcb44f2166f9c0b7f2a0d zlib-1.2.8.tar.gz" | sha256sum -c
+ echo "32c7acf1608b9c8b71b743b9780adb7a7b347563dbfb4a5263761056da44cc96 libpng-1.6.8.tar.gz" | sha256sum -c
+ echo "dfd71487513c871bad485806bfd1fdb304dedc84d2b01a8fb8e0940b50597a98 qrencode-3.4.3.tar.bz2" | sha256sum -c
+
+ for BITS in 32 64; do # for architectures
+ #
+ INSTALLPREFIX=$HOME/staging${BITS}
+ BUILDDIR=$HOME/build${BITS}
+ if [ "$BITS" == "32" ]; then
+ HOST=i686-w64-mingw32
+ else
+ HOST=x86_64-w64-mingw32
+ fi
+ #
+ mkdir -p $INSTALLPREFIX $BUILDDIR
+ cd $BUILDDIR
+ #
+ tar xzf $INDIR/openssl-1.0.1e.tar.gz
+ cd openssl-1.0.1e
+ if [ "$BITS" == "32" ]; then
+ OPENSSL_TGT=mingw
+ else
+ OPENSSL_TGT=mingw64
+ fi
+ ./Configure --cross-compile-prefix=$HOST- ${OPENSSL_TGT} no-shared no-dso --openssldir=$INSTALLPREFIX
+ make
+ make install_sw
+ cd ..
+ #
+ tar xzf $INDIR/db-4.8.30.NC.tar.gz
+ cd db-4.8.30.NC/build_unix
+ ../dist/configure --prefix=$INSTALLPREFIX --enable-mingw --enable-cxx --host=$HOST --disable-shared
+ make $MAKEOPTS library_build
+ make install_lib install_include
+ cd ../..
+ #
+ tar xzf $INDIR/miniupnpc-1.8.tar.gz
+ cd miniupnpc-1.8
+ echo "
+ --- miniupnpc-1.8/Makefile.mingw.orig 2013-09-29 18:52:51.014087958 -1000
+ +++ miniupnpc-1.8/Makefile.mingw 2013-09-29 19:09:29.663318691 -1000
+ @@ -67,8 +67,8 @@
+
+ wingenminiupnpcstrings.o: wingenminiupnpcstrings.c
+
+ -miniupnpcstrings.h: miniupnpcstrings.h.in wingenminiupnpcstrings
+ - wingenminiupnpcstrings \$< \$@
+ +miniupnpcstrings.h: miniupnpcstrings.h.in
+ + sed -e 's|OS/version|MSWindows/5.1.2600|' -e 's|MINIUPNPC_VERSION_STRING \"version\"|MINIUPNPC_VERSION_STRING \"VERSIONHERE\"|' \$< > \$@
+
+ minixml.o: minixml.c minixml.h miniupnpcstrings.h
+
+ " | sed "s/VERSIONHERE/$(cat VERSION)/" | patch -p1
+ mkdir -p dll
+ make -f Makefile.mingw CC=$HOST-gcc AR=$HOST-ar libminiupnpc.a
+ install -d $INSTALLPREFIX/include/miniupnpc
+ install *.h $INSTALLPREFIX/include/miniupnpc
+ install libminiupnpc.a $INSTALLPREFIX/lib
+ cd ..
+ #
+ tar xzf $INDIR/zlib-1.2.8.tar.gz
+ cd zlib-1.2.8
+ CROSS_PREFIX=$HOST- ./configure --prefix=$INSTALLPREFIX --static
+ make
+ make install
+ cd ..
+ #
+ tar xzf $INDIR/libpng-1.6.8.tar.gz
+ cd libpng-1.6.8
+ OPT="-O2"
+ CPPFLAGS="${OPT} -I$INSTALLPREFIX/include" CFLAGS="${OPT} -I$INSTALLPREFIX/include" LDFLAGS="${OPT} -L$INSTALLPREFIX/lib" ./configure --disable-shared --prefix=$INSTALLPREFIX --host=$HOST
+ make $MAKEOPTS
+ make install
+ cd ..
+ #
+ tar xjf $INDIR/qrencode-3.4.3.tar.bz2
+ cd qrencode-3.4.3
+ png_CFLAGS="-I$INSTALLPREFIX/include" png_LIBS="-L$INSTALLPREFIX/lib -lpng" ./configure --prefix=$INSTALLPREFIX --host=$HOST --enable-static --disable-shared --without-tools --disable-dependency-tracking
+ # Workaround to prevent re-configuring by make (resulting in missing m4 error); make all files have a date in the past
+ find . -print0 | xargs -r0 touch -t 200001010000
+ make
+ make install
+ cd ..
+ # post-process all generated libraries to be deterministic
+ # extract them to a temporary directory then re-build them deterministically
+ for LIB in $(find $INSTALLPREFIX -name \*.a); do
+ rm -rf $TEMPDIR && mkdir $TEMPDIR && cd $TEMPDIR
+ $HOST-ar xv $LIB | cut -b5- > /tmp/list.txt
+ rm $LIB
+ $HOST-ar crsD $LIB $(cat /tmp/list.txt)
+ done
+ #
+ cd $INSTALLPREFIX
+ find include lib | sort | zip -X@ $OUTDIR/bitcoin-deps-win$BITS-gitian-r10.zip
+ done # for BITS in
diff --git a/contrib/gitian-descriptors/deps-win32.yml b/contrib/gitian-descriptors/deps-win32.yml
deleted file mode 100644
index 12b9dfc70c..0000000000
--- a/contrib/gitian-descriptors/deps-win32.yml
+++ /dev/null
@@ -1,101 +0,0 @@
----
-name: "bitcoin-deps"
-suites:
-- "precise"
-architectures:
-- "amd64"
-packages:
-- "mingw-w64"
-- "g++-mingw-w64"
-- "git-core"
-- "zip"
-- "faketime"
-- "psmisc"
-reference_datetime: "2011-01-30 00:00:00"
-remotes: []
-files:
-- "openssl-1.0.1e.tar.gz"
-- "db-4.8.30.NC.tar.gz"
-- "miniupnpc-1.8.tar.gz"
-- "zlib-1.2.8.tar.gz"
-- "libpng-1.6.8.tar.gz"
-- "qrencode-3.4.3.tar.bz2"
-script: |
- #
- export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1
- export FAKETIME=$REFERENCE_DATETIME
- export TZ=UTC
- export INSTALLPREFIX=$OUTDIR/staging/deps
- export HOST=i686-w64-mingw32
- # Input Integrity Check
- echo "f74f15e8c8ff11aa3d5bb5f276d202ec18d7246e95f961db76054199c69c1ae3 openssl-1.0.1e.tar.gz" | sha256sum -c
- echo "12edc0df75bf9abd7f82f821795bcee50f42cb2e5f76a6a281b85732798364ef db-4.8.30.NC.tar.gz" | sha256sum -c
- echo "bc5f73c7b0056252c1888a80e6075787a1e1e9112b808f863a245483ff79859c miniupnpc-1.8.tar.gz" | sha256sum -c
- echo "36658cb768a54c1d4dec43c3116c27ed893e88b02ecfcb44f2166f9c0b7f2a0d zlib-1.2.8.tar.gz" | sha256sum -c
- echo "32c7acf1608b9c8b71b743b9780adb7a7b347563dbfb4a5263761056da44cc96 libpng-1.6.8.tar.gz" | sha256sum -c
- echo "dfd71487513c871bad485806bfd1fdb304dedc84d2b01a8fb8e0940b50597a98 qrencode-3.4.3.tar.bz2" | sha256sum -c
-
- mkdir -p $INSTALLPREFIX
-
- tar xzf openssl-1.0.1e.tar.gz
- cd openssl-1.0.1e
- ./Configure --cross-compile-prefix=$HOST- mingw --openssldir=$INSTALLPREFIX
- make
- make install_sw
- cd ..
- #
- tar xzf db-4.8.30.NC.tar.gz
- cd db-4.8.30.NC/build_unix
- ../dist/configure --prefix=$INSTALLPREFIX --enable-mingw --enable-cxx --host=$HOST --disable-shared
- make $MAKEOPTS library_build
- make install_lib install_include
- cd ../..
- #
- tar xzf miniupnpc-1.8.tar.gz
- cd miniupnpc-1.8
- echo "
- --- miniupnpc-1.8/Makefile.mingw.orig 2013-09-29 18:52:51.014087958 -1000
- +++ miniupnpc-1.8/Makefile.mingw 2013-09-29 19:09:29.663318691 -1000
- @@ -67,8 +67,8 @@
-
- wingenminiupnpcstrings.o: wingenminiupnpcstrings.c
-
- -miniupnpcstrings.h: miniupnpcstrings.h.in wingenminiupnpcstrings
- - wingenminiupnpcstrings \$< \$@
- +miniupnpcstrings.h: miniupnpcstrings.h.in
- + sed -e 's|OS/version|MSWindows/5.1.2600|' -e 's|MINIUPNPC_VERSION_STRING \"version\"|MINIUPNPC_VERSION_STRING \"VERSIONHERE\"|' \$< > \$@
-
- minixml.o: minixml.c minixml.h miniupnpcstrings.h
-
- " | sed "s/VERSIONHERE/$(cat VERSION)/" | patch -p1
- mkdir -p dll
- make -f Makefile.mingw CC=$HOST-gcc AR=$HOST-ar libminiupnpc.a
- install -d $INSTALLPREFIX/include/miniupnpc
- install *.h $INSTALLPREFIX/include/miniupnpc
- install libminiupnpc.a $INSTALLPREFIX/lib
- cd ..
- #
- tar xzf zlib-1.2.8.tar.gz
- cd zlib-1.2.8
- CROSS_PREFIX=$HOST- ./configure --prefix=$INSTALLPREFIX --static
- make
- make install
- cd ..
- #
- tar xzf libpng-1.6.8.tar.gz
- cd libpng-1.6.8
- OPT="-O2"
- CPPFLAGS="${OPT} -I$INSTALLPREFIX/include" CFLAGS="${OPT} -I$INSTALLPREFIX/include" LDFLAGS="${OPT} -L$INSTALLPREFIX/lib" ./configure --disable-shared --prefix=$INSTALLPREFIX --host=$HOST
- make $MAKEOPTS
- make install
- cd ..
- #
- tar xjf qrencode-3.4.3.tar.bz2
- cd qrencode-3.4.3
- png_CFLAGS="-I$INSTALLPREFIX/include" png_LIBS="-L$INSTALLPREFIX/lib -lpng" ./configure --prefix=$INSTALLPREFIX --host=$HOST
- make
- make install
- cd ..
- #
- cd $INSTALLPREFIX
- zip -r $OUTDIR/bitcoin-deps-win32-gitian-r10.zip include lib
diff --git a/contrib/gitian-descriptors/gitian-linux.yml b/contrib/gitian-descriptors/gitian-linux.yml
index 417f31e270..bf355fd828 100644
--- a/contrib/gitian-descriptors/gitian-linux.yml
+++ b/contrib/gitian-descriptors/gitian-linux.yml
@@ -6,6 +6,7 @@ architectures:
- "i386"
- "amd64"
packages:
+- "g++"
- "libqt4-dev"
- "git-core"
- "unzip"
@@ -20,33 +21,40 @@ remotes:
- "url": "https://github.com/bitcoin/bitcoin.git"
"dir": "bitcoin"
files:
-- "bitcoin-deps-linux32-gitian-r2.zip"
-- "bitcoin-deps-linux64-gitian-r2.zip"
+- "bitcoin-deps-linux32-gitian-r3.zip"
+- "bitcoin-deps-linux64-gitian-r3.zip"
- "boost-linux32-1.55.0-gitian-r1.zip"
- "boost-linux64-1.55.0-gitian-r1.zip"
script: |
STAGING="$HOME/install"
OPTFLAGS='-O2'
BINDIR="${OUTDIR}/bin/${GBUILD_BITS}" # 32/64 bit build specific output directory
+ TEMPDIR="$HOME/tempdir"
+ export TZ=UTC
export LIBRARY_PATH="$STAGING/lib"
mkdir -p ${BINDIR}
#
mkdir -p $STAGING
cd $STAGING
- unzip ../build/bitcoin-deps-linux${GBUILD_BITS}-gitian-r2.zip
+ unzip ../build/bitcoin-deps-linux${GBUILD_BITS}-gitian-r3.zip
unzip ../build/boost-linux${GBUILD_BITS}-1.55.0-gitian-r1.zip
cd ../build
#
cd bitcoin
- export TAR_OPTIONS=--mtime=`echo $REFERENCE_DATETIME | awk '{ print $1 }'`
./autogen.sh
./configure --prefix=$STAGING --bindir=$BINDIR --with-protoc-bindir=$STAGING/host/bin --with-boost=$STAGING --disable-maintainer-mode --disable-dependency-tracking PKG_CONFIG_PATH="$STAGING/lib/pkgconfig" CPPFLAGS="-I$STAGING/include ${OPTFLAGS}" LDFLAGS="-L$STAGING/lib ${OPTFLAGS}" CXXFLAGS="-frandom-seed=bitcoin ${OPTFLAGS}" BOOST_CHRONO_EXTRALIBS="-lrt"
make dist
+ DISTNAME=`echo bitcoin-*.tar.gz`
mkdir -p distsrc
cd distsrc
- tar --strip-components=1 -xf ../bitcoin-*.tar.*
+ tar --strip-components=1 -xf ../$DISTNAME
./configure --prefix=$STAGING --bindir=$BINDIR --with-protoc-bindir=$STAGING/host/bin --with-boost=$STAGING --disable-maintainer-mode --disable-dependency-tracking PKG_CONFIG_PATH="$STAGING/lib/pkgconfig" CPPFLAGS="-I$STAGING/include ${OPTFLAGS}" LDFLAGS="-L$STAGING/lib ${OPTFLAGS}" CXXFLAGS="-frandom-seed=bitcoin ${OPTFLAGS}" BOOST_CHRONO_EXTRALIBS="-lrt"
make $MAKEOPTS
make $MAKEOPTS install-strip
+
+ # sort distribution tar file and normalize user/group/mtime information for deterministic output
mkdir -p $OUTDIR/src
- cp ../bitcoin-*.tar.* $OUTDIR/src
+ rm -rf $TEMPDIR
+ mkdir -p $TEMPDIR
+ cd $TEMPDIR
+ tar -xvf $HOME/build/bitcoin/$DISTNAME | sort | tar --no-recursion -cT /dev/stdin --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 --mtime="$REFERENCE_DATETIME" | gzip -n > $OUTDIR/src/$DISTNAME
diff --git a/contrib/gitian-descriptors/gitian-win.yml b/contrib/gitian-descriptors/gitian-win.yml
new file mode 100644
index 0000000000..6e43c21823
--- /dev/null
+++ b/contrib/gitian-descriptors/gitian-win.yml
@@ -0,0 +1,97 @@
+---
+name: "bitcoin"
+suites:
+- "precise"
+architectures:
+- "amd64"
+packages:
+- "mingw-w64"
+- "g++-mingw-w64"
+- "git-core"
+- "unzip"
+- "nsis"
+- "faketime"
+- "autoconf2.13"
+- "libtool"
+- "automake"
+- "pkg-config"
+- "bsdmainutils"
+
+reference_datetime: "2013-06-01 00:00:00"
+remotes:
+- "url": "https://github.com/bitcoin/bitcoin.git"
+ "dir": "bitcoin"
+files:
+- "qt-win32-5.2.0-gitian-r2.zip"
+- "qt-win64-5.2.0-gitian-r2.zip"
+- "boost-win32-1.55.0-gitian-r6.zip"
+- "boost-win64-1.55.0-gitian-r6.zip"
+- "bitcoin-deps-win32-gitian-r10.zip"
+- "bitcoin-deps-win64-gitian-r10.zip"
+- "protobuf-win32-2.5.0-gitian-r4.zip"
+- "protobuf-win64-2.5.0-gitian-r4.zip"
+script: |
+ # Defines
+ export TZ=UTC
+ INDIR=$HOME/build
+ OPTFLAGS='-O2'
+ TEMPDIR="$HOME/tempdir"
+ NEEDDIST=1
+ # Qt: workaround for determinism in resource ordering
+ # Qt5's rcc uses a QHash to store the files for the resource.
+ # A security fix in QHash makes the ordering of keys to be different on every run
+ # (https://qt.gitorious.org/qt/qtbase/commit/c01eaa438200edc9a3bbcd8ae1e8ded058bea268).
+ # This is good in general but qrc shouldn't be doing a traversal over a randomized container.
+ # The thorough solution would be to use QMap instead of QHash, but this requires patching Qt.
+ # For now luckily there is a test mode that forces a fixed seed.
+ export QT_RCC_TEST=1
+ for BITS in 32 64; do # for architectures
+ #
+ STAGING=$HOME/staging${BITS}
+ BUILDDIR=$HOME/build${BITS}
+ BINDIR=$OUTDIR/$BITS
+ if [ "$BITS" == "32" ]; then
+ HOST=i686-w64-mingw32
+ else
+ HOST=x86_64-w64-mingw32
+ fi
+ export PATH=$STAGING/host/bin:$PATH
+ mkdir -p $STAGING $BUILDDIR $BINDIR
+ #
+ cd $STAGING
+ unzip $INDIR/qt-win${BITS}-5.2.0-gitian-r2.zip
+ unzip $INDIR/boost-win${BITS}-1.55.0-gitian-r6.zip
+ unzip $INDIR/bitcoin-deps-win${BITS}-gitian-r10.zip
+ unzip $INDIR/protobuf-win${BITS}-2.5.0-gitian-r4.zip
+ if [ "$NEEDDIST" == "1" ]; then
+ # Make source code archive which is architecture independent so it only needs to be done once
+ cd $HOME/build/bitcoin
+ ./autogen.sh
+ ./configure --bindir=$OUTDIR --prefix=$STAGING --host=$HOST --with-qt-plugindir=$STAGING/plugins --with-qt-incdir=$STAGING/include --with-qt-bindir=$STAGING/host/bin --with-boost=$STAGING --disable-maintainer-mode --with-protoc-bindir=$STAGING/host/bin --disable-dependency-tracking CPPFLAGS="-I$STAGING/include ${OPTFLAGS}" LDFLAGS="-L$STAGING/lib ${OPTFLAGS}" CXXFLAGS="-frandom-seed=bitcoin ${OPTFLAGS}"
+ make dist
+ DISTNAME=`echo bitcoin-*.tar.gz`
+ NEEDDIST=0
+ fi
+ # Build platform-dependent executables from source archive
+ cd $BUILDDIR
+ mkdir -p distsrc
+ cd distsrc
+ tar --strip-components=1 -xf $HOME/build/bitcoin/$DISTNAME
+ ./configure --bindir=$BINDIR --prefix=$STAGING --host=$HOST --with-qt-plugindir=$STAGING/plugins --with-qt-incdir=$STAGING/include --with-qt-bindir=$STAGING/host/bin --with-boost=$STAGING --disable-maintainer-mode --with-protoc-bindir=$STAGING/host/bin --disable-dependency-tracking CPPFLAGS="-I$STAGING/include ${OPTFLAGS}" LDFLAGS="-L$STAGING/lib ${OPTFLAGS}" CXXFLAGS="-frandom-seed=bitcoin ${OPTFLAGS}"
+ export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1
+ export FAKETIME=$REFERENCE_DATETIME
+ make $MAKEOPTS
+ make deploy
+ make install-strip
+ cp -f bitcoin-*setup*.exe $BINDIR/
+ unset LD_PRELOAD
+ unset FAKETIME
+ done # for BITS in
+
+ # sort distribution tar file and normalize user/group/mtime information for deterministic output
+ mkdir -p $OUTDIR/src
+ rm -rf $TEMPDIR
+ mkdir -p $TEMPDIR
+ cd $TEMPDIR
+ tar -xvf $HOME/build/bitcoin/$DISTNAME | sort | tar --no-recursion -cT /dev/stdin --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 --mtime="$REFERENCE_DATETIME" | gzip -n > $OUTDIR/src/$DISTNAME
+
diff --git a/contrib/gitian-descriptors/gitian-win32.yml b/contrib/gitian-descriptors/gitian-win32.yml
deleted file mode 100644
index eac74272c5..0000000000
--- a/contrib/gitian-descriptors/gitian-win32.yml
+++ /dev/null
@@ -1,62 +0,0 @@
----
-name: "bitcoin"
-suites:
-- "precise"
-architectures:
-- "amd64"
-packages:
-- "mingw-w64"
-- "g++-mingw-w64"
-- "git-core"
-- "unzip"
-- "nsis"
-- "faketime"
-- "autoconf2.13"
-- "libtool"
-- "automake"
-- "pkg-config"
-- "bsdmainutils"
-
-reference_datetime: "2013-06-01 00:00:00"
-remotes:
-- "url": "https://github.com/bitcoin/bitcoin.git"
- "dir": "bitcoin"
-files:
-- "qt-win32-5.2.0-gitian-r1.zip"
-- "boost-win32-1.55.0-gitian-r6.zip"
-- "bitcoin-deps-win32-gitian-r10.zip"
-- "protobuf-win32-2.5.0-gitian-r4.zip"
-script: |
- #
- STAGING=$HOME/staging
- HOST=i686-w64-mingw32
- OPTFLAGS='-O2'
- #
- mkdir -p $STAGING
- cd $STAGING
- unzip ../build/qt-win32-5.2.0-gitian-r1.zip
- unzip ../build/boost-win32-1.55.0-gitian-r6.zip
- unzip ../build/bitcoin-deps-win32-gitian-r10.zip
- unzip ../build/protobuf-win32-2.5.0-gitian-r4.zip
- cd $HOME/build/
- #
- cd bitcoin
- export PATH=$STAGING/host/bin:$PATH
- export TAR_OPTIONS=--mtime=`echo $REFERENCE_DATETIME | awk '{ print $1 }'`
- ./autogen.sh
- ./configure --bindir=$OUTDIR --prefix=$STAGING --host=$HOST --with-qt-plugindir=$STAGING/plugins --with-qt-incdir=$STAGING/include --with-qt-bindir=$STAGING/host/bin --with-boost=$STAGING --disable-maintainer-mode --with-protoc-bindir=$STAGING/host/bin --disable-dependency-tracking CPPFLAGS="-I$STAGING/include ${OPTFLAGS}" LDFLAGS="-L$STAGING/lib ${OPTFLAGS}" CXXFLAGS="-frandom-seed=bitcoin ${OPTFLAGS}"
- make dist
- mkdir -p distsrc
- cd distsrc
- tar --strip-components=1 -xf ../bitcoin-*.tar.*
- ./configure --bindir=$OUTDIR --prefix=$STAGING --host=i686-w64-mingw32 --with-qt-plugindir=$STAGING/plugins --with-qt-incdir=$STAGING/include --with-qt-bindir=$STAGING/host/bin --with-boost=$STAGING --disable-maintainer-mode --with-protoc-bindir=$STAGING/host/bin --disable-dependency-tracking CPPFLAGS="-I$STAGING/include ${OPTFLAGS}" LDFLAGS="-L$STAGING/lib ${OPTFLAGS}" CXXFLAGS="-frandom-seed=bitcoin ${OPTFLAGS}"
- export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1
- export FAKETIME=$REFERENCE_DATETIME
- export TZ=UTC
- make $MAKEOPTS
- make deploy
- make install-strip
- cp -f bitcoin-*setup*.exe $OUTDIR/
-
- mkdir -p $OUTDIR/src
- cp -f ../bitcoin-*.tar.* $OUTDIR/src
diff --git a/contrib/gitian-descriptors/protobuf-win.yml b/contrib/gitian-descriptors/protobuf-win.yml
new file mode 100644
index 0000000000..543f20b394
--- /dev/null
+++ b/contrib/gitian-descriptors/protobuf-win.yml
@@ -0,0 +1,65 @@
+---
+name: "protobuf-win32"
+suites:
+- "precise"
+architectures:
+- "amd64"
+packages:
+- "mingw-w64"
+- "g++-mingw-w64"
+- "zip"
+- "faketime"
+reference_datetime: "2013-04-15 00:00:00"
+remotes: []
+files:
+- "protobuf-2.5.0.tar.bz2"
+script: |
+ #
+ export TZ=UTC
+ INDIR=$HOME/build
+ TEMPDIR=$HOME/tmp
+ OPTFLAGS="-O2"
+ # Integrity Check
+ echo "13bfc5ae543cf3aa180ac2485c0bc89495e3ae711fc6fab4f8ffe90dfb4bb677 protobuf-2.5.0.tar.bz2" | sha256sum -c
+
+ for BITS in 32 64; do # for architectures
+ #
+ INSTALLPREFIX=$HOME/staging${BITS}
+ BUILDDIR=$HOME/build${BITS}
+ if [ "$BITS" == "32" ]; then
+ HOST=i686-w64-mingw32
+ else
+ HOST=x86_64-w64-mingw32
+ fi
+ #
+ mkdir -p $INSTALLPREFIX $BUILDDIR
+ cd $BUILDDIR
+ #
+ tar xjf $INDIR/protobuf-2.5.0.tar.bz2
+ cd protobuf-2.5.0
+ # First: build a native (linux) protoc
+ ./configure --enable-shared=no --disable-dependency-tracking
+ make
+ mkdir -p $INSTALLPREFIX/host/bin
+ cp src/protoc $INSTALLPREFIX/host/bin
+ # Now recompile with the mingw cross-compiler:
+ make distclean
+ ./configure --prefix=$INSTALLPREFIX --enable-shared=no --disable-dependency-tracking --with-protoc=$INSTALLPREFIX/host/bin/protoc --host=$HOST CXXFLAGS="-frandom-seed=11 ${OPTFLAGS}"
+ export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1
+ export FAKETIME=$REFERENCE_DATETIME
+ make
+ make install
+ # post-process all generated libraries to be deterministic
+ # extract them to a temporary directory then re-build them deterministically
+ for LIB in $(find $INSTALLPREFIX -name \*.a); do
+ rm -rf $TEMPDIR && mkdir $TEMPDIR && cd $TEMPDIR
+ $HOST-ar xv $LIB | cut -b5- > /tmp/list.txt
+ rm $LIB
+ $HOST-ar crsD $LIB $(cat /tmp/list.txt)
+ done
+ #
+ cd $INSTALLPREFIX
+ find include lib host | sort | zip -X@ $OUTDIR/protobuf-win$BITS-2.5.0-gitian-r4.zip
+ unset LD_PRELOAD
+ unset FAKETIME
+ done # for BITS in
diff --git a/contrib/gitian-descriptors/protobuf-win32.yml b/contrib/gitian-descriptors/protobuf-win32.yml
deleted file mode 100644
index e93f92bbfe..0000000000
--- a/contrib/gitian-descriptors/protobuf-win32.yml
+++ /dev/null
@@ -1,45 +0,0 @@
----
-name: "protobuf-win32"
-suites:
-- "precise"
-architectures:
-- "amd64"
-packages:
-- "mingw-w64"
-- "g++-mingw-w64"
-- "zip"
-- "faketime"
-reference_datetime: "2013-04-15 00:00:00"
-remotes: []
-files:
-- "protobuf-2.5.0.tar.bz2"
-script: |
- #
- export TZ=UTC
- export INSTALLPREFIX=$OUTDIR/staging/deps
- export HOST=i686-w64-mingw32
- OPTFLAGS="-O2"
- # Integrity Check
- echo "13bfc5ae543cf3aa180ac2485c0bc89495e3ae711fc6fab4f8ffe90dfb4bb677 protobuf-2.5.0.tar.bz2" | sha256sum -c
-
- #
- mkdir -p $INSTALLPREFIX
-
- tar xjf protobuf-2.5.0.tar.bz2
- cd protobuf-2.5.0
- # First: build a native (linux) protoc
- ./configure --enable-shared=no --disable-dependency-tracking
- make
- mkdir -p $INSTALLPREFIX/host/bin
- cp src/protoc $INSTALLPREFIX/host/bin
- # Now recompile with the mingw cross-compiler:
- make distclean
- ./configure --prefix=$INSTALLPREFIX --enable-shared=no --disable-dependency-tracking --with-protoc=$INSTALLPREFIX/host/bin/protoc --host=$HOST CXXFLAGS="-frandom-seed=11 ${OPTFLAGS}"
- make
- make install
- cd $INSTALLPREFIX
- export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1
- export FAKETIME=$REFERENCE_DATETIME
- zip -r $OUTDIR/protobuf-win32-2.5.0-gitian-r4.zip include lib host
- unset LD_PRELOAD
- unset FAKETIME
diff --git a/contrib/gitian-descriptors/qt-win.yml b/contrib/gitian-descriptors/qt-win.yml
new file mode 100644
index 0000000000..e3de2c02ef
--- /dev/null
+++ b/contrib/gitian-descriptors/qt-win.yml
@@ -0,0 +1,92 @@
+---
+name: "qt"
+suites:
+- "precise"
+architectures:
+- "amd64"
+packages:
+- "mingw-w64"
+- "g++-mingw-w64"
+- "zip"
+- "unzip"
+- "faketime"
+- "libz-dev"
+reference_datetime: "2011-01-30 00:00:00"
+remotes: []
+files:
+- "qt-everywhere-opensource-src-5.2.0.tar.gz"
+- "bitcoin-deps-win32-gitian-r10.zip"
+- "bitcoin-deps-win64-gitian-r10.zip"
+script: |
+ # Defines
+ export TZ=UTC
+ INDIR=$HOME/build
+ TEMPDIR=$HOME/tmp
+ # Qt: workaround for determinism in resource ordering
+ # Qt5's rcc uses a QHash to store the files for the resource.
+ # A security fix in QHash makes the ordering of keys to be different on every run
+ # (https://qt.gitorious.org/qt/qtbase/commit/c01eaa438200edc9a3bbcd8ae1e8ded058bea268).
+ # This is good in general but qrc shouldn't be doing a traversal over a randomized container.
+ # The thorough solution would be to use QMap instead of QHash, but this requires patching Qt.
+ # For now luckily there is a test mode that forces a fixed seed.
+ export QT_RCC_TEST=1
+ # Integrity Check
+ echo "395ec72277c5786c65b8163ef5817fd03d0a1f524a6d47f53624baf8056f1081 qt-everywhere-opensource-src-5.2.0.tar.gz" | sha256sum -c
+
+ for BITS in 32 64; do # for architectures
+ #
+ INSTALLPREFIX=$HOME/staging${BITS}
+ BUILDDIR=$HOME/build${BITS}
+ DEPSDIR=$HOME/deps${BITS}
+ if [ "$BITS" == "32" ]; then
+ HOST=i686-w64-mingw32
+ else
+ HOST=x86_64-w64-mingw32
+ fi
+ #
+ mkdir -p $INSTALLPREFIX $INSTALLPREFIX/host/bin $DEPSDIR $BUILDDIR
+ #
+ # Need mingw-compiled openssl from bitcoin-deps:
+ cd $DEPSDIR
+ unzip $INDIR/bitcoin-deps-win${BITS}-gitian-r10.zip
+ #
+ cd $BUILDDIR
+ #
+ tar xzf $INDIR/qt-everywhere-opensource-src-5.2.0.tar.gz
+ cd qt-everywhere-opensource-src-5.2.0
+ SPECNAME="win32-g++"
+ SPECFILE="qtbase/mkspecs/${SPECNAME}/qmake.conf"
+ sed 's/qt_instdate=`date +%Y-%m-%d`/qt_instdate=2011-01-30/' -i qtbase/configure
+ sed --posix "s|QMAKE_CFLAGS = -pipe -fno-keep-inline-dllexport|QMAKE_CFLAGS\t\t= -pipe -fno-keep-inline-dllexport -isystem /usr/$HOST/include/ -frandom-seed=qtbuild -I$DEPSDIR/include|" -i ${SPECFILE}
+ sed --posix "s|QMAKE_LFLAGS =|QMAKE_LFLAGS\t\t= -L$DEPSDIR/lib|" -i ${SPECFILE}
+ # Before we tried to pass arguments to ar (static linking) in using QMAKE_LIB, however
+ # qt removes the arguments for ar and provides a script which makes it impossible to pass the determinism flag -
+ # so rather than try to replace ar, post-process all libraries and plugins at the end.
+ #
+ # Don't load faketime while compiling Qt, qmake will get stuck in nearly infinite loops
+ #export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1
+ #export FAKETIME=$REFERENCE_DATETIME
+ #
+ # Compile static libraries, and use statically linked openssl (-openssl-linked):
+ OPENSSL_LIBS="-L$DEPSDIR/lib -lssl -lcrypto -lgdi32" ./configure -prefix $INSTALLPREFIX -bindir $INSTALLPREFIX/host/bin -confirm-license -release -opensource -static -xplatform $SPECNAME -device-option CROSS_COMPILE="$HOST-" -no-audio-backend -no-javascript-jit -no-sql-sqlite -no-sql-odbc -no-nis -no-cups -no-iconv -no-dbus -no-gif -no-opengl -no-compile-examples -no-feature-style-windowsce -no-feature-style-windowsmobile -no-qml-debug -openssl-linked -skip qtsvg -skip qtwebkit -skip qtwebkit-examples -skip qtserialport -skip qtdeclarative -skip qtmultimedia -skip qtimageformats -skip qtlocation -skip qtsensors -skip qtquick1 -skip qtquickcontrols -skip qtactiveqt -skip qtconnectivity -skip qtwinextras -skip qtxmlpatterns -skip qtscript -skip qtdoc -system-libpng -system-zlib
+ make $MAKEOPTS install
+ # post-process all generated libraries and plugins to be deterministic
+ # extract them to a temporary directory then re-build them deterministically
+ for LIB in $(find $INSTALLPREFIX -name *.a); do
+ rm -rf $TEMPDIR && mkdir $TEMPDIR && cd $TEMPDIR
+ $HOST-ar xv $LIB | cut -b5- > /tmp/list.txt
+ rm $LIB
+ $HOST-ar crsD $LIB $(cat /tmp/list.txt)
+ done
+ #
+ cd $INSTALLPREFIX
+ # Remove unused non-deterministic stuff
+ rm host/bin/qtpaths.exe lib/libQt5Bootstrap.a lib/libQt5Bootstrap.la
+ # as zip stores file timestamps, use faketime to intercept stat calls to set dates for all files to reference date
+ export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1
+ export FAKETIME=$REFERENCE_DATETIME
+ find -print0 | xargs -r0 touch # fix up timestamps before packaging
+ find | sort | zip -X@ $OUTDIR/qt-win${BITS}-5.2.0-gitian-r2.zip
+ unset LD_PRELOAD
+ unset FAKETIME
+ done # for BITS in
diff --git a/contrib/gitian-descriptors/qt-win32.yml b/contrib/gitian-descriptors/qt-win32.yml
deleted file mode 100644
index 8bc53bbf25..0000000000
--- a/contrib/gitian-descriptors/qt-win32.yml
+++ /dev/null
@@ -1,60 +0,0 @@
----
-name: "qt"
-suites:
-- "precise"
-architectures:
-- "amd64"
-packages:
-- "mingw-w64"
-- "g++-mingw-w64"
-- "zip"
-- "unzip"
-- "faketime"
-- "libz-dev"
-reference_datetime: "2011-01-30 00:00:00"
-remotes: []
-files:
-- "qt-everywhere-opensource-src-5.2.0.tar.gz"
-- "bitcoin-deps-win32-gitian-r10.zip"
-script: |
- #
- HOST=i686-w64-mingw32
- INSTDIR="$HOME/qt/"
- # Integrity Check
- echo "395ec72277c5786c65b8163ef5817fd03d0a1f524a6d47f53624baf8056f1081 qt-everywhere-opensource-src-5.2.0.tar.gz" | sha256sum -c
-
- mkdir $INSTDIR
- mkdir -p $INSTDIR/host/bin
- #
- # Need mingw-compiled openssl from bitcoin-deps:
- unzip bitcoin-deps-win32-gitian-r10.zip
- DEPSDIR=`pwd`
- #
- tar xzf qt-everywhere-opensource-src-5.2.0.tar.gz
- cd qt-everywhere-opensource-src-5.2.0
- SPECNAME="win32-g++"
- SPECFILE="qtbase/mkspecs/${SPECNAME}/qmake.conf"
- sed 's/$TODAY/2011-01-30/' -i configure
- sed --posix "s|QMAKE_CFLAGS = -pipe -fno-keep-inline-dllexport|QMAKE_CFLAGS\t\t= -pipe -fno-keep-inline-dllexport -isystem /usr/$HOST/include/ -frandom-seed=qtbuild -I$DEPSDIR/include|" -i ${SPECFILE}
- sed --posix "s|QMAKE_LFLAGS =|QMAKE_LFLAGS\t\t= -L$DEPSDIR/lib|" -i ${SPECFILE}
- # ar adds timestamps to every object file included in the static library
- # providing -D as ar argument is supposed to solve it, but doesn't work as qmake strips off the arguments and adds -M to pass a script...
- # which somehow cannot be combined with other flags.
- # use faketime only for ar, as it confuses make/qmake into hanging sometimes
- sed --posix "s|QMAKE_LIB = \\\$\\\${CROSS_COMPILE}ar -ru|QMAKE_LIB\t\t= $HOME/ar -Dr|" -i ${SPECFILE}
- echo '#!/bin/bash' > $HOME/ar
- echo 'export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1' >> $HOME/ar
- echo "$HOST-ar \"\$@\"" >> $HOME/ar
- chmod +x $HOME/ar
- #export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1
- export FAKETIME=$REFERENCE_DATETIME
- export TZ=UTC
- #
- # Compile static libraries, and use statically linked openssl (-openssl-linked):
- OPENSSL_LIBS="-L$DEPSDIR/lib -lssl -lcrypto -lgdi32" ./configure -prefix $INSTDIR -bindir $INSTDIR/host/bin -confirm-license -release -opensource -static -xplatform $SPECNAME -device-option CROSS_COMPILE="$HOST-" -no-audio-backend -no-javascript-jit -no-sql-sqlite -no-sql-odbc -no-nis -no-cups -no-iconv -no-dbus -no-gif -no-opengl -no-compile-examples -no-feature-style-windowsce -no-feature-style-windowsmobile -no-qml-debug -openssl-linked -skip qtsvg -skip qtwebkit -skip qtwebkit-examples -skip qtserialport -skip qtdeclarative -skip qtmultimedia -skip qtimageformats -skip qtlocation -skip qtsensors -skip qtquick1 -skip qtquickcontrols -skip qtactiveqt -skip qtconnectivity -skip qtwinextras -skip qtxmlpatterns -skip qtscript -skip qtdoc -system-libpng -system-zlib
- make $MAKEOPTS install
- cd $INSTDIR
-
- # as zip stores file timestamps, use faketime to intercept stat calls to set dates for all files to reference date
- export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1
- zip -r $OUTDIR/qt-win32-5.2.0-gitian-r1.zip *
diff --git a/contrib/linearize/example-linearize.cfg b/contrib/linearize/example-linearize.cfg
index 65bba712a5..f5cdab5325 100644
--- a/contrib/linearize/example-linearize.cfg
+++ b/contrib/linearize/example-linearize.cfg
@@ -1,7 +1,7 @@
# bitcoind RPC settings
rpcuser=someuser
-rpcpass=somepassword
+rpcpassword=somepassword
host=127.0.0.1
port=8332
diff --git a/contrib/linearize/linearize.py b/contrib/linearize/linearize.py
index ea3814ab72..650f7d3684 100644
--- a/contrib/linearize/linearize.py
+++ b/contrib/linearize/linearize.py
@@ -71,7 +71,7 @@ def getblock(rpc, settings, n):
def get_blocks(settings):
rpc = BitcoinRPC(settings['host'], settings['port'],
- settings['rpcuser'], settings['rpcpass'])
+ settings['rpcuser'], settings['rpcpassword'])
outf = open(settings['output'], 'ab')
@@ -118,7 +118,7 @@ if __name__ == '__main__':
settings['min_height'] = 0
if 'max_height' not in settings:
settings['max_height'] = 279000
- if 'rpcuser' not in settings or 'rpcpass' not in settings:
+ if 'rpcuser' not in settings or 'rpcpassword' not in settings:
print "Missing username and/or password in cfg file"
sys.exit(1)
diff --git a/contrib/verifysfbinaries/verify.sh b/contrib/verifysfbinaries/verify.sh
index 768be86bdc..e92295661c 100755
--- a/contrib/verifysfbinaries/verify.sh
+++ b/contrib/verifysfbinaries/verify.sh
@@ -18,7 +18,7 @@ WORKINGDIR="/tmp/bitcoin"
TMPFILE="hashes.tmp"
#this URL is used if a version number is not specified as an argument to the script
-SIGNATUREFILE="http://downloads.sourceforge.net/project/bitcoin/Bitcoin/bitcoin-0.8.2/SHA256SUMS.asc"
+SIGNATUREFILE="http://downloads.sourceforge.net/project/bitcoin/Bitcoin/bitcoin-0.9.0rc1/SHA256SUMS.asc"
SIGNATUREFILENAME="SHA256SUMS.asc"
RCSUBDIR="test/"
diff --git a/doc/README.md b/doc/README.md
index c23d4a484e..148db94214 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -1,7 +1,7 @@
-Bitcoin 0.8.2 BETA
-====================
+Bitcoin 0.9.0rc1 BETA
+=====================
-Copyright (c) 2009-2013 Bitcoin Developers
+Copyright (c) 2009-2014 Bitcoin Developers
Setup
diff --git a/doc/README_windows.txt b/doc/README_windows.txt
index f120b8eb2f..abca4894e2 100644
--- a/doc/README_windows.txt
+++ b/doc/README_windows.txt
@@ -1,6 +1,7 @@
-Bitcoin 0.8.2 BETA
+Bitcoin 0.9.0rc1 BETA
+
+Copyright (c) 2009-2014 Bitcoin Core Developers
-Copyright (c) 2009-2013 Bitcoin Developers
Distributed under the MIT/X11 software license, see the accompanying
file COPYING or http://www.opensource.org/licenses/mit-license.php.
This product includes software developed by the OpenSSL Project for use in
diff --git a/doc/build-osx.md b/doc/build-osx.md
index 381e8b6f0a..fcb9a37f3d 100644
--- a/doc/build-osx.md
+++ b/doc/build-osx.md
@@ -5,7 +5,7 @@ This guide will show you how to build bitcoind(headless client) for OSX.
Notes
-----
-* Tested on OS X 10.5 through 10.8 on Intel processors only. PPC is not
+* Tested on OS X 10.5 through 10.9 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`.
@@ -27,7 +27,7 @@ not, it's the path of least resistance to install [Github for Mac](https://mac.g
[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.io/homebrew/)
+You will also need to install [Homebrew](http://brew.sh)
or [MacPorts](https://www.macports.org/) in order to install library
dependencies. It's largely a religious decision which to choose, but, as of
December 2012, MacPorts is a little easier because you can just install the
@@ -64,20 +64,20 @@ Installing the dependencies using MacPorts is very straightforward.
make check
-Instructions: HomeBrew
+Instructions: Homebrew
----------------------
#### Install dependencies using Homebrew
- brew install boost miniupnpc openssl berkeley-db4
+ brew install autoconf automake berkeley-db4 boost miniupnpc openssl pkg-config protobuf qt
-Note: After you have installed the dependencies, you should check that the Brew installed version of OpenSSL is the one available for compilation. You can check this by typing
+Note: After you have installed the dependencies, you should check that the Homebrew installed version of OpenSSL is the one available for compilation. You can check this by typing
openssl version
-into Terminal. You should see OpenSSL 1.0.1e 11 Feb 2013.
+into Terminal. You should see OpenSSL 1.0.1f 6 Jan 2014.
-If not, you can ensure that the Brew OpenSSL is correctly linked by running
+If not, you can ensure that the Homebrew OpenSSL is correctly linked by running
brew link openssl --force
diff --git a/doc/build-unix.md b/doc/build-unix.md
index 5124205a34..d3a0536b10 100644
--- a/doc/build-unix.md
+++ b/doc/build-unix.md
@@ -87,12 +87,18 @@ Dependencies for the GUI: Ubuntu & Debian
-----------------------------------------
If you want to build Bitcoin-Qt, make sure that the required packages for Qt development
-are installed. Qt 4 is currently necessary to build the GUI.
+are installed. Either Qt 4 or Qt 5 are necessary to build the GUI.
+If both Qt 4 and Qt 5 are installed, Qt 4 will be used. Pass `--with-gui=qt5` to configure to choose Qt5.
+To build without GUI pass `--without-gui`.
To build with Qt 4 you need the following:
apt-get install libqt4-dev libprotobuf-dev protobuf-compiler
+For Qt 5 you need the following:
+
+ apt-get install libqt5gui5 libqt5core5 libqt5dbus5 qttools5-dev-tools libprotobuf-dev
+
libqrencode (optional) can be installed with:
apt-get install libqrencode-dev
diff --git a/doc/release-notes.md b/doc/release-notes.md
index acaeef1d60..8bf0b50bc0 100644
--- a/doc/release-notes.md
+++ b/doc/release-notes.md
@@ -1,3 +1,304 @@
-(note: this is a temporary file, to be added-to by anybody, and deleted at
-release time)
+Bitcoin Core version 0.9.0rc1 is now available from:
+ http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-0.9.0rc1/
+
+This is a release candidate for a new major version. A major version brings
+both new features and bug fixes.
+
+Please report bugs using the issue tracker at github:
+
+ https://github.com/bitcoin/bitcoin/issues
+
+How to Upgrade
+--------------
+
+If you are running an older version, shut it down. Wait until it has completely
+shut down (which might take a few minutes for older versions), uninstall all
+earlier versions of Bitcoin, then run the installer (on Windows) or just copy
+over /Applications/Bitcoin-Qt (on Mac) or bitcoind/bitcoin-qt (on Linux).
+
+If you are upgrading from version 0.7.2 or earlier, the first time you run
+0.9.0 your blockchain files will be re-indexed, which will take anywhere from
+30 minutes to several hours, depending on the speed of your machine.
+
+On Windows, do not forget to uninstall all earlier versions of the Bitcoin
+client first, especially if you are switching to the 64-bit version.
+
+Windows 64-bit installer
+-------------------------
+
+New in 0.9.0 is the Windows 64-bit version of the client. There have been
+frequent reports of users running out of virtual memory on 32-bit systems
+during the initial sync. Because of this it is recommended to install the
+64-bit version if your system supports it.
+
+Rebranding to Bitcoin Core
+---------------------------
+
+To reduce confusion between Bitcoin-the-network and Bitcoin-the-software we
+have renamed the reference client to Bitcoin Core.
+
+Autotools build system
+-----------------------
+
+For 0.9.0 we switched to an autotools-based build system instead of individual
+(q)makefiles.
+
+Using the standard “./autogen.sh; ./configure; make†to build Bitcoin-Qt and
+bitcoind makes it easier for experienced open source developers to contribute
+to the project.
+
+Be sure to check doc/build-*.md for your platform before building from source.
+
+Bitcoin-cli
+-------------
+
+Another change in the 0.9 release is moving away from the bitcoind executable
+functioning both as a server and as a RPC client. The RPC client functionality
+(“tell the running bitcoin daemon to do THISâ€) was split into a separate
+executable, 'bitcoin-cli'. The RPC client code will eventually be removed from
+bitcoind, but will be kept for backwards compatibility for a release or two.
+
+`walletpassphrase` RPC
+-----------------------
+
+The behavior of the `walletpassphrase` RPC when the wallet is already unlocked
+has changed between 0.8 and 0.9.
+
+The 0.8 behavior of `walletpassphrase` is to fail when the wallet is already unlocked:
+
+ > walletpassphrase 1000
+ walletunlocktime = now + 1000
+ > walletpassphrase 10
+ Error: Wallet is already unlocked (old unlock time stays)
+
+The new behavior of `walletpassphrase` is to set a new unlock time overriding
+the old one:
+
+ > walletpassphrase 1000
+ walletunlocktime = now + 1000
+ > walletpassphrase 10
+ walletunlocktime = now + 10 (overriding the old unlock time)
+
+0.9.0rc1 Release notes
+=======================
+
+RPC:
+
+- 'listreceivedbyaddress' now provides tx ids
+- Updated help and tests for 'getreceivedby(account|address)'
+- In 'getblock', accept 2nd 'verbose' parameter, similar to getrawtransaction,
+ but defaulting to 1 for backward compatibility
+- Add 'verifychain', to verify chain database at runtime
+- Add 'dumpwallet' and 'importwallet' RPCs
+- 'keypoolrefill' gains optional size parameter
+- Add 'getbestblockhash', to return tip of best chain
+- Add 'chainwork' (the total work done by all blocks since the genesis block)
+ to 'getblock' output
+- Make RPC password resistant to timing attacks
+- Clarify help messages and add examples
+- Add 'getrawchangeaddress' call for raw transaction change destinations
+- Reject insanely high fees by default in 'sendrawtransaction'
+- Add RPC call 'decodescript' to decode a hex-encoded transaction script
+- Make 'validateaddress' provide redeemScript
+- Add 'getnetworkhashps' to get the calculated network hashrate
+- New RPC 'ping' command to request ping, new 'pingtime' and 'pingwait' fields
+ in 'getpeerinfo' output
+- Adding new 'addrlocal' field to 'getpeerinfo' output
+- Add verbose boolean to 'getrawmempool'
+- Add rpc command 'getunconfirmedbalance' to obtain total unconfirmed balance
+- Explicitly ensure that wallet is unlocked in `importprivkey`
+- Add check for valid keys in `importprivkey`
+
+Command-line options:
+
+- Rename option '-tor' to '-onion' to better reflect what it does
+- Add '-disablewallet' mode to let bitcoind run entirely without wallet (when
+ built with wallet)
+- Update default '-rpcsslciphers' to include TLSv1.2
+- make '-logtimestamps' default on and rework help-message
+- RPC client option: '-rpcwait', to wait for server start
+- Remove '-logtodebugger'
+- Allow `-noserver` with bitcoind
+
+Block-chain handling and storage:
+
+- Update leveldb to 1.15
+- Check for correct genesis (prevent cases where a datadir from the wrong
+ network is accidentally loaded)
+- Allow txindex to be removed and add a reindex dialog
+- Log aborted block database rebuilds
+- Store orphan blocks in serialized form, to save memory
+- Limit the number of orphan blocks in memory to 750
+- Fix non-standard disconnected transactions causing mempool orphans
+- Add a new checkpoint at block 279,000
+
+Wallet:
+
+- Store key creation time. Calculate whole-wallet birthday.
+- Optimize rescan to skip blocks prior to birthday
+- Let user select wallet file with -wallet=foo.dat
+- Consider generated coins mature at 101 instead of 120 blocks
+- Improve wallet load time
+- Don't count txins for priority to encourage sweeping
+- Don't create empty transactions when reading a corrupted wallet
+- Fix rescan to start from beginning after importprivkey
+- Only create signatures with low S values.
+
+Mining:
+
+- Increase default -blockmaxsize/prioritysize to 750K/50K
+- 'getblocktemplate' does not require a key to create a block template
+
+Protocol and network:
+
+- Send tx relay flag with version
+- New 'reject' P2P message (BIP 0061, see https://gist.github.com/gavinandresen/7079034 for draft)
+- Dump addresses every 15 minutes instead of 10 seconds
+- Relay OP_RETURN data TxOut as standard transaction type
+- Remove CENT-output free transaction rule when relaying
+- Lower maximum size for free transaction creation
+- Send multiple inv messages if mempool.size > MAX_INV_SZ
+- Split MIN_PROTO_VERSION into INIT_PROTO_VERSION and MIN_PEER_PROTO_VERSION
+- Do not treat fFromMe transaction differently when broadcasting
+- Process received messages one at a time without sleeping between messages
+- Improve logging of failed connections
+- Bump protocol version to 70002
+- Add some additional logging to give extra network insight
+- Added new DNS seed from bitcoinstats.com
+
+Validation:
+
+- Log reason for non-standard transaction rejection
+- Prune provably-unspendable outputs, and adapt consistency check for it.
+- Detect any sufficiently long fork and add a warning
+- Call the -alertnotify script when we see a long or invalid fork
+- Fix multi-block reorg transaction resurrection
+- Reject non-canonically-encoded serialization sizes
+- Reject dust amounts during validation
+- Accept nLockTime transactions that finalize in the next block
+
+Build system:
+
+- Switch to autotools-based build system
+- Build without wallet by passing `--disable-wallet` to configure, this removes
+ the BerkeleyDB dependency
+- Upgrade gitian dependencies (libpng, libz, libupnpc, boost, openssl) to more
+ recent versions
+- Windows 64-bit build support
+- Solaris compatibility fixes
+- Check integrity of gitian input source tarballs
+- Enable full GCC Stack-smashing protection for all OSes
+
+GUI:
+
+- Switch to Qt 5.2.0 for Windows build
+- Add payment request (BIP 0070) support
+- Improve options dialog
+- Show transaction fee in new send confirmation dialog
+- Add total balance in overview page
+- Allow user to choose data directory on first start, when data directory is
+ missing, or when the -choosedatadir option is passed
+- Save and restore window positions
+- Add vout index to transaction id in transactions details dialog
+- Add network traffic graph in debug window
+- Add open URI dialog
+- Add Coin Control Features
+- Improve receive coins workflow: make the 'Receive' tab into a form to request
+ payments, and move historical address list functionality to File menu.
+- Rebrand to `Bitcoin Core`
+- Move initialization/shutdown to a thread. This prevents “Not respondingâ€
+ messages during startup. Also show a window during shutdown.
+- Don't regenerate autostart link on every client startup
+- Show and store message of normal bitcoin:URI
+- Fix richtext detection hang issue on very old Qt versions
+- osx: Make use of the 10.8+ user notification center to display growl like
+ notifications
+- osx: Added NSHighResolutionCapable flag to Info.plist for better font
+ rendering on Retina displays.
+- osx: Fix bitcoin-qt startup crash when clicking dock icon
+- linux: Fix Gnome bitcoin: URI handler
+
+Miscellaneous:
+
+- Add Linux script (contrib/qos/tc.sh) to limit outgoing bandwidth
+- Add '-regtest' mode, similar to testnet but private with instant block
+ generation with 'setgenerate' RPC.
+- Add 'linearize.py' script to contrib, for creating bootstrap.dat
+- Add separate bitcoin-cli client
+
+Credits
+--------
+
+Thanks to everyone who contributed to this release:
+
+- Andrey
+- bitsofproof
+- Brandon Dahler
+- Christian Decker
+- Christopher Latham
+- Chuck
+- coblee
+- constantined
+- Cory Fields
+- Cozz Lovan
+- Daniel Larimer
+- David Hill
+- Dmitry Smirnov
+- Eric Lombrozo
+- fanquake
+- fcicq
+- Florin
+- Gavin Andresen
+- Gregory Maxwell
+- Guillermo Céspedes Tabárez
+- HaltingState
+- Han Lin Yap
+- harry
+- Jeff Garzik
+- Johnathan Corgan
+- Jonas Schnelli
+- Josh Lehan
+- Josh Triplett
+- Julian Langschaedel
+- Kangmo
+- Lake Denman
+- Luke Dashjr
+- Mark Friedenbach
+- Matt Corallo
+- Michael Bauer
+- Michael Ford
+- Michagogo
+- Mike Hearn
+- Nils Schneider
+- Olivier Langlois
+- patrick s
+- Patrick Strateman
+- Peter Todd
+- phantomcircuit
+- phelixbtc
+- Philip Kaufmann
+- Pieter Wuille
+- Rav3nPL
+- regergregregerrge
+- Robert Backhaus
+- Roman Mindalev
+- Rune K. Svendsen
+- Ryan Niebur
+- Scott Ellis
+- Scott Willeke
+- Sergey Kazenyuk
+- Shawn Wilkinson
+- Sined
+- sje
+- super3
+- Tamas Blummer
+- theuni
+- Thomas Holenstein
+- Timon Rapp
+- Timothy Stranex
+- Vaclav Vobornik
+- vhf / victor felder
+- Vinnie Falco
+- Warren Togami
+- Wladimir J. van der Laan
diff --git a/doc/release-notes/release-notes-0.3.12.md b/doc/release-notes/release-notes-0.3.12.md
new file mode 100644
index 0000000000..38715bc75f
--- /dev/null
+++ b/doc/release-notes/release-notes-0.3.12.md
@@ -0,0 +1,13 @@
+Version 0.3.12 is now available.
+
+Features:
+* json-rpc errors return a more standard error object. (thanks to Gavin Andresen)
+* json-rpc command line returns exit codes.
+* json-rpc "backupwallet" command.
+* Recovers and continues if an exception is caused by a message you received. Other nodes shouldn't be able to cause an exception, and it hasn't happened before, but if a way is found to cause an exception, this would keep it from being used to stop network nodes.
+
+If you have json-rpc code that checks the contents of the error string, you need to change it to expect error objects of the form {"code":<number>,"message":<string>}, which is the standard. See this thread:
+http://www.bitcoin.org/smf/index.php?topic=969.0
+
+Download:
+http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-0.3.12/
diff --git a/doc/release-notes/release-notes-0.3.13.md b/doc/release-notes/release-notes-0.3.13.md
new file mode 100644
index 0000000000..2b95ff233d
--- /dev/null
+++ b/doc/release-notes/release-notes-0.3.13.md
@@ -0,0 +1,26 @@
+Version 0.3.13 is now available. You should upgrade to prevent potential problems with 0/unconfirmed transactions. Note: 0.3.13 prevents problems if you haven't already spent a 0/unconfirmed transaction, but if that already happened, you need 0.3.13.2.
+
+Changes:
+* Don't count or spend payments until they have 1 confirmation.
+* Internal version number from 312 to 31300.
+* Only accept transactions sent by IP address if -allowreceivebyip is specified.
+* Dropped DB_PRIVATE Berkeley DB flag.
+* Fix problem sending the last cent with sub-cent fractional change.
+* Auto-detect whether to use 128-bit 4-way SSE2 on Linux.
+Gavin Andresen:
+* Option -rpcallowip= to accept json-rpc connections from another machine.
+* Clean shutdown on SIGTERM on Linux.
+
+Download:
+http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-0.3.13/
+
+(Thanks Laszlo for the Mac OSX build!)
+
+Note:
+The SSE2 auto-detect in the Linux 64-bit version doesn't work with AMD in 64-bit mode. Please try this instead and let me know if it gets it right:
+http://www.bitcoin.org/download/bitcoin-0.3.13.1-specialbuild-linux64.tar.gz
+
+You can still control the SSE2 use manually with -4way and -4way=0.
+
+Version 0.3.13.2 (SVN rev 161) has improvements for the case where you already had 0/unconfirmed transactions that you might have already spent. Here's a Windows build of it:
+http://www.bitcoin.org/download/bitcoin-0.3.13.2-win32-setup.exe
diff --git a/doc/release-notes/release-notes-0.3.14.md b/doc/release-notes/release-notes-0.3.14.md
new file mode 100644
index 0000000000..e73052ed9b
--- /dev/null
+++ b/doc/release-notes/release-notes-0.3.14.md
@@ -0,0 +1,11 @@
+Version 0.3.14 is now available
+http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-0.3.14/
+
+Changes:
+* Key pool feature for safer wallet backup
+Gavin Andresen:
+* TEST network mode with switch -testnet
+* Option to use SSL for JSON-RPC connections on unix/osx
+* validateaddress RPC command
+eurekafag:
+* Russian translation
diff --git a/doc/release-notes/release-notes-0.3.15.md b/doc/release-notes/release-notes-0.3.15.md
new file mode 100644
index 0000000000..b98052ef59
--- /dev/null
+++ b/doc/release-notes/release-notes-0.3.15.md
@@ -0,0 +1,6 @@
+* paytxfee switch is now per KB, so it adds the correct fee for large transactions
+* sending avoids using coins with less than 6 confirmations if it can
+* BitcoinMiner processes transactions in priority order based on age of dependencies
+* make sure generation doesn't start before block 74000 downloaded
+* bugfixes by Dean Gores
+* testnet, keypoololdest and paytxfee added to getinfo
diff --git a/doc/release-notes/release-notes-0.3.16.md b/doc/release-notes/release-notes-0.3.16.md
new file mode 100644
index 0000000000..743f84f30e
--- /dev/null
+++ b/doc/release-notes/release-notes-0.3.16.md
@@ -0,0 +1 @@
+Never released.
diff --git a/doc/release-notes/release-notes-0.3.17.md b/doc/release-notes/release-notes-0.3.17.md
new file mode 100644
index 0000000000..d3604b8f88
--- /dev/null
+++ b/doc/release-notes/release-notes-0.3.17.md
@@ -0,0 +1,12 @@
+Version 0.3.17 is now available.
+
+Changes:
+* new getwork, thanks m0mchil
+* added transaction fee setting in UI options menu
+* free transaction limits
+* sendtoaddress returns transaction id instead of "sent"
+* getaccountaddress <account>
+
+The UI transaction fee setting was easy since it was still there from 0.1.5 and all I had to do was re-enable it.
+
+The accounts-based commands: move, sendfrom and getbalance <account> will be in the next release. We still have some more changes to make first.
diff --git a/doc/release-notes/release-notes-0.3.18.md b/doc/release-notes/release-notes-0.3.18.md
new file mode 100644
index 0000000000..ab1c2e0692
--- /dev/null
+++ b/doc/release-notes/release-notes-0.3.18.md
@@ -0,0 +1,11 @@
+Changes:
+* Fixed a wallet.dat compatibility problem if you downgraded from 0.3.17 and then upgraded again
+* IsStandard() check to only include known transaction types in blocks
+* Jgarzik's optimisation to speed up the initial block download a little
+
+The main addition in this release is the Accounts-Based JSON-RPC commands that Gavin's been working on (more details at http://www.bitcoin.org/smf/index.php?topic=1886.0).
+* getaccountaddress
+* sendfrom
+* move
+* getbalance
+* listtransactions
diff --git a/doc/release-notes/release-notes-0.3.19.md b/doc/release-notes/release-notes-0.3.19.md
new file mode 100644
index 0000000000..fcd867561d
--- /dev/null
+++ b/doc/release-notes/release-notes-0.3.19.md
@@ -0,0 +1,9 @@
+There's more work to do on DoS, but I'm doing a quick build of what I have so far in case it's needed, before venturing into more complex ideas. The build for this is version 0.3.19.
+
+- Added some DoS controls
+As Gavin and I have said clearly before, the software is not at all resistant to DoS attack. This is one improvement, but there are still more ways to attack than I can count.
+
+I'm leaving the -limitfreerelay part as a switch for now and it's there if you need it.
+
+- Removed "safe mode" alerts
+"safe mode" alerts was a temporary measure after the 0.3.9 overflow bug. We can say all we want that users can just run with "-disablesafemode", but it's better just not to have it for the sake of appearances. It was never intended as a long term feature. Safe mode can still be triggered by seeing a longer (greater total PoW) invalid block chain.
diff --git a/doc/release-notes/release-notes-0.3.20.1.md b/doc/release-notes/release-notes-0.3.20.1.md
new file mode 100644
index 0000000000..6c5682ea4e
--- /dev/null
+++ b/doc/release-notes/release-notes-0.3.20.1.md
@@ -0,0 +1 @@
+Never released or release notes were lost.
diff --git a/doc/release-notes/release-notes-0.3.20.2.md b/doc/release-notes/release-notes-0.3.20.2.md
new file mode 100644
index 0000000000..09ecb736bd
--- /dev/null
+++ b/doc/release-notes/release-notes-0.3.20.2.md
@@ -0,0 +1,17 @@
+The maxsendbuffer bug (0.3.20.1 clients not being able to download the block chain from other 0.3.20.1 clients) was only going to get
+worse as people upgraded, so I cherry-picked the bug fix and created a minor release yesterday.
+
+The Amazon Machine Images I used to do the builds are available:
+
+ ami-38a05251 Bitcoin-v0.3.20.2 Mingw (Windows; Administrator password 'bitcoin development')
+ ami-30a05259 Bitcoin_0.3.20.2 Linux32
+ ami-8abc4ee3 Bitcoin_0.3.20.2 Linux64
+
+(mac build will be done soon)
+
+If you have already downloaded version 0.3.20.1, please either add this to your bitcoin.conf file:
+
+ maxsendbuffer=10000
+ maxreceivebuffer=10000
+
+... or download the new version.
diff --git a/doc/release-notes/release-notes-0.3.20.md b/doc/release-notes/release-notes-0.3.20.md
new file mode 100644
index 0000000000..9ae21802ee
--- /dev/null
+++ b/doc/release-notes/release-notes-0.3.20.md
@@ -0,0 +1,22 @@
+Please checkout the git integration branch from:
+
+https://github.com/bitcoin/bitcoin
+
+... and help test. The new features that need testing are:
+
+* -nolisten : https://github.com/bitcoin/bitcoin/pull/11
+* -rescan : scan block chain for missing wallet transactions
+* -printtoconsole : https://github.com/bitcoin/bitcoin/pull/37
+* RPC gettransaction details : https://github.com/bitcoin/bitcoin/pull/24
+* listtransactions new features : https://github.com/bitcoin/bitcoin/pull/10
+
+Bug fixes that also need testing:
+
+* -maxconnections= : https://github.com/bitcoin/bitcoin/pull/42
+* RPC listaccounts minconf : https://github.com/bitcoin/bitcoin/pull/27
+* RPC move, add time to output : https://github.com/bitcoin/bitcoin/pull/21
+* ...and several improvements to --help output.
+
+This needs more testing on Windows! Please drop me a quick private message, email, or IRC message if you are able to do some testing. If you find bugs, please open an issue at:
+
+https://github.com/bitcoin/bitcoin/issues
diff --git a/doc/release-notes/release-notes-0.3.21.md b/doc/release-notes/release-notes-0.3.21.md
new file mode 100644
index 0000000000..f3b6bc4264
--- /dev/null
+++ b/doc/release-notes/release-notes-0.3.21.md
@@ -0,0 +1,20 @@
+Binaries for Bitcoin version 0.3.21 are available at:
+ https://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-0.3.21/
+
+Changes and new features from the 0.3.20 release include:
+
+* Universal Plug and Play support. Enable automatic opening of a port for incoming connections by running bitcoin or bitcoind with the - -upnp=1 command line switch or using the Options dialog box.
+
+* Support for full-precision bitcoin amounts. You can now send, and bitcoin will display, bitcoin amounts smaller than 0.01. However, sending fewer than 0.01 bitcoins still requires a 0.01 bitcoin fee (so you can send 1.0001 bitcoins without a fee, but you will be asked to pay a fee if you try to send 0.0001).
+
+* A new method of finding bitcoin nodes to connect with, via DNS A records. Use the -dnsseed option to enable.
+
+For developers, changes to bitcoin's remote-procedure-call API:
+
+* New rpc command "sendmany" to send bitcoins to more than one address in a single transaction.
+
+* Several bug fixes, including a serious intermittent bug that would sometimes cause bitcoind to stop accepting rpc requests.
+
+* -logtimestamps option, to add a timestamp to each line in debug.log.
+
+* Immature blocks (newly generated, under 120 confirmations) are now shown in listtransactions.
diff --git a/doc/release-notes/release-notes-0.3.22.md b/doc/release-notes/release-notes-0.3.22.md
new file mode 100644
index 0000000000..4c05e3e5e7
--- /dev/null
+++ b/doc/release-notes/release-notes-0.3.22.md
@@ -0,0 +1,16 @@
+Download URL: https://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-0.3.22/
+
+This is largely a bugfix and TX fee schedule release. We also hope to make 0.3.23 a quick release, to fix problems that the network has seen due to explosive growth in the past week.
+
+Notable changes:
+* Client will accept and relay TX's with 0.0005 BTC fee schedule (users still pay 0.01 BTC per kb, until next version)
+* Non-standard transactions accepted on testnet
+* Source code tree reorganized (prep for autotools build)
+* Remove "Generate Coins" option from GUI, and remove 4way SSE miner. Internal reference CPU miner remains available, but users are directed to external miners for best hash production.
+* IRC is overflowing. Client now bootstraps to channels #bitcoin00 - #bitcoin99
+* DNS names now may be used with -addnode, -connect (requires -dns to enable)
+
+RPC changes:
+* 'listtransactions' adds 'from' param, for range queries
+* 'move' may take account balances negative
+* 'settxfee' added, to manually set TX fee
diff --git a/doc/release-notes/release-notes-0.3.23.md b/doc/release-notes/release-notes-0.3.23.md
new file mode 100644
index 0000000000..c1d520e492
--- /dev/null
+++ b/doc/release-notes/release-notes-0.3.23.md
@@ -0,0 +1,10 @@
+Win32, Linux, MacOSX and source releases for bitcoin v0.3.23 have been uploaded to
+https://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-0.3.23/
+
+This is another quick bugfix release, trying to deal with the influx of new bitcoin users.
+
+Main items of note:
+
+* P2P connect-to-node logic changed to reduce timeout a bit. The network saw a huge influx of new users, who do not permit incoming connections. This change is a short-term hack, to more quickly hunt for useful P2P connections. Better "leaf node" logic is in the works, but this should let us limp along until then. One may use -upnp to properly forward ports, and help the network.
+* Transaction fee reduced to 0.0005 for new transactions
+* Client will relay transactions with fees as low as 0.0001 BTC
diff --git a/doc/release-notes/release-notes-0.3.24.md b/doc/release-notes/release-notes-0.3.24.md
new file mode 100644
index 0000000000..d35ac66f2c
--- /dev/null
+++ b/doc/release-notes/release-notes-0.3.24.md
@@ -0,0 +1,20 @@
+Bitcoin v0.3.24 is now available for download at
+https://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-0.3.24/
+
+This is another bug fix release. We had hoped to have wallet encryption ready for release, but more urgent fixes for existing clients were needed -- most notably block download problems were getting severe. Wallet encryption is ready for testing at https://github.com/bitcoin/bitcoin/pull/352 for the git-savvy, and hopefully will follow shortly in the next release, v0.4.
+
+Notable fixes in v0.3.24, and the main reasons for this release:
+
+F1) Block downloads were failing or taking unreasonable amounts of time to complete, because the increased size of the block chain was bumping up against some earlier buffer-size DoS limits.
+
+F2) Fix crash caused by loss/lack of network connection.
+
+Notable changes in v0.3.24:
+
+C1) DNS seeding enabled by default.
+
+C2) UPNP enabled by default in the GUI client. The percentage of bitcoin clients that accept incoming connections is quite small, and that is a problem. This should help. bitcoind, and unofficial builds, are unchanged (though we encourage use of "-upnp" to help the network!)
+
+C3) Initial unit testing framework. Bitcoin sorely needs automated tests, and this is a beginning. Contributions welcome.
+
+C4) Internal wallet code cleanup. While invisible to an end user, this change provides the basis for v0.4's wallet encryption.
diff --git a/doc/release-notes/release-notes-0.4.0.md b/doc/release-notes/release-notes-0.4.0.md
new file mode 100644
index 0000000000..145072a369
--- /dev/null
+++ b/doc/release-notes/release-notes-0.4.0.md
@@ -0,0 +1,70 @@
+Bitcoin version 0.4.0 is now available for download at:
+http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-0.4.0/
+
+The main feature in this release is wallet private key encryption;
+you can set a passphrase that must be entered before sending coins.
+See below for more information; if you decide to encrypt your wallet,
+WRITE DOWN YOUR PASSPHRASE AND PUT IT IN A SECURE LOCATION. If you
+forget or lose your wallet passphrase, you lose your bitcoins.
+Previous versions of bitcoin are unable to read encrypted wallets,
+and will crash on startup if the wallet is encrypted.
+
+Also note: bitcoin version 0.4 uses a newer version of Berkeley DB
+(bdb version 4.8) than previous versions (bdb 4.7). If you upgrade
+to version 0.4 and then revert back to an earlier version of bitcoin
+the it may be unable to start because bdb 4.7 cannot read bdb 4.8
+"log" files.
+
+
+Notable bug fixes from version 0.3.24:
+
+Fix several bitcoin-becomes-unresponsive bugs due to multithreading
+deadlocks.
+
+Optimize database writes for large (lots of inputs) transactions
+(fixes a potential denial-of-service attack)
+
+
+Wallet Encryption
+
+Bitcoin supports native wallet encryption so that people who steal your
+wallet file don't automatically get access to all of your Bitcoins.
+In order to enable this feature, choose "Encrypt Wallet" from the
+Options menu. You will be prompted to enter a passphrase, which
+will be used as the key to encrypt your wallet and will be needed
+every time you wish to send Bitcoins. If you lose this passphrase,
+you will lose access to spend all of the bitcoins in your wallet,
+no one, not even the Bitcoin developers can recover your Bitcoins.
+This means you are responsible for your own security, store your
+passphrase in a secure location and do not forget it.
+
+Remember that the encryption built into bitcoin only encrypts the
+actual keys which are required to send your bitcoins, not the full
+wallet. This means that someone who steals your wallet file will
+be able to see all the addresses which belong to you, as well as the
+relevant transactions, you are only protected from someone spending
+your coins.
+
+It is recommended that you backup your wallet file before you
+encrypt your wallet. To do this, close the Bitcoin client and
+copy the wallet.dat file from ~/.bitcoin/ on Linux, /Users/(user
+name)/Application Support/Bitcoin/ on Mac OSX, and %APPDATA%/Bitcoin/
+on Windows (that is /Users/(user name)/AppData/Roaming/Bitcoin on
+Windows Vista and 7 and /Documents and Settings/(user name)/Application
+Data/Bitcoin on Windows XP). Once you have copied that file to a
+safe location, reopen the Bitcoin client and Encrypt your wallet.
+If everything goes fine, delete the backup and enjoy your encrypted
+wallet. Note that once you encrypt your wallet, you will never be
+able to go back to a version of the Bitcoin client older than 0.4.
+
+Keep in mind that you are always responsible for your own security.
+All it takes is a slightly more advanced wallet-stealing trojan which
+installs a keylogger to steal your wallet passphrase as you enter it
+in addition to your wallet file and you have lost all your Bitcoins.
+Wallet encryption cannot keep you safe if you do not practice
+good security, such as running up-to-date antivirus software, only
+entering your wallet passphrase in the Bitcoin client and using the
+same passphrase only as your wallet passphrase.
+
+See the doc/README file in the bitcoin source for technical details
+of wallet encryption.
diff --git a/doc/release-notes/release-notes-0.4.1.md b/doc/release-notes/release-notes-0.4.1.md
new file mode 100644
index 0000000000..ac471a8d7f
--- /dev/null
+++ b/doc/release-notes/release-notes-0.4.1.md
@@ -0,0 +1,38 @@
+Bitcoin version 0.4.1 is now available for download at:
+http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-0.4.1/
+
+This is a bugfix only release based on 0.4.0.
+
+Please report bugs by replying to this forum thread.
+
+MAJOR BUG FIX (CVE-2011-4447)
+
+The wallet encryption feature introduced in Bitcoin version 0.4.0 did not sufficiently secure the private keys. An attacker who
+managed to get a copy of your encrypted wallet.dat file might be able to recover some or all of the unencrypted keys and steal the
+associated coins.
+
+If you have a previously encrypted wallet.dat, the first time you run wxbitcoin or bitcoind the wallet will be rewritten, Bitcoin will
+shut down, and you will be prompted to restart it to run with the new, properly encrypted file.
+
+If you had a previously encrypted wallet.dat that might have been copied or stolen (for example, you backed it up to a public
+location) you should send all of your bitcoins to yourself using a new bitcoin address and stop using any previously generated addresses.
+
+Wallets encrypted with this version of Bitcoin are written properly.
+
+Technical note: the encrypted wallet's 'keypool' will be regenerated the first time you request a new bitcoin address; to be certain that the
+new private keys are properly backed up you should:
+
+1. Run Bitcoin and let it rewrite the wallet.dat file
+
+2. Run it again, then ask it for a new bitcoin address.
+wxBitcoin: new address visible on main window
+bitcoind: run the 'walletpassphrase' RPC command to unlock the wallet, then run the 'getnewaddress' RPC command.
+
+3. If your encrypted wallet.dat may have been copied or stolen, send all of your bitcoins to the new bitcoin address.
+
+4. Shut down Bitcoin, then backup the wallet.dat file.
+IMPORTANT: be sure to request a new bitcoin address before backing up, so that the 'keypool' is regenerated and backed up.
+
+"Security in depth" is always a good idea, so choosing a secure location for the backup and/or encrypting the backup before uploading it is recommended. And as in previous releases, if your machine is infected by malware there are several ways an attacker might steal your bitcoins.
+
+Thanks to Alan Reiner (etotheipi) for finding and reporting this bug.
diff --git a/doc/release-notes/release-notes-0.4.2.md b/doc/release-notes/release-notes-0.4.2.md
new file mode 100644
index 0000000000..6c5682ea4e
--- /dev/null
+++ b/doc/release-notes/release-notes-0.4.2.md
@@ -0,0 +1 @@
+Never released or release notes were lost.
diff --git a/doc/release-notes/release-notes-0.4.3.md b/doc/release-notes/release-notes-0.4.3.md
new file mode 100644
index 0000000000..fea1ae75b5
--- /dev/null
+++ b/doc/release-notes/release-notes-0.4.3.md
@@ -0,0 +1,21 @@
+bitcoind version 0.4.3 is now available for download at:
+http://luke.dashjr.org/programs/bitcoin/files/bitcoind-0.4.3/ (until Gavin uploads to SourceForge)
+
+This is a bugfix-only release based on 0.4.0.
+
+Please note that the wxBitcoin GUI client is no longer maintained nor supported. If someone would like to step up to maintain this, they should contact Luke-Jr.
+
+Please report bugs for the daemon only using the issue tracker at github:
+https://github.com/bitcoin/bitcoin/issues
+
+Stable source code is hosted at Gitorious:
+http://gitorious.org/bitcoin/bitcoind-stable/archive-tarball/v0.4.3#.tar.gz
+
+BUG FIXES
+
+Cease locking memory used by non-sensitive information (this caused a huge performance hit on some platforms, especially noticable during initial blockchain download).
+Fixed some address-handling deadlocks (client freezes).
+No longer accept inbound connections over the internet when Bitcoin is being used with Tor (identity leak).
+Use the correct base transaction fee of 0.0005 BTC for accepting transactions into mined blocks (since 0.4.0, it was incorrectly accepting 0.0001 BTC which was only meant to be relayed).
+Add new DNS seeds (maintained by Pieter Wuille and Luke Dashjr).
+
diff --git a/doc/release-notes/release-notes-0.4.4.md b/doc/release-notes/release-notes-0.4.4.md
new file mode 100644
index 0000000000..f435ba7160
--- /dev/null
+++ b/doc/release-notes/release-notes-0.4.4.md
@@ -0,0 +1,30 @@
+Bitcoin version 0.4.4 is now available for download at:
+http://luke.dashjr.org/programs/bitcoin/files/bitcoind-0.4.4/
+
+This is a bugfix-only release based on 0.4.0.
+
+Please note that the wxBitcoin GUI client is no longer maintained nor supported. If someone would like to step up to maintain this, they should contact Luke-Jr.
+
+Please report bugs for the daemon only using the issue tracker at github:
+https://github.com/bitcoin/bitcoin/issues
+
+Stable source code is hosted at Gitorious:
+http://gitorious.org/bitcoin/bitcoind-stable/archive-tarball/v0.4.4#.tar.gz
+
+BUG FIXES
+
+Limit the number of orphan transactions stored in memory, to prevent a potential denial-of-service attack by flooding orphan transactions. Also never store invalid transactions at all.
+Fix possible buffer overflow on systems with very long application data paths. This is not exploitable.
+Resolved multiple bugs preventing long-term unlocking of encrypted wallets (issue #922).
+Only send local IP in "version" messages if it is globally routable (ie, not private), and try to get such an IP from UPnP if applicable.
+Reannounce UPnP port forwards every 20 minutes, to workaround routers expiring old entries, and allow the -upnp option to override any stored setting.
+Various memory leaks and potential null pointer deferences have been
+fixed.
+Several shutdown issues have been fixed.
+Check that keys stored in the wallet are valid at startup, and if not,
+report corruption.
+Various build fixes.
+If no password is specified to bitcoind, recommend a secure password.
+Update hard-coded fallback seed nodes, choosing recent ones with long uptime and versions at least 0.4.0.
+Add checkpoint at block 168,000.
+
diff --git a/doc/release-notes/release-notes-0.4.5.md b/doc/release-notes/release-notes-0.4.5.md
new file mode 100644
index 0000000000..6c5682ea4e
--- /dev/null
+++ b/doc/release-notes/release-notes-0.4.5.md
@@ -0,0 +1 @@
+Never released or release notes were lost.
diff --git a/doc/release-notes/release-notes-0.4.6.md b/doc/release-notes/release-notes-0.4.6.md
new file mode 100644
index 0000000000..07c5e4b694
--- /dev/null
+++ b/doc/release-notes/release-notes-0.4.6.md
@@ -0,0 +1,37 @@
+bitcoind version 0.4.6 is now available for download at:
+Windows: installer | zip (sig)
+Source: tar.gz
+bitcoind and Bitcoin-Qt version 0.6.0.7 are also tagged in git, but it is recommended to upgrade to 0.6.1.
+
+These are bugfix-only releases.
+
+Please report bugs by replying to this forum thread. Note that the 0.4.x wxBitcoin GUI client is no longer maintained nor supported. If someone would like to step up to maintain this, they should contact Luke-Jr.
+
+BUG FIXES
+
+Version 0.6.0 allowed importing invalid "private keys", which would be unspendable; 0.6.0.7 will now verify the private key is valid, and refuse to import an invalid one
+Verify status of encrypt/decrypt calls to detect failed padding
+Check blocks for duplicate transactions earlier. Fixes #1167
+Upgrade Windows builds to OpenSSL 1.0.1b
+Set label when selecting an address that already has a label. Fixes #1080 (Bitcoin-Qt)
+JSON-RPC listtransactions's from/count handling is now fixed
+Optimize and fix multithreaded access, when checking whether we already know about transactions
+Fix potential networking deadlock
+Proper support for Growl 1.3 notifications
+Display an error, rather than crashing, if encoding a QR Code failed (0.6.0.7)
+Don't erroneously set "Display addresses" for users who haven't explicitly enabled it (Bitcoin-Qt)
+Some non-ASCII input in JSON-RPC expecting hexadecimal may have been misinterpreted rather than rejected
+Missing error condition checking added
+Do not show green tick unless all known blocks are downloaded. Fixes #921 (Bitcoin-Qt)
+Increase time ago of last block for "up to date" status from 30 to 90 minutes
+Show a message box when runaway exception happens (Bitcoin-Qt)
+Use a messagebox to display the error when -server is provided without providing a rpc password
+Show error message instead of exception crash when unable to bind RPC port (Bitcoin-Qt)
+Correct sign message bitcoin address tooltip. Fixes #1050 (Bitcoin-Qt)
+Removed "(no label)" from QR Code dialog titlebar if we have no label (0.6.0.7)
+Removed an ugly line break in tooltip for mature transactions (0.6.0.7)
+Add missing tooltip and key shortcut in settings dialog (part of #1088) (Bitcoin-Qt)
+Work around issue in boost::program_options that prevents from compiling in clang
+Fixed bugs occurring only on platforms with unsigned characters (such as ARM).
+Rename make_windows_icon.py to .sh as it is a shell script. Fixes #1099 (Bitcoin-Qt)
+Various trivial internal corrections to types used for counting/size loops and warnings
diff --git a/doc/release-notes/release-notes-0.5.0.md b/doc/release-notes/release-notes-0.5.0.md
new file mode 100644
index 0000000000..baa409b5f2
--- /dev/null
+++ b/doc/release-notes/release-notes-0.5.0.md
@@ -0,0 +1,70 @@
+Bitcoin version 0.5.0 is now available for download at:
+http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-0.5.0/
+
+The major change for this release is a completely new graphical interface that uses the Qt user interface toolkit.
+
+This release include German, Spanish, Spanish-Castilian, Norwegian and Dutch translations. More translations are welcome; join the project at Transifex if you can help:
+https://www.transifex.net/projects/p/bitcoin/
+
+Please report bugs using the issue tracker at github:
+https://github.com/bitcoin/bitcoin/issues
+
+For Ubuntu users, there is a new ppa maintained by Matt Corallo which you can add to your system so that it will automatically keep bitcoin up-to-date. Just type "sudo apt-add-repository ppa:bitcoin/bitcoin" in your terminal, then install the bitcoin-qt package.
+
+MAJOR BUG FIX (CVE-2011-4447)
+
+The wallet encryption feature introduced in Bitcoin version 0.4.0 did not sufficiently secure the private keys. An attacker who
+managed to get a copy of your encrypted wallet.dat file might be able to recover some or all of the unencrypted keys and steal the
+associated coins.
+
+If you have a previously encrypted wallet.dat, the first time you run bitcoin-qt or bitcoind the wallet will be rewritten, Bitcoin will
+shut down, and you will be prompted to restart it to run with the new, properly encrypted file.
+
+If you had a previously encrypted wallet.dat that might have been copied or stolen (for example, you backed it up to a public
+location) you should send all of your bitcoins to yourself using a new bitcoin address and stop using any previously generated addresses.
+
+Wallets encrypted with this version of Bitcoin are written properly.
+
+Technical note: the encrypted wallet's 'keypool' will be regenerated the first time you request a new bitcoin address; to be certain that the
+new private keys are properly backed up you should:
+
+1. Run Bitcoin and let it rewrite the wallet.dat file
+
+2. Run it again, then ask it for a new bitcoin address.
+Bitcoin-Qt: Address Book, then New Address...
+bitcoind: run the 'walletpassphrase' RPC command to unlock the wallet, then run the 'getnewaddress' RPC command.
+
+3. If your encrypted wallet.dat may have been copied or stolen, send all of your bitcoins to the new bitcoin address.
+
+4. Shut down Bitcoin, then backup the wallet.dat file.
+IMPORTANT: be sure to request a new bitcoin address before backing up, so that the 'keypool' is regenerated and backed up.
+
+"Security in depth" is always a good idea, so choosing a secure location for the backup and/or encrypting the backup before uploading it is recommended. And as in previous releases, if your machine is infected by malware there are several ways an attacker might steal your bitcoins.
+
+Thanks to Alan Reiner (etotheipi) for finding and reporting this bug.
+
+MAJOR GUI CHANGES
+
+"Splash" graphics at startup that show address/wallet/blockchain loading progress.
+
+"Synchronizing with network" progress bar to show block-chain download progress.
+
+Icons at the bottom of the window that show how well connected you are to the network, with tooltips to display details.
+
+Drag and drop support for bitcoin: URIs on web pages.
+
+Export transactions as a .csv file.
+
+Many other GUI improvements, large and small.
+
+RPC CHANGES
+
+getmemorypool : new RPC command, provides everything needed to construct a block with a custom generation transaction and submit a solution
+
+listsinceblock : new RPC command, list transactions since given block
+
+signmessage/verifymessage : new RPC commands to sign a message with one of your private keys or verify that a message signed by the private key associated with a bitcoin address.
+
+GENERAL CHANGES
+
+Faster initial block download.
diff --git a/doc/release-notes/release-notes-0.5.1.md b/doc/release-notes/release-notes-0.5.1.md
new file mode 100644
index 0000000000..d56bff6d95
--- /dev/null
+++ b/doc/release-notes/release-notes-0.5.1.md
@@ -0,0 +1,43 @@
+Bitcoin version 0.5.1 is now available for download at:
+http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-0.5.1/
+
+This is a bugfix-only release.
+
+This release includes 13 translations, including 5 new translations:
+Italian, Hungarian, Ukranian, Portuguese (Brazilian) and Simplified Chinese.
+More translations are welcome; join the project at Transifex if you can help:
+https://www.transifex.net/projects/p/bitcoin/
+
+Please report bugs using the issue tracker at github:
+https://github.com/bitcoin/bitcoin/issues
+
+Project source code is hosted at github; we are no longer
+distributing .tar.gz files here, you can get them
+directly from github:
+https://github.com/bitcoin/bitcoin/tarball/v0.5.1 # .tar.gz
+https://github.com/bitcoin/bitcoin/zipball/v0.5.1 # .zip
+
+For Ubuntu users, there is a new ppa maintained by Matt Corallo which
+you can add to your system so that it will automatically keep
+bitcoin up-to-date. Just type
+sudo apt-add-repository ppa:bitcoin/bitcoin
+in your terminal, then install the bitcoin-qt package.
+
+
+BUG FIXES
+
+Re-enable SSL support for the JSON-RPC interface (it was unintentionally
+disabled for the 0.5.0 release binaries).
+
+The code that finds peers via "dns seeds" no longer stops bitcoin startup
+if one of the dns seed machines is down.
+
+Tooltips on the transaction list view were rendering incorrectly (as black boxes
+or with a transparent background).
+
+Prevent a denial-of-service attack involving flooding a bitcoin node with
+orphan blocks.
+
+The wallet passphrase dialog now warns you if the caps lock key was pressed.
+
+Improved searching in addresses and labels in bitcoin-qt.
diff --git a/doc/release-notes/release-notes-0.5.2.md b/doc/release-notes/release-notes-0.5.2.md
new file mode 100644
index 0000000000..f79816668d
--- /dev/null
+++ b/doc/release-notes/release-notes-0.5.2.md
@@ -0,0 +1,22 @@
+Bitcoin version 0.5.2 is now available for download at:
+http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-0.5.2/
+
+This is a bugfix-only release based on 0.5.1.
+
+Please report bugs using the issue tracker at github:
+https://github.com/bitcoin/bitcoin/issues
+
+Stable source code is hosted at Gitorious:
+http://gitorious.org/bitcoin/bitcoind-stable/archive-tarball/v0.5.2#.tar.gz
+
+BUG FIXES
+
+Check all transactions in blocks after the last checkpoint (0.5.0 and 0.5.1 skipped checking ECDSA signatures during initial blockchain download).
+Cease locking memory used by non-sensitive information (this caused a huge performance hit on some platforms, especially noticable during initial blockchain download; this was
+not a security vulnerability).
+Fixed some address-handling deadlocks (client freezes).
+No longer accept inbound connections over the internet when Bitcoin is being used with Tor (identity leak).
+Re-enable SSL support for the JSON-RPC interface (it was unintentionally disabled for the 0.5.0 and 0.5.1 release Linux binaries).
+Use the correct base transaction fee of 0.0005 BTC for accepting transactions into mined blocks (since 0.4.0, it was incorrectly accepting 0.0001 BTC which was only meant to be relayed).
+Don't show "IP" for transactions which are not necessarily IP transactions.
+Add new DNS seeds (maintained by Pieter Wuille and Luke Dashjr).
diff --git a/doc/release-notes/release-notes-0.5.3.md b/doc/release-notes/release-notes-0.5.3.md
new file mode 100644
index 0000000000..7c84c53325
--- /dev/null
+++ b/doc/release-notes/release-notes-0.5.3.md
@@ -0,0 +1,42 @@
+Bitcoin version 0.5.3 is now available for download at:
+http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-0.5.3/
+
+This is a bugfix-only release based on 0.5.1.
+It also includes a few protocol updates.
+
+Please report bugs using the issue tracker at github:
+https://github.com/bitcoin/bitcoin/issues
+
+Stable source code is hosted at Gitorious:
+http://gitorious.org/bitcoin/bitcoind-stable/archive-tarball/v0.5.3#.tar.gz
+
+PROTOCOL UPDATES
+
+BIP 30: Introduce a new network rule: "a block is not valid if it contains a transaction whose hash already exists in the block chain, unless all that transaction's outputs were already spent before said block" beginning on March 15, 2012, 00:00 UTC.
+On testnet, allow mining of min-difficulty blocks if 20 minutes have gone by without mining a regular-difficulty block. This is to make testing Bitcoin easier, and will not affect normal mode.
+
+BUG FIXES
+
+Limit the number of orphan transactions stored in memory, to prevent a potential denial-of-service attack by flooding orphan transactions. Also never store invalid transactions at all.
+Fix possible buffer overflow on systems with very long application data paths. This is not exploitable.
+Resolved multiple bugs preventing long-term unlocking of encrypted wallets
+(issue #922).
+Only send local IP in "version" messages if it is globally routable (ie, not private), and try to get such an IP from UPnP if applicable.
+Reannounce UPnP port forwards every 20 minutes, to workaround routers expiring old entries, and allow the -upnp option to override any stored setting.
+Skip splash screen when -min is used, and fix Minimize to Tray function.
+Do not blank "label" in Bitcoin-Qt "Send" tab, if the user has already entered something.
+Correct various labels and messages.
+Various memory leaks and potential null pointer deferences have been fixed.
+Handle invalid Bitcoin URIs using "bitcoin://" instead of "bitcoin:".
+Several shutdown issues have been fixed.
+Revert to "global progress indication", as starting from zero every time was considered too confusing for many users.
+Check that keys stored in the wallet are valid at startup, and if not, report corruption.
+Enable accessible widgets on Windows, so that people with screen readers such as NVDA can make sense of it.
+Various build fixes.
+If no password is specified to bitcoind, recommend a secure password.
+Automatically focus and scroll to new "Send coins" entries in Bitcoin-Qt.
+Show a message box for --help on Windows, for Bitcoin-Qt.
+Add missing "About Qt" menu option to show built-in Qt About dialog.
+Don't show "-daemon" as an option for Bitcoin-Qt, since it isn't available.
+Update hard-coded fallback seed nodes, choosing recent ones with long uptime and versions at least 0.4.0.
+Add checkpoint at block 168,000.
diff --git a/doc/release-notes/release-notes-0.5.4.md b/doc/release-notes/release-notes-0.5.4.md
new file mode 100644
index 0000000000..fcde3ac4e3
--- /dev/null
+++ b/doc/release-notes/release-notes-0.5.4.md
@@ -0,0 +1,39 @@
+Bitcoin version 0.5.4 is now available for download at:
+http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-0.5.4/
+NOTE: 0.5.4rc3 is being renamed to 0.5.4 final with no changes.
+
+This is a bugfix-only release in the 0.5.x series, plus a few protocol updates.
+
+Please report bugs using the issue tracker at github:
+https://github.com/bitcoin/bitcoin/issues
+
+Stable source code is hosted at Gitorious:
+http://gitorious.org/bitcoin/bitcoind-stable/archive-tarball/v0.5.4#.tar.gz
+
+PROTOCOL UPDATES
+
+BIP 16: Special-case "pay to script hash" logic to enable minimal validation of new transactions.
+Support for validating message signatures produced with compressed public keys.
+
+BUG FIXES
+
+Build with thread-safe MingW libraries for Windows, fixing a dangerous memory corruption scenario when exceptions are thrown.
+Fix broken testnet mining.
+Stop excess inventory relay during initial block download.
+When disconnecting a node, clear the received buffer so that we do not process any already received messages.
+Yet another attempt at implementing "minimize to tray" that works on all operating systems.
+Fix Bitcoin-Qt notifications under Growl 1.3.
+Increase required age of Bitcoin-Qt's "not up to date" status from 30 to 90 minutes.
+Implemented missing verifications that led to crash on entering some wrong passphrases for encrypted wallets.
+Fix default filename suffixes in GNOME save dialog.
+Make the "Send coins" tab use the configured unit type, even on the first attempt.
+Print detailed wallet loading errors to debug.log when it is corrupt.
+Allocate exactly the amount of space needed for signing transactions, instead of a fixed 10k buffer.
+Workaround for improbable memory access violation.
+Check wallet's minimum version before trying to load it.
+Remove wxBitcoin properly when installing Bitcoin-Qt over it. (Windows)
+Detail reorganization information better in debug log.
+Use a messagebox to display the error when -server is provided without configuring a RPC password.
+Testing suite build now honours provided CXXFLAGS.
+Removed an extraneous line-break in mature transaction tooltips.
+Fix some grammatical errors in translation process documentation.
diff --git a/doc/release-notes/release-notes-0.5.5.md b/doc/release-notes/release-notes-0.5.5.md
new file mode 100644
index 0000000000..75ebc3e6b6
--- /dev/null
+++ b/doc/release-notes/release-notes-0.5.5.md
@@ -0,0 +1,37 @@
+bitcoind and Bitcoin-Qt version 0.5.5 are now available for download at:
+Windows: installer | zip (sig)
+Source: tar.gz
+bitcoind and Bitcoin-Qt version 0.6.0.7 are also tagged in git, but it is recommended to upgrade to 0.6.1.
+
+These are bugfix-only releases.
+
+Please report bugs by replying to this forum thread. Note that the 0.4.x wxBitcoin GUI client is no longer maintained nor supported. If someone would like to step up to maintain this, they should contact Luke-Jr.
+
+BUG FIXES
+
+Version 0.6.0 allowed importing invalid "private keys", which would be unspendable; 0.6.0.7 will now verify the private key is valid, and refuse to import an invalid one
+Verify status of encrypt/decrypt calls to detect failed padding
+Check blocks for duplicate transactions earlier. Fixes #1167
+Upgrade Windows builds to OpenSSL 1.0.1b
+Set label when selecting an address that already has a label. Fixes #1080 (Bitcoin-Qt)
+JSON-RPC listtransactions's from/count handling is now fixed
+Optimize and fix multithreaded access, when checking whether we already know about transactions
+Fix potential networking deadlock
+Proper support for Growl 1.3 notifications
+Display an error, rather than crashing, if encoding a QR Code failed (0.6.0.7)
+Don't erroneously set "Display addresses" for users who haven't explicitly enabled it (Bitcoin-Qt)
+Some non-ASCII input in JSON-RPC expecting hexadecimal may have been misinterpreted rather than rejected
+Missing error condition checking added
+Do not show green tick unless all known blocks are downloaded. Fixes #921 (Bitcoin-Qt)
+Increase time ago of last block for "up to date" status from 30 to 90 minutes
+Show a message box when runaway exception happens (Bitcoin-Qt)
+Use a messagebox to display the error when -server is provided without providing a rpc password
+Show error message instead of exception crash when unable to bind RPC port (Bitcoin-Qt)
+Correct sign message bitcoin address tooltip. Fixes #1050 (Bitcoin-Qt)
+Removed "(no label)" from QR Code dialog titlebar if we have no label (0.6.0.7)
+Removed an ugly line break in tooltip for mature transactions (0.6.0.7)
+Add missing tooltip and key shortcut in settings dialog (part of #1088) (Bitcoin-Qt)
+Work around issue in boost::program_options that prevents from compiling in clang
+Fixed bugs occurring only on platforms with unsigned characters (such as ARM).
+Rename make_windows_icon.py to .sh as it is a shell script. Fixes #1099 (Bitcoin-Qt)
+Various trivial internal corrections to types used for counting/size loops and warnings
diff --git a/doc/release-notes/release-notes-0.6.0.md b/doc/release-notes/release-notes-0.6.0.md
new file mode 100644
index 0000000000..1963a36259
--- /dev/null
+++ b/doc/release-notes/release-notes-0.6.0.md
@@ -0,0 +1,138 @@
+Bitcoin version 0.6.0 is now available for download at:
+http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-0.6.0/test/
+
+This release includes more than 20 language localizations.
+More translations are welcome; join the
+project at Transifex to help:
+https://www.transifex.net/projects/p/bitcoin/
+
+Please report bugs using the issue tracker at github:
+https://github.com/bitcoin/bitcoin/issues
+
+Project source code is hosted at github; we are no longer
+distributing .tar.gz files here, you can get them
+directly from github:
+https://github.com/bitcoin/bitcoin/tarball/v0.6.0 # .tar.gz
+https://github.com/bitcoin/bitcoin/zipball/v0.6.0 # .zip
+
+For Ubuntu users, there is a ppa maintained by Matt Corallo which
+you can add to your system so that it will automatically keep
+bitcoin up-to-date. Just type
+sudo apt-add-repository ppa:bitcoin/bitcoin
+in your terminal, then install the bitcoin-qt package.
+
+
+KNOWN ISSUES
+
+Shutting down while synchronizing with the network
+(downloading the blockchain) can take more than a minute,
+because database writes are queued to speed up download
+time.
+
+
+NEW FEATURES SINCE BITCOIN VERSION 0.5
+
+Initial network synchronization should be much faster
+(one or two hours on a typical machine instead of ten or more
+hours).
+
+Backup Wallet menu option.
+
+Bitcoin-Qt can display and save QR codes for sending
+and receiving addresses.
+
+New context menu on addresses to copy/edit/delete them.
+
+New Sign Message dialog that allows you to prove that you
+own a bitcoin address by creating a digital
+signature.
+
+New wallets created with this version will
+use 33-byte 'compressed' public keys instead of
+65-byte public keys, resulting in smaller
+transactions and less traffic on the bitcoin
+network. The shorter keys are already supported
+by the network but wallet.dat files containing
+short keys are not compatible with earlier
+versions of Bitcoin-Qt/bitcoind.
+
+New command-line argument -blocknotify=<command>
+that will spawn a shell process to run <command>
+when a new block is accepted.
+
+New command-line argument -splash=0 to disable
+Bitcoin-Qt's initial splash screen
+
+validateaddress JSON-RPC api command output includes
+two new fields for addresses in the wallet:
+pubkey : hexadecimal public key
+iscompressed : true if pubkey is a short 33-byte key
+
+New JSON-RPC api commands for dumping/importing
+private keys from the wallet (dumprivkey, importprivkey).
+
+New JSON-RPC api command for getting information about
+blocks (getblock, getblockhash).
+
+New JSON-RPC api command (getmininginfo) for getting
+extra information related to mining. The getinfo
+JSON-RPC command no longer includes mining-related
+information (generate/genproclimit/hashespersec).
+
+
+
+NOTABLE CHANGES
+
+BIP30 implemented (security fix for an attack involving
+duplicate "coinbase transactions").
+
+The -nolisten, -noupnp and -nodnsseed command-line
+options were renamed to -listen, -upnp and -dnsseed,
+with a default value of 1. The old names are still
+supported for compatibility (so specifying -nolisten
+is automatically interpreted as -listen=0; every
+boolean argument can now be specified as either
+-foo or -nofoo).
+
+The -noirc command-line options was renamed to
+-irc, with a default value of 0. Run -irc=1 to
+get the old behavior.
+
+Three fill-up-available-memory denial-of-service
+attacks were fixed.
+
+
+NOT YET IMPLEMENTED FEATURES
+
+Support for clicking on bitcoin: URIs and
+opening/launching Bitcoin-Qt is available only on Linux,
+and only if you configure your desktop to launch
+Bitcoin-Qt. All platforms support dragging and dropping
+bitcoin: URIs onto the Bitcoin-Qt window to start
+payment.
+
+
+PRELIMINARY SUPPORT FOR MULTISIGNATURE TRANSACTIONS
+
+This release has preliminary support for multisignature
+transactions-- transactions that require authorization
+from more than one person or device before they
+will be accepted by the bitcoin network.
+
+Prior to this release, multisignature transactions
+were considered 'non-standard' and were ignored;
+with this release multisignature transactions are
+considered standard and will start to be relayed
+and accepted into blocks.
+
+It is expected that future releases of Bitcoin-Qt
+will support the creation of multisignature transactions,
+once enough of the network has upgraded so relaying
+and validating them is robust.
+
+For this release, creation and testing of multisignature
+transactions is limited to the bitcoin test network using
+the "addmultisigaddress" JSON-RPC api call.
+
+Short multisignature address support is included in this
+release, as specified in BIP 13 and BIP 16.
diff --git a/doc/release-notes/release-notes-0.6.1.md b/doc/release-notes/release-notes-0.6.1.md
new file mode 100644
index 0000000000..ef7966ecd6
--- /dev/null
+++ b/doc/release-notes/release-notes-0.6.1.md
@@ -0,0 +1,2 @@
+Never released
+
diff --git a/doc/release-notes/release-notes-0.6.2.md b/doc/release-notes/release-notes-0.6.2.md
new file mode 100644
index 0000000000..bb85fb23a0
--- /dev/null
+++ b/doc/release-notes/release-notes-0.6.2.md
@@ -0,0 +1,50 @@
+Bitcoin version 0.6.2 is now available for download at:
+http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-0.6.2/
+
+This is a bug-fix and code-cleanup release, with no major new features.
+
+Please report bugs using the github issue tracker at:
+https://github.com/bitcoin/bitcoin/issues
+
+
+NOTABLE CHANGES
+
+Much faster shutdowns. However, the blkindex.dat file is no longer
+portable to different data directories by default. If you need a
+portable blkindex.dat file then run with the new -detachdb=1 option
+or the "Detach databases at shutdown" GUI preference.
+
+Fixed https://github.com/bitcoin/bitcoin/issues/1065, a bug that
+could cause long-running nodes to crash.
+
+Mac and Windows binaries are compiled against OpenSSL 1.0.1b (Linux
+binaries are dynamically linked to the version of OpenSSL on the system).
+
+
+CHANGE SUMMARY
+
+Use 'git shortlog --no-merges v0.6.0..' for a summary of this release.
+
+Source codebase changes:
+- Many source code cleanups and warnings fixes. Close to building with -Wall
+- Locking overhaul, and several minor locking fixes
+- Several source code portability fixes, e.g. FreeBSD
+
+JSON-RPC interface changes:
+- addmultisigaddress enabled for mainnet (previously only enabled for testnet)
+
+Network protocol changes:
+- protocol version 60001
+- added nonce value to "ping" message (BIP 31)
+- added new "pong" message (BIP 31)
+
+Backend storage changes:
+- Less redundant database flushing, especially during initial block download
+- Shutdown improvements (see above)
+
+Qt user interface:
+- minor URI handling improvements
+- progressbar improvements
+- error handling improvements (show message box rather than console exception,
+etc.)
+- by popular request, make 4th bar of connection icon green
diff --git a/doc/release-notes/release-notes-0.6.3.md b/doc/release-notes/release-notes-0.6.3.md
new file mode 100644
index 0000000000..28bb20e104
--- /dev/null
+++ b/doc/release-notes/release-notes-0.6.3.md
@@ -0,0 +1,29 @@
+Bitcoin version 0.6.3 is now available for download at:
+ http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-0.6.3/
+
+This is a bug-fix release, with no new features.
+
+Please report bugs using the issue tracker at github:
+ https://github.com/bitcoin/bitcoin/issues
+
+CHANGE SUMMARY
+
+Fixed a serious denial-of-service attack that could cause the
+bitcoin process to become unresponsive. Thanks to Sergio Lerner
+for finding and responsibly reporting the problem. (CVE-2012-3789)
+
+Optimized the process of checking transaction signatures, to
+speed up processing of new block messages and make propagating
+blocks across the network faster.
+
+Fixed an obscure bug that could cause the bitcoin process to get
+stuck on an invalid block-chain, if the invalid chain was
+hundreds of blocks long.
+
+Bitcoin-Qt no longer automatically selects the first address
+in the address book (Issue #1384).
+
+Fixed minimize-to-dock behavior of Bitcon-Qt on the Mac.
+
+Added a block checkpoint at block 185,333 to speed up initial
+blockchain download.
diff --git a/doc/release-notes/release-notes-0.7.0.md b/doc/release-notes/release-notes-0.7.0.md
new file mode 100644
index 0000000000..d33a58f99f
--- /dev/null
+++ b/doc/release-notes/release-notes-0.7.0.md
@@ -0,0 +1,169 @@
+Bitcoin version 0.7.0 is now available for download at:
+ http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-0.7.0/
+
+We recommend that everybody running prior versions of bitcoind/Bitcoin-Qt
+upgrade to this release, except for users running Mac OSX 10.5.
+
+Please report bugs using the issue tracker at github:
+ https://github.com/bitcoin/bitcoin/issues
+
+Project source code is hosted at github; you can get
+source-only tarballs/zipballs directly from there:
+ https://github.com/bitcoin/bitcoin/tarball/v0.7.0 # .tar.gz
+ https://github.com/bitcoin/bitcoin/zipball/v0.7.0 # .zip
+
+Ubuntu Linux users can use the "Personal Package Archive" (PPA)
+maintained by Matt Corallo to automatically keep
+bitcoin up-to-date. Just type
+ sudo apt-add-repository ppa:bitcoin/bitcoin
+ sudo apt-get update
+in your terminal, then install the bitcoin-qt package:
+ sudo apt-get install bitcoin-qt
+
+
+How to Upgrade
+
+If you are running an older version, shut it down. Wait
+until it has completely shut down (which might take a few minutes for older
+versions), then run the installer (on Windows) or just copy over
+Code:
+/Applications/Bitcoin-Qt
+(on Mac) or
+Code:
+bitcoind/bitcoin-qt
+(on Linux).
+
+If you were running on Linux with a version that might have been compiled
+with a different version of Berkeley DB (for example, if you were using the
+PPA and are switching to the binary release), then run the old version again
+with the -detachdb argument and shut it down; if you do not, then the new
+version will not be able to read the database files and will exit with an error.
+
+Incompatible Changes
+
+* Replaced the 'getmemorypool' RPC command with 'getblocktemplate/submitblock'
+ and 'getrawmempool' commands.
+* Remove deprecated RPC 'getblocknumber'
+
+Bitcoin Improvement Proposals implemented
+
+BIP 22 - 'getblocktemplate', 'submitblock' RPCs
+BIP 34 - block version 2, height in coinbase
+BIP 35 - 'mempool' message, extended 'getdata' message behavior
+
+
+Core bitcoin handling and blockchain database
+
+* Reduced CPU usage, by eliminating some redundant hash calculations
+* Cache signature verifications, to eliminate redundant signature checks
+* Transactions with zero-value outputs are considered non-standard
+* Mining: when creating new blocks, sort 'paid' area by fee-per-kb
+* Database: better validation of on-disk stored data
+* Database: minor optimizations and reliability improvements
+* -loadblock=FILE will import an external block file
+* Additional DoS (denial-of-service) prevention measures
+* New blockchain checkpoint at block 193,000
+
+
+JSON-RPC API
+
+* Internal HTTP server is now thread-per-connection, rather than
+ a single-threaded queue that would stall on network I/O.
+* Internal HTTP server supports HTTP/1.1, pipelined requests and
+ connection keep-alive.
+* Support JSON-RPC 2.0 batches, to encapsulate multiple JSON-RPC requests
+ within a single HTTP request.
+* IPv6 support
+* Added raw transaction API. See https://gist.github.com/2839617
+* Added 'getrawmempool', to list contents of TX memory pool
+* Added 'getpeerinfo', to list data about each connected network peer
+* Added 'listaddressgroupings' for better coin control
+* Rework getblock call.
+* Remove deprecated RPC 'getblocknumber'
+* Remove superceded RPC 'getmemorypool' (see BIP 22, above)
+* listtransactions output now displays "smart" times for transactions,
+ and 'blocktime' and 'timereceived' fields were added
+
+
+P2P networking
+
+* IPv6 support
+* Tor hidden service support (see doc/Tor.txt)
+* Attempts to fix "stuck blockchain download" problems
+* Replace BDB database "addr.dat" with internally-managed "peers.dat"
+ file containing peer address data.
+* Lower default send buffer from 10MB to 1MB
+* proxy: SOCKS5 by default
+* Support connecting by hostnames passed to proxy
+* Add -seednode connections, and use this instead of DNS seeds when proxied
+* Added -externalip and -discover
+* Add -onlynet to connect only to a given network (IPv4, IPv6, or Tor)
+* Separate listening sockets, -bind=<addr>
+
+
+Qt GUI
+
+* Add UI RPC console / debug window
+* Re-Enable URI handling on Windows, add safety checks and tray-notifications
+* Harmonize the use of ellipsis ("...") to be used in menus, but not on buttons
+* Add 2 labels to the overviewpage that display Wallet and Transaction status (obsolete or current)
+* Extend the optionsdialog (e.g. language selection) and re-work it to a tabbed UI
+* Merge sign/verify message into a single window with tabbed UI
+* Ensure a changed bitcoin unit immediately updates all GUI elements that use units
+* Update QR Code dialog
+* Improve error reporting at startup
+* Fine-grained UI updates for a much smoother UI during block downloads
+* Remove autocorrection of 0/i in addresses in UI
+* Reorganize tray icon menu into more logical order
+* Persistently poll for balance change when number of blocks changed
+* Much better translations
+* Override progress bar design on platforms with segmented progress bars to assist with readability
+* Added 'immature balance' display on the overview page
+* (Windows only): enable ASLR and DEP for bitcoin-qt.exe
+* (Windows only): add meta-data to bitcoin-qt.exe (e.g. description)
+
+Internal codebase
+
+* Additional unit tests
+* Compile warning fixes
+
+
+Miscellaneous
+
+* Reopen debug.log upon SIGHUP
+* Bash programmable completion for bitcoind(1)
+* On supported OS's, each thread is given a useful name
+
+
+Thanks to everybody who contributed to this release:
+
+Chris Moore
+Christian von Roques
+David Joel Schwartz
+Douglas Huff
+Fordy
+Gavin Andresen
+Giel van Schijndel
+Gregory Maxwell
+Jeff Garzik
+Luke Dashjr
+Matt Corallo
+Michael Ford
+Michael Hendricks
+Peter Todd
+Philip Kaufmann
+Pieter Wuille
+R E Broadley
+Ricardo M. Correia
+Rune K. Svendsen
+Scott Ellis
+Stephane Glondu
+Wladimir J. van der Laan
+cardpuncher
+coderrr
+fanquake
+grimd34th
+sje397
+xanatos
+
+Thanks to Sergio Lerner for reporting denial-of-service vulnerabilities fixed in this release.
diff --git a/doc/release-notes/release-notes-0.7.1.md b/doc/release-notes/release-notes-0.7.1.md
new file mode 100644
index 0000000000..22e910c09f
--- /dev/null
+++ b/doc/release-notes/release-notes-0.7.1.md
@@ -0,0 +1,110 @@
+Bitcoin version 0.7.1 is now available from:
+ http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-0.7.1/
+
+This is a bug-fix minor release.
+
+Please report bugs using the issue tracker at github:
+ https://github.com/bitcoin/bitcoin/issues
+
+Project source code is hosted at github; you can get
+source-only tarballs/zipballs directly from there:
+ https://github.com/bitcoin/bitcoin/tarball/v0.7.1 # .tar.gz
+ https://github.com/bitcoin/bitcoin/zipball/v0.7.1 # .zip
+
+Ubuntu Linux users can use the "Personal Package Archive" (PPA)
+maintained by Matt Corallo to automatically keep
+up-to-date. Just type:
+ sudo apt-add-repository ppa:bitcoin/bitcoin
+ sudo apt-get update
+in your terminal, then install the bitcoin-qt package:
+ sudo apt-get install bitcoin-qt
+
+KNOWN ISSUES
+------------
+
+Mac OSX 10.5 is no longer supported.
+
+How to Upgrade
+--------------
+
+If you are running an older version, shut it down. Wait
+until it has completely shut down (which might take a few minutes for older
+versions), then run the installer (on Windows) or just copy over
+/Applications/Bitcoin-Qt (on Mac) or bitcoind/bitcoin-qt (on Linux).
+
+If you were running on Linux with a version that might have been compiled
+with a different version of Berkeley DB (for example, if you were using an
+Ubuntu PPA version), then run the old version again with the -detachdb
+argument and shut it down; if you do not, then the new version will not
+be able to read the database files and will exit with an error.
+
+Explanation of -detachdb (and the new "stop true" RPC command):
+The Berkeley DB database library stores data in both ".dat" and
+"log" files, so the database is always in a consistent state,
+even in case of power failure or other sudden shutdown. The
+format of the ".dat" files is portable between different
+versions of Berkeley DB, but the "log" files are not-- even minor
+version differences may have incompatible "log" files. The
+-detachdb option moves any pending changes from the "log" files
+to the "blkindex.dat" file for maximum compatibility, but makes
+shutdown much slower. Note that the "wallet.dat" file is always
+detached, and versions prior to 0.6.0 detached all databases
+at shutdown.
+
+New features
+------------
+
+* Added a boolean argument to the RPC 'stop' command, if true sets
+ -detachdb to create standalone database .dat files before shutting down.
+
+* -salvagewallet command-line option, which moves any existing wallet.dat
+ to wallet.{timestamp}.dat and then attempts to salvage public/private
+ keys and master encryption keys (if the wallet is encrypted) into
+ a new wallet.dat. This should only be used if your wallet becomes
+ corrupted, and is not intended to replace regular wallet backups.
+
+* Import $DataDir/bootstrap.dat automatically, if it exists.
+
+Dependency changes
+------------------
+
+* Qt 4.8.2 for Windows builds
+
+* openssl 1.0.1c
+
+Bug fixes
+---------
+
+* Clicking on a bitcoin: URI on Windows should now launch Bitcoin-Qt properly.
+
+* When running -testnet, use RPC port 18332 by default.
+
+* Better detection and handling of corrupt wallet.dat and blkindex.dat files.
+ Previous versions would crash with a DB_RUNRECOVERY exception, this
+ version detects most problems and tells you how to recover if it
+ cannot recover itself.
+
+* Fixed an uninitialized variable bug that could cause transactions to
+ be reported out of order.
+
+* Fixed a bug that could cause occasional crashes on exit.
+
+* Warn the user that they need to create fresh wallet backups after they
+ encrypt their wallet.
+
+----------------------------------------------------
+Thanks to everybody who contributed to this release:
+
+Gavin Andresen
+Jeff Garzik
+Luke Dashjr
+Mark Friedenbach
+Matt Corallo
+Philip Kaufmann
+Pieter Wuille
+Rune K. Svendsen
+Virgil Dupras
+Wladimir J. van der Laan
+fanquake
+kjj2
+xanatos
diff --git a/doc/release-notes/release-notes-0.7.2.md b/doc/release-notes/release-notes-0.7.2.md
new file mode 100644
index 0000000000..40af34962b
--- /dev/null
+++ b/doc/release-notes/release-notes-0.7.2.md
@@ -0,0 +1,68 @@
+Bitcoin version 0.7.2 is now available from:
+ http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-0.7.2
+
+This is a bug-fix minor release.
+
+Please report bugs using the issue tracker at github:
+ https://github.com/bitcoin/bitcoin/issues
+
+How to Upgrade
+--------------
+
+If you are running an older version, shut it down. Wait
+until it has completely shut down (which might take a few minutes for older
+versions), then run the installer (on Windows) or just copy over
+/Applications/Bitcoin-Qt (on Mac) or bitcoind/bitcoin-qt (on Linux).
+
+If you were running on Linux with a version that might have been compiled
+with a different version of Berkeley DB (for example, if you were using an
+Ubuntu PPA version), then run the old version again with the -detachdb
+argument and shut it down; if you do not, then the new version will not
+be able to read the database files and will exit with an error.
+
+Explanation of -detachdb (and the new "stop true" RPC command):
+The Berkeley DB database library stores data in both ".dat" and
+"log" files, so the database is always in a consistent state,
+even in case of power failure or other sudden shutdown. The
+format of the ".dat" files is portable between different
+versions of Berkeley DB, but the "log" files are not-- even minor
+version differences may have incompatible "log" files. The
+-detachdb option moves any pending changes from the "log" files
+to the "blkindex.dat" file for maximum compatibility, but makes
+shutdown much slower. Note that the "wallet.dat" file is always
+detached, and versions prior to 0.6.0 detached all databases
+at shutdown.
+
+Bug fixes
+---------
+
+* Prevent RPC 'move' from deadlocking. This was caused by trying to lock the
+ database twice.
+
+* Fix use-after-free problems in initialization and shutdown, the latter of
+ which caused Bitcoin-Qt to crash on Windows when exiting.
+
+* Correct library linking so building on Windows natively works.
+
+* Avoid a race condition and out-of-bounds read in block creation/mining code.
+
+* Improve platform compatibility quirks, including fix for 100% CPU utilization
+ on FreeBSD 9.
+
+* A few minor corrections to error handling, and updated translations.
+
+* OSX 10.5 supported again
+
+----------------------------------------------------
+Thanks to everybody who contributed to this release:
+
+Alex
+dansmith
+Gavin Andresen
+Gregory Maxwell
+Jeff Garzik
+Luke Dashjr
+Philip Kaufmann
+Pieter Wuille
+Wladimir J. van der Laan
+grimd34th
diff --git a/doc/release-notes/release-notes-0.8.0.md b/doc/release-notes/release-notes-0.8.0.md
new file mode 100644
index 0000000000..4e98a7740f
--- /dev/null
+++ b/doc/release-notes/release-notes-0.8.0.md
@@ -0,0 +1,139 @@
+Bitcoin-Qt version 0.8.0 is now available from:
+ http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-0.8.0/
+
+This is a major release designed to improve performance and handle the
+increasing volume of transactions on the network.
+
+Please report bugs using the issue tracker at github:
+ https://github.com/bitcoin/bitcoin/issues
+
+How to Upgrade
+--------------
+
+If you are running an older version, shut it down. Wait
+until it has completely shut down (which might take a few minutes for older
+versions), then run the installer (on Windows) or just copy over
+/Applications/Bitcoin-Qt (on Mac) or bitcoind/bitcoin-qt (on Linux).
+
+The first time you run after the upgrade a re-indexing process will be
+started that will take anywhere from 30 minutes to several hours,
+depending on the speed of your machine.
+
+Incompatible Changes
+--------------------
+
+This release no longer maintains a full index of historical transaction ids
+by default, so looking up an arbitrary transaction using the getrawtransaction
+RPC call will not work. If you need that functionality, you must run once
+with -txindex=1 -reindex=1 to rebuild block-chain indices (see below for more
+details).
+
+Improvements
+------------
+
+Mac and Windows binaries are signed with certificates owned by the Bitcoin
+Foundation, to be compatible with the new security features in OSX 10.8 and
+Windows 8.
+
+LevelDB, a fast, open-source, non-relational database from Google, is
+now used to store transaction and block indices. LevelDB works much better
+on machines with slow I/O and is faster in general. Berkeley DB is now only
+used for the wallet.dat file (public and private wallet keys and transactions
+relevant to you).
+
+Pieter Wuille implemented many optimizations to the way transactions are
+verified, so a running, synchronized node uses less working memory and does
+much less I/O. He also implemented parallel signature checking, so if you
+have a multi-CPU machine all CPUs will be used to verify transactions.
+
+New Features
+------------
+
+"Bloom filter" support in the network protocol for sending only relevant transactions to
+lightweight clients.
+
+contrib/verifysfbinaries is a shell-script to verify that the binary downloads
+at sourceforge have not been tampered with. If you are able, you can help make
+everybody's downloads more secure by running this occasionally to check PGP
+signatures against download file checksums.
+
+contrib/spendfrom is a python-language command-line utility that demonstrates
+how to use the "raw transactions" JSON-RPC api to send coins received from particular
+addresses (also known as "coin control").
+
+New/changed settings (command-line or bitcoin.conf file)
+--------------------------------------------------------
+
+dbcache : controls LevelDB memory usage.
+
+par : controls how many threads to use to validate transactions. Defaults to the number
+of CPUs on your machine, use -par=1 to limit to a single CPU.
+
+txindex : maintains an extra index of old, spent transaction ids so they will be found
+by the getrawtransaction JSON-RPC method.
+
+reindex : rebuild block and transaction indices from the downloaded block data.
+
+New JSON-RPC API Features
+-------------------------
+
+lockunspent / listlockunspent allow locking transaction outputs for a period of time so
+they will not be spent by other processes that might be accessing the same wallet.
+
+addnode / getaddednodeinfo methods, to connect to specific peers without restarting.
+
+importprivkey now takes an optional boolean parameter (default true) to control whether
+or not to rescan the blockchain for transactions after importing a new private key.
+
+Important Bug Fixes
+-------------------
+
+Privacy leak: the position of the "change" output in most transactions was not being
+properly randomized, making network analysis of the transaction graph to identify
+users' wallets easier.
+
+Zero-confirmation transaction vulnerability: accepting zero-confirmation transactions
+(transactions that have not yet been included in a block) from somebody you do not
+trust is still not recommended, because there will always be ways for attackers to
+double-spend zero-confirmation transactions. However, this release includes a bug
+fix that makes it a little bit more difficult for attackers to double-spend a
+certain type ("lockTime in the future") of zero-confirmation transaction.
+
+Dependency Changes
+------------------
+
+Qt 4.8.3 (compiling against older versions of Qt 4 should continue to work)
+
+
+Thanks to everybody who contributed to this release:
+----------------------------------------------------
+
+Alexander Kjeldaas
+Andrey Alekseenko
+Arnav Singh
+Christian von Roques
+Eric Lombrozo
+Forrest Voight
+Gavin Andresen
+Gregory Maxwell
+Jeff Garzik
+Luke Dashjr
+Matt Corallo
+Mike Cassano
+Mike Hearn
+Peter Todd
+Philip Kaufmann
+Pieter Wuille
+Richard Schwab
+Robert Backhaus
+Rune K. Svendsen
+Sergio Demian Lerner
+Wladimir J. van der Laan
+burger2
+default
+fanquake
+grimd34th
+justmoon
+redshark1802
+tucenaber
+xanatos
diff --git a/doc/release-notes/release-notes-0.8.1.md b/doc/release-notes/release-notes-0.8.1.md
new file mode 100644
index 0000000000..4fd546bee0
--- /dev/null
+++ b/doc/release-notes/release-notes-0.8.1.md
@@ -0,0 +1,22 @@
+Bitcoin-Qt/bitcoind version 0.8.1 is now available from:
+ http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-0.8.1/
+
+This is a maintenance release that adds a new network rule to avoid
+a chain-forking incompatibility with versions 0.7.2 and earlier.
+
+Please report bugs using the issue tracker at github:
+ https://github.com/bitcoin/bitcoin/issues
+
+
+How to Upgrade
+--------------
+
+If you are running an older version, shut it down. Wait
+until it has completely shut down (which might take a few minutes for older
+versions), then run the installer (on Windows) or just copy over
+/Applications/Bitcoin-Qt (on Mac) or bitcoind/bitcoin-qt (on Linux).
+
+If you are upgrading from version 0.7.2 or earlier, the first time you
+run 0.8.1 your blockchain files will be re-indexed, which will take
+anywhere from 30 minutes to several hours, depending on the speed of
+your machine.
diff --git a/doc/release-notes/release-notes-0.8.2.md b/doc/release-notes/release-notes-0.8.2.md
new file mode 100644
index 0000000000..eea9ba2a2c
--- /dev/null
+++ b/doc/release-notes/release-notes-0.8.2.md
@@ -0,0 +1,137 @@
+Bitcoin-Qt version 0.8.2 is now available from:
+ http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-0.8.2/
+
+This is a maintenance release that fixes many bugs and includes
+a few small new features.
+
+Please report bugs using the issue tracker at github:
+ https://github.com/bitcoin/bitcoin/issues
+
+
+How to Upgrade
+
+If you are running an older version, shut it down. Wait
+until it has completely shut down (which might take a few minutes for older
+versions), then run the installer (on Windows) or just copy over
+/Applications/Bitcoin-Qt (on Mac) or bitcoind/bitcoin-qt (on Linux).
+
+If you are upgrading from version 0.7.2 or earlier, the first time you
+run 0.8.2 your blockchain files will be re-indexed, which will take
+anywhere from 30 minutes to several hours, depending on the speed of
+your machine.
+
+0.8.2 Release notes
+
+Fee Policy changes
+
+The default fee for low-priority transactions is lowered from 0.0005 BTC
+(for each 1,000 bytes in the transaction; an average transaction is
+about 500 bytes) to 0.0001 BTC.
+
+Payments (transaction outputs) of 0.543 times the minimum relay fee
+(0.00005430 BTC) are now considered 'non-standard', because storing them
+costs the network more than they are worth and spending them will usually
+cost their owner more in transaction fees than they are worth.
+
+Non-standard transactions are not relayed across the network, are not included
+in blocks by most miners, and will not show up in your wallet until they are
+included in a block.
+
+The default fee policy can be overridden using the -mintxfee and -minrelaytxfee
+command-line options, but note that we intend to replace the hard-coded fees
+with code that automatically calculates and suggests appropriate fees in the
+0.9 release and note that if you set a fee policy significantly different from
+the rest of the network your transactions may never confirm.
+
+Bitcoin-Qt changes
+
+* New icon and splash screen
+* Improve reporting of synchronization process
+* Remove hardcoded fee recommendations
+* Improve metadata of executable on MacOSX and Windows
+* Move export button to individual tabs instead of toolbar
+* Add "send coins" command to context menu in address book
+* Add "copy txid" command to copy transaction IDs from transaction overview
+* Save & restore window size and position when showing & hiding window
+* New translations: Arabic (ar), Bosnian (bs), Catalan (ca), Welsh (cy),
+ Esperanto (eo), Interlingua (la), Latvian (lv) and many improvements
+ to current translations
+
+MacOSX:
+* OSX support for click-to-pay (bitcoin:) links
+* Fix GUI disappearing problem on MacOSX (issue #1522)
+
+Linux/Unix:
+* Copy addresses to middle-mouse-button clipboard
+
+
+Command-line options
+
+* -walletnotify will call a command on receiving transactions that affect the wallet.
+* -alertnotify will call a command on receiving an alert from the network.
+* -par now takes a negative number, to leave a certain amount of cores free.
+
+JSON-RPC API changes
+
+* fixed a getblocktemplate bug that caused excessive CPU creating blocks.
+* listunspent now lists account and address information.
+* getinfo now also returns the time adjustment estimated from your peers.
+* getpeerinfo now returns bytessent, bytesrecv and syncnode.
+* gettxoutsetinfo returns statistics about the unspent transaction output database.
+* gettxout returns information about a specific unspent transaction output.
+
+
+Networking changes
+
+* Significant changes to the networking code, reducing latency and memory consumption.
+* Avoid initial block download stalling.
+* Remove IRC seeding support.
+* Performance tweaks.
+* Added testnet DNS seeds.
+
+Wallet compatibility/rescuing
+
+* Cases where wallets cannot be opened in another version/installation should be reduced.
+* -salvagewallet now works for encrypted wallets.
+
+
+Known Bugs
+
+* Entering the 'getblocktemplate' or 'getwork' RPC commands into the Bitcoin-Qt debug
+console will cause Bitcoin-Qt to crash. Run Bitcoin-Qt with the -server command-line
+option to workaround.
+
+Thanks to everybody who contributed to the 0.8.2 release!
+
+APerson241
+Andrew Poelstra
+Calvin Owens
+Chuck LeDuc Díaz
+Colin Dean
+David Griffith
+David Serrano
+Eric Lombrozo
+Gavin Andresen
+Gregory Maxwell
+Jeff Garzik
+Jonas Schnelli
+Larry Gilbert
+Luke Dashjr
+Matt Corallo
+Michael Ford
+Mike Hearn
+Patrick Brown
+Peter Todd
+Philip Kaufmann
+Pieter Wuille
+Richard Schwab
+Roman Mindalev
+Scott Howard
+Tariq Bashir
+Warren Togami
+Wladimir J. van der Laan
+freewil
+gladoscc
+kjj2
+mb300sd
+super3
diff --git a/doc/release-notes/release-notes-0.8.3.md b/doc/release-notes/release-notes-0.8.3.md
new file mode 100644
index 0000000000..856c20aa33
--- /dev/null
+++ b/doc/release-notes/release-notes-0.8.3.md
@@ -0,0 +1,18 @@
+Bitcoin-Qt version 0.8.3 is now available from:
+ http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-0.8.3/
+
+This is a maintenance release to fix a denial-of-service attack that
+can cause nodes to crash.
+
+Please report bugs using the issue tracker at github:
+ https://github.com/bitcoin/bitcoin/issues
+
+0.8.3 Release notes
+
+Truncate over-size messages to prevent a memory exhaustion attack.
+
+Fix a regression that causes excessive re-writing of the 'peers.dat' file.
+
+
+Thanks to Peter Todd for responsibly disclosing the vulnerability
+( CVE-2013-4627 ) and creating a fix.
diff --git a/doc/release-notes/release-notes-0.8.4.md b/doc/release-notes/release-notes-0.8.4.md
new file mode 100644
index 0000000000..c6f31f1fa4
--- /dev/null
+++ b/doc/release-notes/release-notes-0.8.4.md
@@ -0,0 +1,83 @@
+Bitcoin-Qt version 0.8.4 is now available from:
+ http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-0.8.4/
+
+This is a maintenance release to fix a critical bug and three
+security issues; we urge all users to upgrade.
+
+Please report bugs using the issue tracker at github:
+ https://github.com/bitcoin/bitcoin/issues
+
+
+How to Upgrade
+--------------
+
+If you are running an older version, shut it down. Wait
+until it has completely shut down (which might take a few minutes for older
+versions), then run the installer (on Windows) or just copy over
+/Applications/Bitcoin-Qt (on Mac) or bitcoind/bitcoin-qt (on Linux).
+
+If you are upgrading from version 0.7.2 or earlier, the first time you
+run 0.8.4 your blockchain files will be re-indexed, which will take
+anywhere from 30 minutes to several hours, depending on the speed of
+your machine.
+
+0.8.4 Release notes
+===================
+
+Security issues
+---------------
+
+An attacker could send a series of messages that resulted in
+an integer division-by-zero error in the Bloom Filter handling
+code, causing the Bitcoin-Qt or bitcoind process to crash.
+Bloom filters were introduced with version 0.8, so versions 0.8.0
+through 0.8.3 are vulnerable to this critical denial-of-service attack.
+
+A constant-time algorithm is now used to check RPC password
+guess attempts; fixes https://github.com/bitcoin/bitcoin/issues/2838
+(CVE-2013-4165)
+
+Implement a better fix for the fill-memory-with-orphan-transactions
+attack that was fixed in 0.8.3. See
+https://bitslog.wordpress.com/2013/07/18/buggy-cve-2013-4627-patch-open-new-vectors-of-attack/
+for a description of the weaknesses of the previous fix.
+(CVE-2013-4627)
+
+Bugs fixed
+----------
+
+Fix multi-block reorg transaction resurrection.
+
+Fix non-standard disconnected transactions causing mempool orphans.
+This bug could cause nodes running with the -debug flag to crash.
+
+OSX: use 'FD_FULLSYNC' with LevelDB, which will (hopefully!)
+prevent the database corruption issues many people have
+experienced on OSX.
+
+Linux: clicking on bitcoin: links was broken if you were using
+a Gnome-based desktop.
+
+Fix a hang-at-shutdown bug that only affects users that compile
+their own version of Bitcoin against Boost versions 1.50-1.52.
+
+Other changes
+-------------
+
+Checkpoint at block 250,000 to speed up initial block downloads
+and make the progress indicator when downloading more accurate.
+
+
+Thanks to everybody who contributed to the 0.8.4 releases!
+----------------------------------------------------------
+
+Pieter Wuille
+Warren Togami
+Patrick Strateman
+pakt
+Gregory Maxwell
+Sergio Demian Lerner
+grayleonard
+Cory Fields
+Matt Corallo
+Gavin Andresen
diff --git a/doc/release-notes/release-notes-0.8.5.md b/doc/release-notes/release-notes-0.8.5.md
new file mode 100644
index 0000000000..aa93fe7c71
--- /dev/null
+++ b/doc/release-notes/release-notes-0.8.5.md
@@ -0,0 +1,44 @@
+Bitcoin-Qt version 0.8.5 is now available from:
+ http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-0.8.5/
+
+This is a maintenance release to fix a critical bug;
+we urge all users to upgrade.
+
+Please report bugs using the issue tracker at github:
+ https://github.com/bitcoin/bitcoin/issues
+
+
+How to Upgrade
+--------------
+
+If you are running an older version, shut it down. Wait
+until it has completely shut down (which might take a few minutes for older
+versions), then run the installer (on Windows) or just copy over
+/Applications/Bitcoin-Qt (on Mac) or bitcoind/bitcoin-qt (on Linux).
+
+If you are upgrading from version 0.7.2 or earlier, the first time you
+run 0.8.5 your blockchain files will be re-indexed, which will take
+anywhere from 30 minutes to several hours, depending on the speed of
+your machine.
+
+0.8.5 Release notes
+===================
+
+Bugs fixed
+----------
+
+Transactions with version numbers larger than 0x7fffffff were
+incorrectly being relayed and included in blocks.
+
+Blocks containing transactions with version numbers larger
+than 0x7fffffff caused the code that checks for LevelDB database
+inconsistencies at startup to erroneously report database
+corruption and suggest that you reindex your database.
+
+This release also contains a non-critical fix to the code that
+enforces BIP 34 (block height in the coinbase transaction).
+
+--
+
+Thanks to Gregory Maxwell and Pieter Wuille for quickly
+identifying and fixing the transaction version number bug.
diff --git a/doc/release-notes/release-notes-0.8.6.md b/doc/release-notes/release-notes-0.8.6.md
new file mode 100644
index 0000000000..39a45e0db5
--- /dev/null
+++ b/doc/release-notes/release-notes-0.8.6.md
@@ -0,0 +1,66 @@
+Bitcoin-Qt version 0.8.6 final is now available from:
+
+ http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-0.8.6/
+
+This is a maintenance release to fix a critical bug; we urge all users to upgrade.
+
+Please report bugs using the issue tracker at github:
+
+ https://github.com/bitcoin/bitcoin/issues
+
+How to Upgrade
+--------------
+
+If you already downloaded 0.8.6rc1 you do not need to re-download. This release is exactly the same.
+
+If you are running an older version, shut it down. Wait
+until it has completely shut down (which might take a few minutes for older
+versions), then run the installer (on Windows) or just copy over
+/Applications/Bitcoin-Qt (on Mac) or bitcoind/bitcoin-qt (on Linux).
+
+If you are upgrading from version 0.7.2 or earlier, the first time you
+run 0.8.6 your blockchain files will be re-indexed, which will take
+anywhere from 30 minutes to several hours, depending on the speed of
+your machine.
+
+0.8.6 Release notes
+===================
+
+- Default block size increase for miners.
+ (see https://gist.github.com/gavinandresen/7670433#086-accept-into-block)
+
+- Remove the all-outputs-must-be-greater-than-CENT-to-qualify-as-free rule for relaying
+ (see https://gist.github.com/gavinandresen/7670433#086-relaying)
+
+- Lower maximum size for free transaction creation
+ (see https://gist.github.com/gavinandresen/7670433#086-wallet)
+
+- OSX block chain database corruption fixes
+ - Update leveldb to 1.13
+ - Use fcntl with `F_FULLSYNC` instead of fsync on OSX
+ - Use native Darwin memory barriers
+ - Replace use of mmap in leveldb for improved reliability (only on OSX)
+
+- Fix nodes forwarding transactions with empty vins and getting banned
+
+- Network code performance and robustness improvements
+
+- Additional debug.log logging for diagnosis of network problems, log timestamps by default
+
+- Fix Bitcoin-Qt startup crash when clicking dock icon on OSX
+
+- Fix memory leaks in CKey::SetCompactSignature() and Key::SignCompact()
+
+- Fix rare GUI crash on send
+
+- Various small GUI, documentation and build fixes
+
+Warning
+-------
+
+- There have been frequent reports of users running out of virtual memory on 32-bit systems
+ during the initial sync.
+ Hence it is recommended to use a 64-bit executable if possible.
+ A 64-bit executable for Windows is planned for 0.9.
+
+Note: Gavin Andresen's GPG signing key for SHA256SUMS.asc has been changed from key id 1FC730C1 to sub key 7BF6E212 (see https://github.com/bitcoin/bitcoin.org/pull/279).
diff --git a/doc/release-process.md b/doc/release-process.md
index 7fccf2172e..459819e596 100644
--- a/doc/release-process.md
+++ b/doc/release-process.md
@@ -43,7 +43,7 @@ Release Process
wget 'https://www.openssl.org/source/openssl-1.0.1e.tar.gz'
wget 'http://download.oracle.com/berkeley-db/db-4.8.30.NC.tar.gz'
wget 'http://zlib.net/zlib-1.2.8.tar.gz'
- wget 'ftp://ftp.simplesystems.org/pub/png/src/libpng16/libpng-1.6.8.tar.gz'
+ wget 'ftp://ftp.simplesystems.org/pub/png/src/history/libpng16/libpng-1.6.8.tar.gz'
wget 'https://fukuchi.org/works/qrencode/qrencode-3.4.3.tar.bz2'
wget 'https://downloads.sourceforge.net/project/boost/boost/1.55.0/boost_1_55_0.tar.bz2'
wget 'https://svn.boost.org/trac/boost/raw-attachment/ticket/7262/boost-mingw.patch' -O \
@@ -51,18 +51,18 @@ Release Process
wget 'https://download.qt-project.org/official_releases/qt/5.2/5.2.0/single/qt-everywhere-opensource-src-5.2.0.tar.gz'
wget 'https://protobuf.googlecode.com/files/protobuf-2.5.0.tar.bz2'
cd ..
+ ./bin/gbuild ../bitcoin/contrib/gitian-descriptors/boost-linux.yml
+ mv build/out/boost-*.zip inputs/
./bin/gbuild ../bitcoin/contrib/gitian-descriptors/deps-linux.yml
mv build/out/bitcoin-deps-*.zip inputs/
- ./bin/gbuild ../bitcoin/contrib/gitian-descriptors/boost-linux.yml
- mv build/out/boost-linux-*.zip inputs/
- ./bin/gbuild ../bitcoin/contrib/gitian-descriptors/boost-win32.yml
- mv build/out/boost-win32-*.zip inputs/
- ./bin/gbuild ../bitcoin/contrib/gitian-descriptors/deps-win32.yml
+ ./bin/gbuild ../bitcoin/contrib/gitian-descriptors/boost-win.yml
+ mv build/out/boost-*.zip inputs/
+ ./bin/gbuild ../bitcoin/contrib/gitian-descriptors/deps-win.yml
mv build/out/bitcoin-deps-*.zip inputs/
- ./bin/gbuild ../bitcoin/contrib/gitian-descriptors/qt-win32.yml
- mv build/out/qt-win32-*.zip inputs/
- ./bin/gbuild ../bitcoin/contrib/gitian-descriptors/protobuf-win32.yml
- mv build/out/protobuf-win32-*.zip inputs/
+ ./bin/gbuild ../bitcoin/contrib/gitian-descriptors/qt-win.yml
+ mv build/out/qt-*.zip inputs/
+ ./bin/gbuild ../bitcoin/contrib/gitian-descriptors/protobuf-win.yml
+ mv build/out/protobuf-*.zip inputs/
Build bitcoind and bitcoin-qt on Linux32, Linux64, and Win32:
@@ -72,19 +72,19 @@ Release Process
zip -r bitcoin-${VERSION}-linux-gitian.zip *
mv bitcoin-${VERSION}-linux-gitian.zip ../../../
popd
- ./bin/gbuild --commit bitcoin=v${VERSION} ../bitcoin/contrib/gitian-descriptors/gitian-win32.yml
- ./bin/gsign --signer $SIGNER --release ${VERSION}-win32 --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/gitian-win32.yml
+ ./bin/gbuild --commit bitcoin=v${VERSION} ../bitcoin/contrib/gitian-descriptors/gitian-win.yml
+ ./bin/gsign --signer $SIGNER --release ${VERSION}-win --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/gitian-win.yml
pushd build/out
- zip -r bitcoin-${VERSION}-win32-gitian.zip *
- mv bitcoin-${VERSION}-win32-gitian.zip ../../../
+ zip -r bitcoin-${VERSION}-win-gitian.zip *
+ mv bitcoin-${VERSION}-win-gitian.zip ../../../
popd
popd
Build output expected:
1. linux 32-bit and 64-bit binaries + source (bitcoin-${VERSION}-linux-gitian.zip)
- 2. windows 32-bit binary, installer + source (bitcoin-${VERSION}-win32-gitian.zip)
- 3. Gitian signatures (in gitian.sigs/${VERSION}[-win32]/(your gitian key)/
+ 2. windows 32-bit and 64-bit binaries + installer + source (bitcoin-${VERSION}-win-gitian.zip)
+ 3. Gitian signatures (in gitian.sigs/${VERSION}[-win]/(your gitian key)/
repackage gitian builds for release as stand-alone zip/tar/installer exe
@@ -96,10 +96,10 @@ repackage gitian builds for release as stand-alone zip/tar/installer exe
**Windows .zip and setup.exe:**
- unzip bitcoin-${VERSION}-win32-gitian.zip -d bitcoin-${VERSION}-win32
- mv bitcoin-${VERSION}-win32/bitcoin-*-setup.exe .
- zip -r bitcoin-${VERSION}-win32.zip bitcoin-${VERSION}-win32
- rm -rf bitcoin-${VERSION}-win32
+ unzip bitcoin-${VERSION}-win-gitian.zip -d bitcoin-${VERSION}-win
+ mv bitcoin-${VERSION}-win/bitcoin-*-setup.exe .
+ zip -r bitcoin-${VERSION}-win.zip bitcoin-${VERSION}-win
+ rm -rf bitcoin-${VERSION}-win
**Perform Mac build:**
@@ -138,7 +138,7 @@ Commit your signature to gitian.sigs:
pushd gitian.sigs
git add ${VERSION}/${SIGNER}
- git add ${VERSION}-win32/${SIGNER}
+ git add ${VERSION}-win/${SIGNER}
git commit -a
git push # Assuming you can push to the gitian.sigs tree
popd
@@ -162,17 +162,17 @@ From a directory containing bitcoin source, gitian.sigs and gitian zips
zip -r bitcoin-${VERSION}-linux-gitian.zip *
cp bitcoin-${VERSION}-linux-gitian.zip ../
popd
- mkdir bitcoin-${VERSION}-win32-gitian
- pushd bitcoin-${VERSION}-win32-gitian
- unzip ../bitcoin-${VERSION}-win32-gitian.zip
+ mkdir bitcoin-${VERSION}-win-gitian
+ pushd bitcoin-${VERSION}-win-gitian
+ unzip ../bitcoin-${VERSION}-win-gitian.zip
mkdir gitian
cp ../bitcoin/contrib/gitian-downloader/*.pgp ./gitian/
- for signer in $(ls ../gitian.sigs/${VERSION}-win32/); do
- cp ../gitian.sigs/${VERSION}-win32/${signer}/bitcoin-build.assert ./gitian/${signer}-build.assert
- cp ../gitian.sigs/${VERSION}-win32/${signer}/bitcoin-build.assert.sig ./gitian/${signer}-build.assert.sig
+ for signer in $(ls ../gitian.sigs/${VERSION}-win/); do
+ cp ../gitian.sigs/${VERSION}-win/${signer}/bitcoin-build.assert ./gitian/${signer}-build.assert
+ cp ../gitian.sigs/${VERSION}-win/${signer}/bitcoin-build.assert.sig ./gitian/${signer}-build.assert.sig
done
- zip -r bitcoin-${VERSION}-win32-gitian.zip *
- cp bitcoin-${VERSION}-win32-gitian.zip ../
+ zip -r bitcoin-${VERSION}-win-gitian.zip *
+ cp bitcoin-${VERSION}-win-gitian.zip ../
popd
- Upload gitian zips to SourceForge
diff --git a/doc/tor.md b/doc/tor.md
index 41dd71209f..b5eb91e12e 100644
--- a/doc/tor.md
+++ b/doc/tor.md
@@ -11,7 +11,7 @@ configure Tor.
---------------------------------
The first step is running Bitcoin behind a Tor proxy. This will already make all
-outgoing connections be anonimized, but more is possible.
+outgoing connections be anonymized, but more is possible.
-socks=5 SOCKS5 supports connecting-to-hostname, which can be used instead
of doing a (leaking) local DNS lookup. SOCKS5 is the default,
diff --git a/qa/rpc-tests/README.md b/qa/rpc-tests/README.md
index c8537247d9..ee9e8b35ca 100644
--- a/qa/rpc-tests/README.md
+++ b/qa/rpc-tests/README.md
@@ -1,6 +1,25 @@
Regression tests of RPC interface
=================================
-wallet.sh : Test wallet send/receive code (see comments for details)
+wallet.sh : Exercise wallet send/receive code.
-util.sh : useful re-usable functions
+walletbackup.sh : Exercise wallet backup / dump / import
+
+txnmall.sh : Test proper accounting of malleable transactions
+
+conflictedbalance.sh : More testing of malleable transaction handling
+
+util.sh : useful re-usable bash functions
+
+
+Tips for creating new tests
+===========================
+
+To cleanup after a failed or interrupted test:
+ killall bitcoind
+ rm -rf test.*
+
+The most difficult part of writing reproducible tests is
+keeping multiple nodes in sync. See WaitBlocks,
+WaitPeers, and WaitMemPools for how other tests
+deal with this.
diff --git a/qa/rpc-tests/send.sh b/qa/rpc-tests/send.sh
index fdfb1867bc..2c0d5375c0 100755
--- a/qa/rpc-tests/send.sh
+++ b/qa/rpc-tests/send.sh
@@ -1,14 +1,28 @@
#!/bin/bash
TIMEOUT=10
SIGNAL=HUP
+PIDFILE=.send.pid
if [ $# -eq 0 ]; then
echo -e "Usage:\t$0 <cmd>"
echo -e "\tRuns <cmd> and wait ${TIMEOUT} seconds or until SIG${SIGNAL} is received."
echo -e "\tReturns: 0 if SIG${SIGNAL} is received, 1 otherwise."
+ echo -e "Or:\t$0 -STOP"
+ echo -e "\tsends SIG${SIGNAL} to running send.sh"
exit 0
fi
+
+if [ $1 == "-STOP" ]; then
+ if [ -s ${PIDFILE} ]; then
+ kill -s ${SIGNAL} $(<${PIDFILE})
+ fi
+ exit 0
+fi
+
trap '[[ ${PID} ]] && kill ${PID}' ${SIGNAL}
+trap 'rm -f ${PIDFILE}' EXIT
+echo $$ > ${PIDFILE}
"$@"
sleep ${TIMEOUT} & PID=$!
wait ${PID} && exit 1
+
exit 0
diff --git a/qa/rpc-tests/txnmall.sh b/qa/rpc-tests/txnmall.sh
new file mode 100755
index 0000000000..06e4f7102d
--- /dev/null
+++ b/qa/rpc-tests/txnmall.sh
@@ -0,0 +1,150 @@
+#!/usr/bin/env bash
+
+# Test block generation and basic wallet sending
+
+if [ $# -lt 1 ]; then
+ echo "Usage: $0 path_to_binaries"
+ echo "e.g. $0 ../../src"
+ exit 1
+fi
+
+set -f
+
+BITCOIND=${1}/bitcoind
+CLI=${1}/bitcoin-cli
+
+DIR="${BASH_SOURCE%/*}"
+SENDANDWAIT="${DIR}/send.sh"
+if [[ ! -d "$DIR" ]]; then DIR="$PWD"; fi
+. "$DIR/util.sh"
+
+D=$(mktemp -d test.XXXXX)
+
+# Two nodes; one will play the part of merchant, the
+# other an evil transaction-mutating miner.
+
+D1=${D}/node1
+CreateDataDir $D1 port=11000 rpcport=11001
+B1ARGS="-datadir=$D1"
+$BITCOIND $B1ARGS &
+B1PID=$!
+
+D2=${D}/node2
+CreateDataDir $D2 port=11010 rpcport=11011
+B2ARGS="-datadir=$D2"
+$BITCOIND $B2ARGS &
+B2PID=$!
+
+trap "kill -9 $B1PID $B2PID; rm -rf $D" EXIT
+
+# Wait until all four nodes are at the same block number
+function WaitBlocks {
+ while :
+ do
+ sleep 1
+ BLOCKS1=$( GetBlocks $B1ARGS )
+ BLOCKS2=$( GetBlocks $B2ARGS )
+ if (( $BLOCKS1 == $BLOCKS2 ))
+ then
+ break
+ fi
+ done
+}
+
+# Wait until node has $N peers
+function WaitPeers {
+ while :
+ do
+ PEERS=$( $CLI $1 getconnectioncount )
+ if (( "$PEERS" == $2 ))
+ then
+ break
+ fi
+ sleep 1
+ done
+}
+
+# Start with B2 connected to B1:
+$CLI $B2ARGS addnode 127.0.0.1:11000 onetry
+WaitPeers "$B1ARGS" 1
+
+# 1 block, 50 XBT each == 50 XBT
+$CLI $B1ARGS setgenerate true 1
+
+WaitBlocks
+# 100 blocks, 0 mature == 0 XBT
+$CLI $B2ARGS setgenerate true 100
+WaitBlocks
+
+CheckBalance $B1ARGS 50
+CheckBalance $B2ARGS 0
+
+# restart B2 with no connection
+$CLI $B2ARGS stop > /dev/null 2>&1
+wait $B2PID
+$BITCOIND $B2ARGS &
+B2PID=$!
+
+B2ADDRESS=$( $CLI $B2ARGS getnewaddress )
+
+# Have B1 create two transactions; second will
+# spend change from first, since B1 starts with only a single
+# 50 bitcoin output:
+$CLI $B1ARGS move "" "foo" 10.0
+$CLI $B1ARGS move "" "bar" 10.0
+TXID1=$( $CLI $B1ARGS sendfrom foo $B2ADDRESS 1.0 0)
+TXID2=$( $CLI $B1ARGS sendfrom bar $B2ADDRESS 2.0 0)
+
+# Mutate TXID1 and add it to B2's memory pool:
+RAWTX1=$( $CLI $B1ARGS getrawtransaction $TXID1 )
+RAWTX2=$( $CLI $B1ARGS getrawtransaction $TXID2 )
+# ... mutate RAWTX1:
+# RAWTX1 is hex-encoded, serialized transaction. So each
+# byte is two characters; we'll prepend the first
+# "push" in the scriptsig with OP_PUSHDATA1 (0x4c),
+# and add one to the length of the signature.
+# Fields are fixed; from the beginning:
+# 4-byte version
+# 1-byte varint number-of inputs (one in this case)
+# 32-byte previous txid
+# 4-byte previous output
+# 1-byte varint length-of-scriptsig
+# 1-byte PUSH this many bytes onto stack
+# ... etc
+# So: to mutate, we want to get byte 41 (hex characters 82-83),
+# increment it, and insert 0x4c after it.
+L=${RAWTX1:82:2}
+NEWLEN=$( printf "%x" $(( 16#$L + 1 )) )
+MUTATEDTX1=${RAWTX1:0:82}${NEWLEN}4c${RAWTX1:84}
+# ... give mutated tx1 to B2:
+MUTATEDTXID=$( $CLI $B2ARGS sendrawtransaction $MUTATEDTX1 )
+
+echo "TXID1: " $TXID1
+echo "Mutated: " $MUTATEDTXID
+
+# Re-connect nodes, and have B2 mine a block
+$CLI $B2ARGS addnode 127.0.0.1:11000 onetry
+WaitPeers "$B1ARGS" 1
+
+$CLI $B2ARGS setgenerate true 3
+WaitBlocks
+$CLI $B1ARGS setgenerate true 3
+WaitBlocks
+
+$CLI $B2ARGS stop > /dev/null 2>&1
+wait $B2PID
+$CLI $B1ARGS stop > /dev/null 2>&1
+wait $B1PID
+
+trap "" EXIT
+
+echo "Done, bitcoind's shut down. To rerun/poke around:"
+echo "${1}/bitcoind -datadir=$D1 -daemon"
+echo "${1}/bitcoind -datadir=$D2 -daemon -connect=127.0.0.1:11000"
+echo "To cleanup:"
+echo "killall bitcoind; rm -rf test.*"
+exit 0
+
+echo "Tests successful, cleaning up"
+rm -rf $D
+exit 0
diff --git a/qa/rpc-tests/util.sh b/qa/rpc-tests/util.sh
index fed7d32561..d1e4c941cc 100644
--- a/qa/rpc-tests/util.sh
+++ b/qa/rpc-tests/util.sh
@@ -23,7 +23,7 @@ function CreateDataDir {
echo "rpcuser=rt" >> $CONF
echo "rpcpassword=rt" >> $CONF
echo "rpcwait=1" >> $CONF
- echo "walletnotify=killall -HUP `basename ${SENDANDWAIT}`" >> $CONF
+ echo "walletnotify=${SENDANDWAIT} -STOP" >> $CONF
shift
while (( "$#" )); do
echo $1 >> $CONF
diff --git a/qa/rpc-tests/walletbackup.sh b/qa/rpc-tests/walletbackup.sh
new file mode 100755
index 0000000000..9207243b62
--- /dev/null
+++ b/qa/rpc-tests/walletbackup.sh
@@ -0,0 +1,293 @@
+#!/usr/bin/env bash
+
+# Test wallet backup / dump / restore functionality
+
+# Test case is:
+# 4 nodes. 1 2 3 and send transactions between each other,
+# fourth node is a miner.
+# 1 2 3 and each mine a block to start, then
+# miner creates 100 blocks so 1 2 3 each have 50 mature
+# coins to spend.
+# Then 5 iterations of 1/2/3 sending coins amongst
+# themselves to get transactions in the wallets,
+# and the miner mining one block.
+#
+# Wallets are backed up using dumpwallet/backupwallet.
+# Then 5 more iterations of transactions, then block.
+#
+# Miner then generates 101 more blocks, so any
+# transaction fees paid mature.
+#
+# Sanity checks done:
+# Miner balance >= 150*50
+# Sum(1,2,3,4 balances) == 153*150
+#
+# 1/2/3 are shutdown, and their wallets erased.
+# Then restore using wallet.dat backup. And
+# confirm 1/2/3/4 balances are same as before.
+#
+# Shutdown again, restore using importwallet,
+# and confirm again balances are correct.
+#
+
+if [ $# -lt 1 ]; then
+ echo "Usage: $0 path_to_binaries"
+ echo "e.g. $0 ../../src"
+ exit 1
+fi
+
+BITCOIND=${1}/bitcoind
+CLI=${1}/bitcoin-cli
+
+DIR="${BASH_SOURCE%/*}"
+SENDANDWAIT="${DIR}/send.sh"
+if [[ ! -d "$DIR" ]]; then DIR="$PWD"; fi
+. "$DIR/util.sh"
+
+D=$(mktemp -d test.XXXXX)
+
+echo "Starting nodes..."
+
+# "Miner":
+D4=${D}/node4
+CreateDataDir $D4 port=11030 rpcport=11031
+B4ARGS="-datadir=$D4"
+$BITCOIND $BITCOINDARGS $B4ARGS &
+B4PID=$!
+
+# Want default keypool for 1/2/3, and
+# don't need send-and-wait functionality,
+# so don't use CreateDataDir:
+function CreateConfDir {
+ DIR=$1
+ mkdir -p $DIR
+ CONF=$DIR/bitcoin.conf
+ echo "regtest=1" >> $CONF
+ echo "rpcuser=rt" >> $CONF
+ echo "rpcpassword=rt" >> $CONF
+ echo "rpcwait=1" >> $CONF
+ shift
+ while (( "$#" )); do
+ echo $1 >> $CONF
+ shift
+ done
+}
+
+# "Spenders" 1/2/3
+D1=${D}/node1
+CreateConfDir $D1 port=11000 rpcport=11001 addnode=127.0.0.1:11030
+B1ARGS="-datadir=$D1"
+$BITCOIND $B1ARGS &
+B1PID=$!
+D2=${D}/node2
+CreateConfDir $D2 port=11010 rpcport=11011 addnode=127.0.0.1:11030
+B2ARGS="-datadir=$D2"
+$BITCOIND $B2ARGS &
+B2PID=$!
+D3=${D}/node3
+CreateConfDir $D3 port=11020 rpcport=11021 addnode=127.0.0.1:11030 addnode=127.0.0.1:11000
+B3ARGS="-datadir=$D3"
+$BITCOIND $BITCOINDARGS $B3ARGS &
+B3PID=$!
+
+# Wait until all nodes are at the same block number
+function WaitBlocks {
+ while :
+ do
+ sleep 1
+ BLOCKS1=$( GetBlocks "$B1ARGS" )
+ BLOCKS2=$( GetBlocks "$B2ARGS" )
+ BLOCKS3=$( GetBlocks "$B3ARGS" )
+ BLOCKS4=$( GetBlocks "$B4ARGS" )
+ if (( BLOCKS1 == BLOCKS4 && BLOCKS2 == BLOCKS4 && BLOCKS3 == BLOCKS4 ))
+ then
+ break
+ fi
+ done
+}
+
+# Wait until all nodes have the same txns in
+# their memory pools
+function WaitMemPools {
+ while :
+ do
+ sleep 1
+ MEMPOOL1=$( $CLI "$B1ARGS" getrawmempool | sort | shasum )
+ MEMPOOL2=$( $CLI "$B2ARGS" getrawmempool | sort | shasum )
+ MEMPOOL3=$( $CLI "$B3ARGS" getrawmempool | sort | shasum )
+ MEMPOOL4=$( $CLI "$B4ARGS" getrawmempool | sort | shasum )
+ if [[ $MEMPOOL1 = $MEMPOOL4 && $MEMPOOL2 = $MEMPOOL4 && $MEMPOOL3 = $MEMPOOL4 ]]
+ then
+ break
+ fi
+ done
+}
+
+echo "Generating initial blockchain..."
+
+# 1 block, 50 XBT each == 50 BTC
+$CLI $B1ARGS setgenerate true 1
+WaitBlocks
+$CLI $B2ARGS setgenerate true 1
+WaitBlocks
+$CLI $B3ARGS setgenerate true 1
+WaitBlocks
+
+# 100 blocks, 0 mature
+$CLI $B4ARGS setgenerate true 100
+WaitBlocks
+
+CheckBalance "$B1ARGS" 50
+CheckBalance "$B2ARGS" 50
+CheckBalance "$B3ARGS" 50
+CheckBalance "$B4ARGS" 0
+
+echo "Creating transactions..."
+
+function S {
+ TXID=$( $CLI -datadir=${D}/node${1} sendtoaddress ${2} "${3}" 0 )
+ if [[ $TXID == "" ]] ; then
+ echoerr "node${1}: error sending ${3} btc"
+ echo -n "node${1} balance: "
+ $CLI -datadir=${D}/node${1} getbalance "*" 0
+ exit 1
+ fi
+}
+
+function OneRound {
+ A1=$( $CLI $B1ARGS getnewaddress )
+ A2=$( $CLI $B2ARGS getnewaddress )
+ A3=$( $CLI $B3ARGS getnewaddress )
+ if [[ $(( $RANDOM%2 )) < 1 ]] ; then
+ N=$(( $RANDOM % 9 + 1 ))
+ S 1 $A2 "0.$N"
+ fi
+ if [[ $(( $RANDOM%2 )) < 1 ]] ; then
+ N=$(( $RANDOM % 9 + 1 ))
+ S 1 $A3 "0.0$N"
+ fi
+ if [[ $(( $RANDOM%2 )) < 1 ]] ; then
+ N=$(( $RANDOM % 9 + 1 ))
+ S 2 $A1 "0.$N"
+ fi
+ if [[ $(( $RANDOM%2 )) < 1 ]] ; then
+ N=$(( $RANDOM % 9 + 1 ))
+ S 2 $A3 "0.$N"
+ fi
+ if [[ $(( $RANDOM%2 )) < 1 ]] ; then
+ N=$(( $RANDOM % 9 + 1 ))
+ S 3 $A1 "0.$N"
+ fi
+ if [[ $(( $RANDOM%2 )) < 1 ]] ; then
+ N=$(( $RANDOM % 9 + 1 ))
+ S 3 $A2 "0.0$N"
+ fi
+ $CLI "$B4ARGS" setgenerate true 1
+}
+
+for i in {1..5}; do OneRound ; done
+
+echo "Backing up..."
+
+$CLI "$B1ARGS" backupwallet "$D1/wallet.bak"
+$CLI "$B1ARGS" dumpwallet "$D1/wallet.dump"
+$CLI "$B2ARGS" backupwallet "$D2/wallet.bak"
+$CLI "$B2ARGS" dumpwallet "$D2/wallet.dump"
+$CLI "$B3ARGS" backupwallet "$D3/wallet.bak"
+$CLI "$B3ARGS" dumpwallet "$D3/wallet.dump"
+
+echo "More transactions..."
+for i in {1..5}; do OneRound ; done
+
+WaitMemPools
+
+# Generate 101 more blocks, so any fees paid
+# mature
+$CLI "$B4ARGS" setgenerate true 101
+
+BALANCE1=$( $CLI "$B1ARGS" getbalance )
+BALANCE2=$( $CLI "$B2ARGS" getbalance )
+BALANCE3=$( $CLI "$B3ARGS" getbalance )
+BALANCE4=$( $CLI "$B4ARGS" getbalance )
+
+TOTAL=$( dc -e "$BALANCE1 $BALANCE2 $BALANCE3 $BALANCE4 + + + p" )
+
+AssertEqual $TOTAL 5700.00000000
+
+function StopThree {
+ $CLI $B1ARGS stop > /dev/null 2>&1
+ $CLI $B2ARGS stop > /dev/null 2>&1
+ $CLI $B3ARGS stop > /dev/null 2>&1
+ wait $B1PID
+ wait $B2PID
+ wait $B3PID
+}
+function EraseThree {
+ rm $D1/regtest/wallet.dat
+ rm $D2/regtest/wallet.dat
+ rm $D3/regtest/wallet.dat
+}
+function StartThree {
+ $BITCOIND $BITCOINDARGS $B1ARGS &
+ B1PID=$!
+ $BITCOIND $BITCOINDARGS $B2ARGS &
+ B2PID=$!
+ $BITCOIND $BITCOINDARGS $B3ARGS &
+ B3PID=$!
+}
+
+echo "Restoring using wallet.dat"
+
+StopThree
+EraseThree
+
+# Start node3 with no chain
+rm -rf $D3/regtest/blocks
+rm -rf $D3/regtest/chainstate
+rm -rf $D3/regtest/database
+
+cp $D1/wallet.bak $D1/regtest/wallet.dat
+cp $D2/wallet.bak $D2/regtest/wallet.dat
+cp $D3/wallet.bak $D3/regtest/wallet.dat
+
+StartThree
+WaitBlocks
+
+AssertEqual $BALANCE1 $( $CLI "$B1ARGS" getbalance )
+AssertEqual $BALANCE2 $( $CLI "$B2ARGS" getbalance )
+AssertEqual $BALANCE3 $( $CLI "$B3ARGS" getbalance )
+
+echo "Restoring using dumped wallet"
+
+StopThree
+EraseThree
+
+# Start node3 with no chain
+rm -rf $D3/regtest/blocks
+rm -rf $D3/regtest/chainstate
+rm -rf $D3/regtest/database
+
+StartThree
+
+AssertEqual 0 $( $CLI "$B1ARGS" getbalance )
+AssertEqual 0 $( $CLI "$B2ARGS" getbalance )
+AssertEqual 0 $( $CLI "$B3ARGS" getbalance )
+
+$CLI "$B1ARGS" importwallet $D1/wallet.dump
+$CLI "$B2ARGS" importwallet $D2/wallet.dump
+$CLI "$B3ARGS" importwallet $D3/wallet.dump
+
+WaitBlocks
+
+AssertEqual $BALANCE1 $( $CLI "$B1ARGS" getbalance )
+AssertEqual $BALANCE2 $( $CLI "$B2ARGS" getbalance )
+AssertEqual $BALANCE3 $( $CLI "$B3ARGS" getbalance )
+
+StopThree
+$CLI $B4ARGS stop > /dev/null 2>&1
+wait $B4PID
+
+echo "Tests successful, cleaning up"
+trap "" EXIT
+rm -rf $D
+exit 0
diff --git a/share/genbuild.sh b/share/genbuild.sh
index edb847a242..afa4b4ccb9 100755
--- a/share/genbuild.sh
+++ b/share/genbuild.sh
@@ -13,8 +13,8 @@ else
exit 1
fi
-TIME=$(date '+%F %T %z')
-
+DESC=""
+LAST_COMMIT_DATE=""
if [ -e "$(which git)" -a -d ".git" ]; then
# clean 'dirty' status of touched files that haven't been modified
git diff >/dev/null 2>/dev/null
@@ -23,7 +23,7 @@ if [ -e "$(which git)" -a -d ".git" ]; then
DESC="$(git describe --dirty 2>/dev/null)"
# get a string like "2012-04-10 16:27:19 +0200"
- TIME="$(git log -n 1 --format="%ci")"
+ LAST_COMMIT_DATE="$(git log -n 1 --format="%ci")"
fi
if [ -n "$DESC" ]; then
@@ -35,5 +35,7 @@ fi
# only update build.h if necessary
if [ "$INFO" != "$NEWINFO" ]; then
echo "$NEWINFO" >"$FILE"
- echo "#define BUILD_DATE \"$TIME\"" >>"$FILE"
+ if [ -n "$LAST_COMMIT_DATE" ]; then
+ echo "#define BUILD_DATE \"$LAST_COMMIT_DATE\"" >> "$FILE"
+ fi
fi
diff --git a/share/setup.nsi.in b/share/setup.nsi.in
index dd37862382..6c0e895bb1 100644
--- a/share/setup.nsi.in
+++ b/share/setup.nsi.in
@@ -1,4 +1,4 @@
-Name @PACKAGE_NAME@
+Name "@PACKAGE_NAME@ (@WINDOWS_BITS@-bit)"
RequestExecutionLevel highest
SetCompressor /SOLID lzma
@@ -6,7 +6,7 @@ SetCompressor /SOLID lzma
# General Symbol Definitions
!define REGKEY "SOFTWARE\$(^Name)"
!define VERSION @CLIENT_VERSION_MAJOR@.@CLIENT_VERSION_MINOR@.@CLIENT_VERSION_REVISION@
-!define COMPANY "Bitcoin project"
+!define COMPANY "Bitcoin Core project"
!define URL http://www.bitcoin.org/
# MUI Symbol Definitions
@@ -19,7 +19,7 @@ SetCompressor /SOLID lzma
!define MUI_STARTMENUPAGE_REGISTRY_ROOT HKLM
!define MUI_STARTMENUPAGE_REGISTRY_KEY ${REGKEY}
!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME StartMenuGroup
-!define MUI_STARTMENUPAGE_DEFAULTFOLDER @PACKAGE_NAME@
+!define MUI_STARTMENUPAGE_DEFAULTFOLDER "@PACKAGE_NAME@"
!define MUI_FINISHPAGE_RUN $INSTDIR\bitcoin-qt.exe
!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall.ico"
!define MUI_UNWELCOMEFINISHPAGE_BITMAP "@abs_top_srcdir@/share/pixmaps/nsis-wizard.bmp"
@@ -28,6 +28,9 @@ SetCompressor /SOLID lzma
# Included files
!include Sections.nsh
!include MUI2.nsh
+!if "@WINDOWS_BITS@" == "64"
+!include x64.nsh
+!endif
# Variables
Var StartMenuGroup
@@ -45,14 +48,18 @@ Var StartMenuGroup
!insertmacro MUI_LANGUAGE English
# Installer attributes
-OutFile @abs_top_srcdir@/bitcoin-${VERSION}-win32-setup.exe
+OutFile @abs_top_srcdir@/bitcoin-${VERSION}-win@WINDOWS_BITS@-setup.exe
+!if "@WINDOWS_BITS@" == "64"
+InstallDir $PROGRAMFILES64\Bitcoin
+!else
InstallDir $PROGRAMFILES\Bitcoin
+!endif
CRCCheck on
XPStyle on
BrandingText " "
ShowInstDetails show
VIProductVersion ${VERSION}.@CLIENT_VERSION_BUILD@
-VIAddVersionKey ProductName Bitcoin
+VIAddVersionKey ProductName "Bitcoin Core"
VIAddVersionKey ProductVersion "${VERSION}"
VIAddVersionKey CompanyName "${COMPANY}"
VIAddVersionKey CompanyWebsite "${URL}"
@@ -71,8 +78,9 @@ Section -Main SEC0000
File /oname=readme.txt @abs_top_srcdir@/doc/README_windows.txt
SetOutPath $INSTDIR\daemon
File @abs_top_srcdir@/release/bitcoind.exe
- SetOutPath $INSTDIR\src
- File /r @abs_top_srcdir@/@PACKAGE@-@VERSION@/src\*.*
+ File @abs_top_srcdir@/release/bitcoin-cli.exe
+ SetOutPath $INSTDIR\doc
+ File /r @abs_top_srcdir@/doc\*.*
SetOutPath $INSTDIR
WriteRegStr HKCU "${REGKEY}\Components" Main 1
@@ -87,8 +95,8 @@ Section -post SEC0001
WriteUninstaller $INSTDIR\uninstall.exe
!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
CreateDirectory $SMPROGRAMS\$StartMenuGroup
- CreateShortcut "$SMPROGRAMS\$StartMenuGroup\Bitcoin.lnk" $INSTDIR\bitcoin-qt.exe
- CreateShortcut "$SMPROGRAMS\$StartMenuGroup\Uninstall Bitcoin.lnk" $INSTDIR\uninstall.exe
+ CreateShortcut "$SMPROGRAMS\$StartMenuGroup\$(^Name).lnk" $INSTDIR\bitcoin-qt.exe
+ CreateShortcut "$SMPROGRAMS\$StartMenuGroup\Uninstall $(^Name).lnk" $INSTDIR\uninstall.exe
!insertmacro MUI_STARTMENU_WRITE_END
WriteRegStr HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayName "$(^Name)"
WriteRegStr HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)" DisplayVersion "${VERSION}"
@@ -123,14 +131,14 @@ Section /o -un.Main UNSEC0000
Delete /REBOOTOK $INSTDIR\COPYING.txt
Delete /REBOOTOK $INSTDIR\readme.txt
RMDir /r /REBOOTOK $INSTDIR\daemon
- RMDir /r /REBOOTOK $INSTDIR\src
+ RMDir /r /REBOOTOK $INSTDIR\doc
DeleteRegValue HKCU "${REGKEY}\Components" Main
SectionEnd
Section -un.post UNSEC0001
DeleteRegKey HKCU "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$(^Name)"
- Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\Uninstall Bitcoin.lnk"
- Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\Bitcoin.lnk"
+ Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\Uninstall $(^Name).lnk"
+ Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\$(^Name).lnk"
Delete /REBOOTOK "$SMSTARTUP\Bitcoin.lnk"
Delete /REBOOTOK $INSTDIR\uninstall.exe
Delete /REBOOTOK $INSTDIR\debug.log
@@ -152,6 +160,15 @@ SectionEnd
# Installer functions
Function .onInit
InitPluginsDir
+!if "@WINDOWS_BITS@" == "64"
+ ${If} ${RunningX64}
+ ; disable registry redirection (enable access to 64-bit portion of registry)
+ SetRegView 64
+ ${Else}
+ MessageBox MB_OK|MB_ICONSTOP "Cannot install 64-bit version on a 32-bit system."
+ Abort
+ ${EndIf}
+!endif
FunctionEnd
# Uninstaller functions
diff --git a/src/Makefile.am b/src/Makefile.am
index 9917be2481..da842a9e6f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,6 @@
include Makefile.include
-AM_CPPFLAGS += -I$(top_srcdir)/src/leveldb/helpers/memenv \
- -I$(builddir)
+AM_CPPFLAGS += -I$(builddir)
noinst_LIBRARIES = \
libbitcoin_server.a \
@@ -11,7 +10,15 @@ if ENABLE_WALLET
noinst_LIBRARIES += libbitcoin_wallet.a
endif
-bin_PROGRAMS = bitcoind bitcoin-cli
+bin_PROGRAMS =
+
+if BUILD_BITCOIND
+ bin_PROGRAMS += bitcoind
+endif
+
+if BUILD_BITCOIN_CLI
+ bin_PROGRAMS += bitcoin-cli
+endif
SUBDIRS = . $(BUILD_QT) $(BUILD_TEST)
DIST_SUBDIRS = . qt test
@@ -53,6 +60,7 @@ BITCOIN_CORE_H = \
serialize.h \
sync.h \
threadsafety.h \
+ tinyformat.h \
txdb.h \
txmempool.h \
ui_interface.h \
@@ -140,8 +148,8 @@ bitcoind_LDADD = \
libbitcoin_server.a \
libbitcoin_cli.a \
libbitcoin_common.a \
- leveldb/libleveldb.a \
- leveldb/libmemenv.a
+ $(LIBLEVELDB) \
+ $(LIBMEMENV)
if ENABLE_WALLET
bitcoind_LDADD += libbitcoin_wallet.a
endif
@@ -167,6 +175,7 @@ if TARGET_WINDOWS
bitcoin_cli_SOURCES += bitcoin-cli-res.rc
endif
+# NOTE: This dependency is not strictly necessary, but without it make may try to build both in parallel, which breaks the LevelDB build system in a race
leveldb/libleveldb.a: leveldb/libmemenv.a
leveldb/%.a:
diff --git a/src/Makefile.include b/src/Makefile.include
index b9e6c262ca..01b47d1aa0 100644
--- a/src/Makefile.include
+++ b/src/Makefile.include
@@ -1,23 +1,30 @@
+if EMBEDDED_LEVELDB
+LEVELDB_CPPFLAGS += -I$(top_srcdir)/src/leveldb/include
+LEVELDB_CPPFLAGS += -I$(top_srcdir)/src/leveldb/helpers/memenv
+LIBLEVELDB += $(top_builddir)/src/leveldb/libleveldb.a
+LIBMEMENV += $(top_builddir)/src/leveldb/libmemenv.a
+endif
+
AM_CPPFLAGS = $(INCLUDES) \
-I$(top_builddir)/src/obj \
- -I$(top_srcdir)/src/leveldb/include \
$(BDB_CPPFLAGS) \
- $(BOOST_INCLUDES)
+ $(BOOST_CPPFLAGS) $(BOOST_INCLUDES)
+AM_CPPFLAGS += $(LEVELDB_CPPFLAGS)
AM_LDFLAGS = $(PTHREAD_CFLAGS)
LIBBITCOIN_SERVER=$(top_builddir)/src/libbitcoin_server.a
LIBBITCOIN_WALLET=$(top_builddir)/src/libbitcoin_wallet.a
LIBBITCOIN_COMMON=$(top_builddir)/src/libbitcoin_common.a
LIBBITCOIN_CLI=$(top_builddir)/src/libbitcoin_cli.a
-LIBLEVELDB=$(top_builddir)/src/leveldb/libleveldb.a
-LIBMEMENV=$(top_builddir)/src/leveldb/libmemenv.a
LIBBITCOINQT=$(top_builddir)/src/qt/libbitcoinqt.a
$(LIBBITCOIN):
$(MAKE) -C $(top_builddir)/src $(@F)
+if EMBEDDED_LEVELDB
$(LIBLEVELDB) $(LIBMEMENV):
$(MAKE) -C $(top_builddir)/src leveldb/$(@F)
+endif
$(LIBBITCOINQT):
$(MAKE) -C $(top_builddir)/src/qt $(@F)
diff --git a/src/addrman.cpp b/src/addrman.cpp
index 46b4a94938..3628af2eab 100644
--- a/src/addrman.cpp
+++ b/src/addrman.cpp
@@ -304,7 +304,7 @@ void CAddrMan::Good_(const CService &addr, int64_t nTime)
// TODO: maybe re-add the node, but for now, just bail out
if (nUBucket == -1) return;
- LogPrint("addrman", "Moving %s to tried\n", addr.ToString().c_str());
+ LogPrint("addrman", "Moving %s to tried\n", addr.ToString());
// move nId to the tried tables
MakeTried(info, nId, nUBucket);
diff --git a/src/alert.cpp b/src/alert.cpp
index 7c9e54ef8b..4429ecadce 100644
--- a/src/alert.cpp
+++ b/src/alert.cpp
@@ -1,5 +1,5 @@
// Copyright (c) 2010 Satoshi Nakamoto
-// Copyright (c) 2009-2013 The Bitcoin developers
+// Copyright (c) 2009-2014 The Bitcoin developers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
@@ -11,7 +11,6 @@
#include "util.h"
#include <algorithm>
-#include <inttypes.h>
#include <map>
#include <boost/algorithm/string/classification.hpp>
@@ -69,18 +68,18 @@ std::string CUnsignedAlert::ToString() const
nExpiration,
nID,
nCancel,
- strSetCancel.c_str(),
+ strSetCancel,
nMinVer,
nMaxVer,
- strSetSubVer.c_str(),
+ strSetSubVer,
nPriority,
- strComment.c_str(),
- strStatusBar.c_str());
+ strComment,
+ strStatusBar);
}
void CUnsignedAlert::print() const
{
- LogPrintf("%s", ToString().c_str());
+ LogPrintf("%s", ToString());
}
void CAlert::SetNull()
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index d3d6b98d80..5e6566a7ac 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -1,5 +1,5 @@
// Copyright (c) 2010 Satoshi Nakamoto
-// Copyright (c) 2009-2013 The Bitcoin developers
+// Copyright (c) 2009-2014 The Bitcoin developers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
@@ -20,81 +20,81 @@ using namespace boost::assign;
unsigned int pnSeed[] =
{
- 0xe473042e, 0xb177f2ad, 0xd63f3fb2, 0xf864f736, 0x44a23ac7, 0xcf6d9650, 0xd648042e, 0x0536f447,
- 0x3c654ed0, 0x3e16a5bc, 0xa38e09b0, 0xdfae795b, 0xabfeca5b, 0x94ad7840, 0xf3b9f1c7, 0xbe70e0ad,
- 0x3bbd09b0, 0x8d0c7dd5, 0x3b2a7332, 0x1a06175e, 0x581f175e, 0xca0d2dcc, 0x0fdbc658, 0xcf591ec7,
- 0x295a12b2, 0xb4707bce, 0x68bb09b0, 0x4e735747, 0x89709553, 0x05a7814e, 0x5b8ec658, 0x402c5512,
- 0xe80d0905, 0x17681a5e, 0xc02aa748, 0x9f811741, 0x5f321cb0, 0x23e1ee47, 0xaf7f170c, 0xaa240ab0,
- 0xedea6257, 0x76106bc1, 0x2cf310cc, 0x08612acb, 0x9c682e4e, 0x8e963c6c, 0x443c795b, 0x22e246b8,
- 0xfa1f2dcc, 0x90118140, 0x3821042e, 0x33c3fd2e, 0x10046d5b, 0x40d14b3e, 0x7fb8f8ce, 0x67696550,
- 0xeeecbe58, 0x4f341745, 0x46b8fbd5, 0xc8463932, 0x6b73e862, 0x4c715932, 0x4a6785d5, 0xce3a64c2,
- 0xde9604c7, 0x9b06884f, 0x18002a45, 0xea9bc345, 0xc4f1c658, 0xe475c1c7, 0xdd3e795b, 0x9722175e,
- 0x34562f4e, 0x66c46e4e, 0x40bb1243, 0x7d9171d0, 0x17b8dbd5, 0x63cbfd2e, 0x1a08b8d8, 0x6175a73b,
- 0x228d2660, 0x8627c658, 0x9c566644, 0x38cca5bc, 0x3089de5b, 0x92e25f5d, 0xa393f73f, 0xcc92dc3e,
- 0x27487446, 0x62cbfd2e, 0x9d983b45, 0xf72a09b0, 0xf75f042e, 0x6434bb6a, 0xb29e77d8, 0x19be4fd9,
- 0x76443243, 0x9dd72645, 0x694cef43, 0x89c2efd5, 0x5f1c5058, 0x46c6e45b, 0xe1391b40, 0x77ccefd5,
- 0x472e5a6d, 0x85709553, 0xdd4f5d4c, 0x64ef5a46, 0x7f0ae502, 0xcf08d850, 0x3460042e, 0xeafa2d42,
- 0x793c9044, 0x9d094746, 0x1ab9b153, 0xbfe9a5bc, 0x34771fb0, 0xb7722e32, 0x1168964b, 0x19b06ab8,
- 0x19243b25, 0x13188045, 0xb4070905, 0x728ebb5d, 0x44f24ac8, 0xa317fead, 0x642f6a57, 0x3d951f32,
- 0x3d312e4e, 0xfac4d048, 0xefc4dd50, 0x52b9f1c7, 0xc14d3cc3, 0x0219ea44, 0x3b79d058, 0xfa217242,
- 0x39c80647, 0xfb697252, 0x1d495a42, 0x0aa81f4e, 0x58249ab8, 0xe6a8e6c3, 0x2bc4dad8, 0x85963c6c,
- 0xa4ce09b0, 0x2005f536, 0x5cc2703e, 0x1992de43, 0x74e86b4c, 0xe7085653, 0xf5e15a51, 0xb4872b60,
- 0x29e2b162, 0xa07ea053, 0x8229fd18, 0x4562ec4d, 0x8dec814e, 0x36cfa4cf, 0x96461032, 0x3c8770de,
- 0xd10a1f5f, 0x95934641, 0x97cd65d0, 0x2e35324a, 0x2566ba1f, 0x1ca1a9d1, 0xb808b8d5, 0xf9a24a5d,
- 0xafc8d431, 0xe4b8d9b2, 0x0f5321b2, 0x330bc658, 0x74b347ce, 0x972babd5, 0x044f7d4f, 0x06562f4e,
- 0x8b8d3c6c, 0x3507c658, 0xe4174e4d, 0xf1c009b0, 0x52249ab8, 0x27211772, 0xf6a9ba59, 0x7a391b40,
- 0x855dc6c0, 0x291f20b2, 0xe29bc345, 0x90963c6c, 0x0af70732, 0x4242a91f, 0x4c531d48, 0xa32df948,
- 0x627e3044, 0x65be1f54, 0x1a0cbf83, 0x6a443532, 0x8d5f1955, 0xbafa8132, 0x3534bdd5, 0xca019dd9,
- 0x8a0d9332, 0x5584e7d8, 0x7cd1f25e, 0xeabe3fb2, 0x2945d0d1, 0x46415718, 0x70d6042e, 0x99eb76d0,
- 0x9ece09b0, 0xb3777418, 0x5e5e91d9, 0x237a3ab0, 0xf512b62e, 0x45dec347, 0x59b7f862, 0x4c443b25,
- 0x3cc6484b, 0x9a8ec6d1, 0x021eea44, 0xc9483944, 0xfd567e32, 0xfd204bb2, 0xc5330bcc, 0x5202894e,
- 0xf9e309b0, 0x4cc17557, 0xdb9064ae, 0xe19e77d8, 0x25857f60, 0xeb4a15ad, 0x1f47f554, 0xea4472d9,
- 0xd20de593, 0xf5733b25, 0x11892b54, 0x5729d35f, 0xe6188cd1, 0x488b132e, 0x541c534a, 0xa8e854ae,
- 0xa255a66c, 0x33688763, 0xc6629ac6, 0xc20a6265, 0xcd92a059, 0x72029d3b, 0x4c298f5e, 0x51452e4e,
- 0xbb065058, 0x15fd2dcc, 0xf40c135e, 0x615a0bad, 0x0c6a6805, 0x4971a7ad, 0x17f2a5d5, 0xf8babf47,
- 0xb61f50ad, 0x4e1451b1, 0xf72d9252, 0x5c2abe58, 0xbd987c61, 0x084ae5cf, 0x20781fb0, 0x38b0f160,
- 0x18aac705, 0x14f86dc1, 0x5556f481, 0x0a36c144, 0xeb446e4c, 0x2c1c0d6c, 0xbd0ff860, 0x869f92db,
- 0x36c94f4c, 0x05502444, 0x148fe55b, 0xd5301e59, 0xd57a8f45, 0x110dc04a, 0x8670fc36, 0xee733b25,
- 0xca56f481, 0x2a5c3bae, 0x844b0905, 0x1e51fe53, 0x0241c244, 0x59c0614e, 0x94e70a55, 0x7312fead,
- 0xb735be44, 0xa55d0905, 0x2f63962e, 0x14a4e15b, 0x63f8f05c, 0x62d0d262, 0x3cab41ad, 0x87f1b1cb,
- 0x018da6b8, 0xb3967dd5, 0xcb56f481, 0x685ad718, 0x3b4aeeca, 0x8d106bc1, 0x51180905, 0x72660f48,
- 0x1521a243, 0x5b56f481, 0x6390e560, 0xdd61464e, 0x58353b25, 0x553fc062, 0x27c45d59, 0xacc62e4e,
- 0x0d5a1cd9, 0x7f65f442, 0xbdeef660, 0xf1bd1855, 0xf8473cae, 0x13b120b2, 0x442440d0, 0x53fd4352,
- 0xa305fc57, 0x458be84d, 0x639ce1c3, 0xebaaee47, 0x95e2c247, 0xf056f481, 0x6256f481, 0x1d87c65e,
- 0x0a453418, 0x5beb175e, 0xd64f1618, 0xc360795b, 0x2fbf5753, 0xa8c58e53, 0x651cec52, 0x9d37b043,
- 0x124a9758, 0x5242e4a9, 0x89913c6c, 0x880efe2e, 0x2f2f2f0c, 0x72b26751, 0x2896e46d, 0x80f4166c,
- 0x320d59ad, 0xc50151d0, 0x11a8aa43, 0xccf56057, 0x5fbad118, 0x4719b151, 0x2b5f4bc0, 0x4d7a4a50,
- 0xad06e047, 0x62ef5a46, 0x5aebde58, 0xdf7aa66c, 0x851acb50, 0x66b9a559, 0x3e9bb153, 0xcc512f2e,
- 0xc073b08e, 0xd519be58, 0xe981ea4d, 0x12fd50cb, 0x378739ad, 0x06683cae, 0xa22310b2, 0xc185c705,
- 0x8741b545, 0xa26c8318, 0x22d5bc43, 0x39201ec0, 0x68581e3e, 0xdc9bcf62, 0xd508cc82, 0xb149675b,
- 0x4c9609b0, 0x84feb84c, 0x08291e2e, 0xfd2253b2, 0x1fd269c1, 0xc9483932, 0x4d641fb0, 0x7d37c918,
- 0xa9de20ad, 0x77e2d655, 0x6d421b59, 0xd7668f80, 0xced09b62, 0xa9e5a5bc, 0xa4074e18, 0x60fc5ecc,
- 0x01300148, 0x68062444, 0xb4224847, 0xed3aa443, 0xb772fb43, 0x9f56f481, 0x220dfd18, 0x8e1c3d6c,
- 0xc44f09b0, 0x7df2bb73, 0xe22fb844, 0xea534242, 0xb6a755d4, 0xa036654b, 0x138ece5b, 0xda65d3c3,
- 0x955871bc, 0x792124b0, 0xfc82594c, 0x851d494b, 0x2c7aee47, 0x26af46b8, 0x1416252e, 0xa8abb944,
- 0x36c49d25, 0x674f645d, 0x363646b8, 0x9e1a2942, 0x66d0c154, 0xc6c2a545, 0x3570f2ad, 0xe7d547c7,
- 0x7d104932, 0x18cb9c18, 0x1dcfa4cf, 0xd156f481, 0x2a02b91f, 0x3eeb3fa8, 0xcac4175e, 0x34146d42,
- 0x994c4d46, 0x5666f440, 0x85d6713e, 0x5ecb296c, 0x0ea0ae46, 0x87e69f42, 0xc58409b0, 0x1f3436ae,
- 0x21dc6a57, 0x4ad1cd42, 0xfb8c1a4c, 0x52d3dab2, 0x3769894b, 0xb52f1c62, 0x3677916d, 0x82b3fe57,
- 0x493d4ac6, 0x9f963c6c, 0x5d91ff60, 0x458e0dad, 0xa49d0947, 0x491a3e18, 0x4aadcd5b, 0x0e46494b,
- 0x1d1610ad, 0x1a10af5d, 0x4956f481, 0x207a3eae, 0x77e73244, 0xfa3b8742, 0x3261fc36, 0xfcebf536,
- 0x1662e836, 0xf655f636, 0xa2dbd0ad, 0x23036693, 0x30448432, 0xa2b03463, 0x30730344, 0x8e4a6882,
- 0x0c50a1cb, 0xc8d8c06b, 0xc9cd6191, 0xf443db50, 0xa9553c50, 0x23145847, 0xc35da66c, 0x29c12a60,
- 0x55c2b447, 0x7434f75c, 0x61660640, 0xde2a7018, 0xc639494c, 0x1c306fce, 0x19b89244, 0xd29a6462,
- 0x462cd1b2, 0x29902f44, 0x2817fa53, 0x21a30905, 0x7777ae46, 0x288443a1, 0x7bee5148, 0xc2a8b043,
- 0xf5c3d35f, 0x2311ef84, 0x57de08a4, 0x6b221bb2, 0xf2625846, 0x4b9e09b0, 0xa24f880e, 0x22b11447,
- 0xb3a0c744, 0x919e77d8, 0xec8b64ae, 0xff5c8d45, 0x7b15b484, 0x32679a5f, 0xba80b62e, 0x05c25c61,
- 0x60014746, 0x5e8fb04c, 0xe67c0905, 0x4329c658, 0xac8fe555, 0xf875e647, 0x67406386, 0x35ceea18,
- 0xbb79484b, 0xd7b9fa62, 0x238209b0, 0x208a1d32, 0x9630995e, 0x039c1318, 0x6e48006c, 0x60582344,
- 0xadbb0150, 0x853fd462, 0x03772e4e, 0x652ce960, 0x49b630ad, 0x9993af43, 0x3735b34b, 0x548a07d9,
- 0x55a44aad, 0xa23d1bcc, 0xfdbb2f4e, 0x530b24a0, 0x0a44b451, 0x6827c657, 0x1f66494b, 0x4e680a47,
- 0x77e7b747, 0xa5eb3fa8, 0x6649764a, 0xd4e76c4b, 0x2c691fb0, 0xf1292e44, 0xc6d6c774, 0x85d23775,
- 0x28275f4d, 0x259ae46d, 0x02424e81, 0x5f16be58, 0xe707c658, 0x49eae5c7, 0xd5d147ad, 0x9a7abdc3,
- 0xe8ac7fc7, 0x84ec3aae, 0xc24942d0, 0x294aa318, 0x08ac3d18, 0x8894042e, 0xb24609b0, 0x9bcaab58,
- 0xc400f712, 0xd5c512b8, 0x2c02cc62, 0x25080fd8, 0xed74a847, 0x18a5ec5e, 0x9850ec6d, 0xf8909758,
- 0x7f56f481, 0x4496f23c, 0xae27784f, 0xcb7cd93e, 0x06e32860, 0x50b9a84f, 0x3660434a, 0x09161f5f,
- 0x900486bc, 0x08055459, 0xe7ec1017, 0x7e39494c, 0x4f443b25, 0x14751a8a, 0x717d03d4, 0xbd0e24d8,
- 0x054b6f56, 0x854c496c, 0xd92a454a, 0xc39bd054, 0x6093614b, 0x9dbad754, 0x5bf0604a, 0x99f22305
+ 0x7e6a692e, 0x7d04d1a2, 0x6c0c17d9, 0xdb330ab9, 0xc649c7c6, 0x7895484d, 0x047109b0, 0xb90ca5bc,
+ 0xd130805f, 0xbd074ea6, 0x578ff1c0, 0x286e09b0, 0xd4dcaf42, 0x529b6bb8, 0x635cc6c0, 0xedde892e,
+ 0xa976d9c7, 0xea91a4b8, 0x03fa4eb2, 0x6ca9008d, 0xaf62c825, 0x93f3ba51, 0xc2c9efd5, 0x0ed5175e,
+ 0x487028bc, 0x7297c225, 0x8af0c658, 0x2e57ba1f, 0xd0098abc, 0x46a8853e, 0xcc92dc3e, 0xeb6f1955,
+ 0x8cce175e, 0x237281ae, 0x9d42795b, 0x4f4f0905, 0xc50151d0, 0xb1ba90c6, 0xaed7175e, 0x204de55b,
+ 0x4bb03245, 0x932b28bc, 0x2dcce65b, 0xe2708abc, 0x1b08b8d5, 0x12a3dc5b, 0x8a884c90, 0xa386a8b8,
+ 0x18e417c6, 0x2e709ac3, 0xeb62e925, 0x6f6503ae, 0x05d0814e, 0x8a9ac545, 0x946fd65e, 0x3f57495d,
+ 0x4a29c658, 0xad454c90, 0x15340905, 0x4c3f3b25, 0x01fe19b9, 0x5620595b, 0x443c795b, 0x44f24ac8,
+ 0x0442464e, 0xc8665882, 0xed3f3ec3, 0xf585bf5d, 0x5dd141da, 0xf93a084e, 0x1264dd52, 0x0711c658,
+ 0xf12e7bbe, 0x5b02b740, 0x7d526dd5, 0x0cb04c90, 0x2abe1132, 0x61a39f58, 0x044a0618, 0xf3af7dce,
+ 0xb994c96d, 0x361c5058, 0xca735d53, 0xeca743b0, 0xec790905, 0xc4d37845, 0xa1c4a2b2, 0x726fd453,
+ 0x625cc6c0, 0x6c20132e, 0xb7aa0c79, 0xc6ed983d, 0x47e4cbc0, 0xa4ac75d4, 0xe2e59345, 0x4d784ad0,
+ 0x18a5ec5e, 0x481cc85b, 0x7c6c2fd5, 0x5e4d6018, 0x5b4b6c18, 0xd99b4c90, 0xe63987dc, 0xb817bb25,
+ 0x141cfeb2, 0x5f005058, 0x0d987f47, 0x242a496d, 0x3e519bc0, 0x02b2454b, 0xdfaf3dc6, 0x888128bc,
+ 0x1165bb25, 0xabfeca5b, 0x2ef63540, 0x5773c7c6, 0x1280dd52, 0x8ebcacd9, 0x81c439c6, 0x39fcfa45,
+ 0x62177d41, 0xc975ed62, 0x05cff476, 0xdabda743, 0xaa1ac24e, 0xe255a22e, 0x88aac705, 0xe707c658,
+ 0xa9e94b5e, 0x2893484b, 0x99512705, 0xd63970ca, 0x45994f32, 0xe519a8ad, 0x92e25f5d, 0x8b84a9c1,
+ 0x5eaa0a05, 0xa74de55b, 0xb090ff62, 0x5eee326c, 0xc331a679, 0xc1d9b72e, 0x0c6ab982, 0x7362bb25,
+ 0x4cfedd42, 0x1e09a032, 0xa4c34c5e, 0x3777d9c7, 0x5edcf260, 0x3ce2b548, 0xd2ac0360, 0x2f80b992,
+ 0x3e4cbb25, 0x3995e236, 0xd03977ae, 0x953cf054, 0x3c654ed0, 0x74024c90, 0xa14f1155, 0x14ce0125,
+ 0xc15ebb6a, 0x2c08c452, 0xc7fd0652, 0x7604f8ce, 0xffb38332, 0xa4c2efd5, 0xe9614018, 0xab49e557,
+ 0x1648c052, 0x36024047, 0x0e8cffad, 0x21918953, 0xb61f50ad, 0x9b406b59, 0xaf282218, 0x7f1d164e,
+ 0x1f560da2, 0xe237be58, 0xbdeb1955, 0x6c0717d9, 0xdaf8ce62, 0x0f74246c, 0xdee95243, 0xf23f1a56,
+ 0x61bdf867, 0xd254c854, 0xc4422e4e, 0xae0563c0, 0xbdb9a95f, 0xa9eb32c6, 0xd9943950, 0x116add52,
+ 0x73a54c90, 0xb36b525e, 0xd734175e, 0x333d7f76, 0x51431bc6, 0x084ae5cf, 0xa60a236c, 0x5c67692e,
+ 0x0177cf45, 0xa6683ac6, 0x7ff4ea47, 0x2192fab2, 0xa03a0f46, 0xfe3e39ae, 0x2cce5fc1, 0xc8a6c148,
+ 0x96fb7e4c, 0x0a66c752, 0x6b4d2705, 0xeba0c118, 0x3ba0795b, 0x1dccd23e, 0x6912f3a2, 0x22f23c41,
+ 0x65646b4a, 0x8b9f8705, 0xeb9b9a95, 0x79fe6b4e, 0x0536f447, 0x23224d61, 0x5d952ec6, 0x0cb4f736,
+ 0xdc14be6d, 0xb24609b0, 0xd3f79b62, 0x6518c836, 0x83a3cf42, 0x9b641fb0, 0x17fef1c0, 0xd508cc82,
+ 0x91a4369b, 0x39cb4a4c, 0xbbc9536c, 0xaf64c44a, 0x605eca50, 0x0c6a6805, 0xd07e9d4e, 0x78e6d3a2,
+ 0x1b31eb6d, 0xaa01feb2, 0x4603c236, 0x1ecba3b6, 0x0effe336, 0xc3fdcb36, 0xc290036f, 0x4464692e,
+ 0x1aca7589, 0x59a9e52e, 0x19aa7489, 0x2622c85e, 0xa598d318, 0x438ec345, 0xc79619b9, 0xaf570360,
+ 0x5098e289, 0x36add862, 0x83c1a2b2, 0x969d0905, 0xcf3d156c, 0x49c1a445, 0xbd0b7562, 0x8fff1955,
+ 0x1e51fe53, 0x28d6efd5, 0x2837cc62, 0x02f42d42, 0x070e3fb2, 0xbcb18705, 0x14a4e15b, 0x82096844,
+ 0xcfcb1c2e, 0x37e27fc7, 0x07923748, 0x0c14bc2e, 0x26100905, 0xcb7cd93e, 0x3bc0d2c0, 0x97131b4c,
+ 0x6f1e5c17, 0xa7939f43, 0xb7a0bf58, 0xafa83a47, 0xcbb83f32, 0x5f321cb0, 0x52d6c3c7, 0xdeac5bc7,
+ 0x2cf310cc, 0x108a2bc3, 0x726fa14f, 0x85bad2cc, 0x459e4c90, 0x1a08b8d8, 0xcd7048c6, 0x6d5b4c90,
+ 0xa66cfe7b, 0xad730905, 0xdaac5bc7, 0x8417fd9f, 0x41377432, 0x1f138632, 0x295a12b2, 0x7ac031b2,
+ 0x3a87d295, 0xe219bc2e, 0xf485d295, 0x137b6405, 0xcfffd9ad, 0xafe20844, 0x32679a5f, 0xa431c644,
+ 0x0e5fce8c, 0x305ef853, 0xad26ca32, 0xd9d21a54, 0xddd0d736, 0xc24ec0c7, 0x4aadcd5b, 0x49109852,
+ 0x9d6b3ac6, 0xf0aa1e8b, 0xf1bfa343, 0x8a30c0ad, 0x260f93d4, 0x2339e760, 0x8869959f, 0xc207216c,
+ 0x29453448, 0xb651ec36, 0x45496259, 0xa23d1bcc, 0xb39bcf43, 0xa1d29432, 0x3507c658, 0x4a88dd62,
+ 0x27aff363, 0x7498ea6d, 0x4a6785d5, 0x5e6d47c2, 0x3baba542, 0x045a37ae, 0xa24dc0c7, 0xe981ea4d,
+ 0xed6ce217, 0x857214c6, 0x6b6c0464, 0x5a4945b8, 0x12f24742, 0xf35f42ad, 0xfd0f5a4e, 0xfb081556,
+ 0xb24b5861, 0x2e114146, 0xb7780905, 0x33bb0e48, 0x39e26556, 0xa794484d, 0x4225424d, 0x3003795b,
+ 0x31c8cf44, 0xd65bad59, 0x127bc648, 0xf2bc4d4c, 0x0273dc50, 0x4572d736, 0x064bf653, 0xcdcd126c,
+ 0x608281ae, 0x4d130087, 0x1016f725, 0xba185fc0, 0x16c1a84f, 0xfb697252, 0xa2942360, 0x53083b6c,
+ 0x0583f1c0, 0x2d5a2441, 0xc172aa43, 0xcd11cf36, 0x7b14ed62, 0x5c94f1c0, 0x7c23132e, 0x39965a6f,
+ 0x7890e24e, 0xa38ec447, 0xc187f1c0, 0xef80b647, 0xf20a7432, 0x7ad1d8d2, 0x869e2ec6, 0xccdb5c5d,
+ 0x9d11f636, 0x2161bb25, 0x7599f889, 0x2265ecad, 0x0f4f0e55, 0x7d25854a, 0xf857e360, 0xf83f3d6c,
+ 0x9cc93bb8, 0x02716857, 0x5dd8a177, 0x8adc6cd4, 0xe5613d46, 0x6a734f50, 0x2a5c3bae, 0x4a04c3d1,
+ 0xe4613d46, 0x8426f4bc, 0x3e1b5fc0, 0x0d5a3c18, 0xd0f6d154, 0x21c7ff5e, 0xeb3f3d6c, 0x9da5edc0,
+ 0x5d753b81, 0x0d8d53d4, 0x2613f018, 0x4443698d, 0x8ca1edcd, 0x10ed3f4e, 0x789b403a, 0x7b984a4b,
+ 0x964ebc25, 0x7520ee60, 0x4f4828bc, 0x115c407d, 0x32dd0667, 0xa741715e, 0x1d3f3532, 0x817d1f56,
+ 0x2f99a552, 0x6b2a5956, 0x8d4f4f05, 0xd23c1e17, 0x98993748, 0x2c92e536, 0x237ebdc3, 0xa762fb43,
+ 0x32016b71, 0xd0e7cf79, 0x7d35bdd5, 0x53dac3d2, 0x31016b71, 0x7fb8f8ce, 0x9a38c232, 0xefaa42ad,
+ 0x876b823d, 0x18175347, 0xdb46597d, 0xd2c168da, 0xcd6fe9dc, 0x45272e4e, 0x8d4bca5b, 0xa4043d47,
+ 0xaab7aa47, 0x202881ae, 0xa4aef160, 0xecd7e6bc, 0x391359ad, 0xd8cc9318, 0xbbeee52e, 0x077067b0,
+ 0xebd39d62, 0x0cedc547, 0x23d3e15e, 0xa5a81318, 0x179a32c6, 0xe4d3483d, 0x03680905, 0xe8018abc,
+ 0xdde9ef5b, 0x438b8705, 0xb48224a0, 0xcbd69218, 0x9075795b, 0xc6411c3e, 0x03833f5c, 0xf33f8b5e,
+ 0x495e464b, 0x83c8e65b, 0xac09cd25, 0xdaabc547, 0x7665a553, 0xc5263718, 0x2fd0c5cd, 0x22224d61,
+ 0x3e954048, 0xfaa37557, 0x36dbc658, 0xa81453d0, 0x5a941f5d, 0xa598ea60, 0x65384ac6, 0x10aaa545,
+ 0xaaab795b, 0xdda7024c, 0x0966f4c6, 0x68571c08, 0x8b40ee59, 0x33ac096c, 0x844b4c4b, 0xd392254d,
+ 0xba4d5a46, 0x63029653, 0xf655f636, 0xbe4c4bb1, 0x45dad036, 0x204bc052, 0x06c3a2b2, 0xf31fba6a,
+ 0xb21f09b0, 0x540d0751, 0xc7b46a57, 0x6a11795b, 0x3d514045, 0x0318aa6d, 0x30306ec3, 0x5c077432,
+ 0x259ae46d, 0x82bbd35f, 0xae4222c0, 0x254415d4, 0xbd5f574b, 0xd8fd175e, 0x0a3f38c3, 0x2dce6bb8,
+ 0xc201d058, 0x17fca5bc, 0xe8453cca, 0xd361f636, 0xa0d9edc0, 0x2f232e4e, 0x134e116c, 0x61ddc058,
+ 0x05ba7283, 0xe1f7ed5b, 0x040ec452, 0x4b672e4e, 0xe4efa36d, 0x47dca52e, 0xe9332e4e, 0xa3acb992,
+ 0x24714c90, 0xa8cc8632, 0x26b1ce6d, 0x264e53d4, 0xd3d2718c, 0x225534ad, 0xe289f3a2, 0x87341717,
+ 0x9255ad4f, 0x184bbb25, 0x885c7abc, 0x3a6e9ac6, 0x1924185e, 0xb73d4c90, 0x946d807a, 0xa0d78e3f,
+ 0x5a16bb25, 0xcb09795b, 0x8d0de657, 0x630b8b25, 0xe572c6cf, 0x2b3f1118, 0x4242a91f, 0x32990905,
+ 0x058b0905, 0xe266fc60, 0xbe66c5b0, 0xcc98e46d, 0x698c943e, 0x44bd0cc3, 0x865c7abc, 0x771764d3,
+ 0x4675d655, 0x354e4826, 0xb67ac152, 0xaeccf285, 0xea625b4e, 0xbcd6031f, 0x5e81eb18, 0x74b347ce,
+ 0x3ca56ac1, 0x54ee4546, 0x38a8175e, 0xa3c21155, 0x2f01576d, 0x5d7ade50, 0xa003ae48, 0x2bc1d31f,
+ 0x13f5094c, 0x7ab32648, 0x542e9fd5, 0x53136bc1, 0x7fdf51c0, 0x802197b2, 0xa2d2cc5b, 0x6b5f4bc0,
};
class CMainParams : public CChainParams {
diff --git a/src/clientversion.h b/src/clientversion.h
index a06ceb7505..3c69e028b5 100644
--- a/src/clientversion.h
+++ b/src/clientversion.h
@@ -10,12 +10,12 @@
// These need to be macros, as version.cpp's and bitcoin-qt.rc's voodoo requires it
#define CLIENT_VERSION_MAJOR 0
-#define CLIENT_VERSION_MINOR 8
-#define CLIENT_VERSION_REVISION 99
+#define CLIENT_VERSION_MINOR 9
+#define CLIENT_VERSION_REVISION 0
#define CLIENT_VERSION_BUILD 0
// Set to true for release, false for prerelease or test build
-#define CLIENT_VERSION_IS_RELEASE false
+#define CLIENT_VERSION_IS_RELEASE true
// Copyright year (2009-this)
// Todo: update this when changing our copyright comments in the source
diff --git a/src/core.cpp b/src/core.cpp
index f41ea87fea..f5c460761e 100644
--- a/src/core.cpp
+++ b/src/core.cpp
@@ -1,5 +1,5 @@
// Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2013 The Bitcoin developers
+// Copyright (c) 2009-2014 The Bitcoin developers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
@@ -9,12 +9,12 @@
std::string COutPoint::ToString() const
{
- return strprintf("COutPoint(%s, %u)", hash.ToString().substr(0,10).c_str(), n);
+ return strprintf("COutPoint(%s, %u)", hash.ToString().substr(0,10), n);
}
void COutPoint::print() const
{
- LogPrintf("%s\n", ToString().c_str());
+ LogPrintf("%s\n", ToString());
}
CTxIn::CTxIn(COutPoint prevoutIn, CScript scriptSigIn, unsigned int nSequenceIn)
@@ -37,9 +37,9 @@ std::string CTxIn::ToString() const
str += "CTxIn(";
str += prevout.ToString();
if (prevout.IsNull())
- str += strprintf(", coinbase %s", HexStr(scriptSig).c_str());
+ str += strprintf(", coinbase %s", HexStr(scriptSig));
else
- str += strprintf(", scriptSig=%s", scriptSig.ToString().substr(0,24).c_str());
+ str += strprintf(", scriptSig=%s", scriptSig.ToString().substr(0,24));
if (nSequence != std::numeric_limits<unsigned int>::max())
str += strprintf(", nSequence=%u", nSequence);
str += ")";
@@ -48,7 +48,7 @@ std::string CTxIn::ToString() const
void CTxIn::print() const
{
- LogPrintf("%s\n", ToString().c_str());
+ LogPrintf("%s\n", ToString());
}
CTxOut::CTxOut(int64_t nValueIn, CScript scriptPubKeyIn)
@@ -64,12 +64,12 @@ uint256 CTxOut::GetHash() const
std::string CTxOut::ToString() const
{
- return strprintf("CTxOut(nValue=%"PRId64".%08"PRId64", scriptPubKey=%s)", nValue / COIN, nValue % COIN, scriptPubKey.ToString().substr(0,30).c_str());
+ return strprintf("CTxOut(nValue=%"PRId64".%08"PRId64", scriptPubKey=%s)", nValue / COIN, nValue % COIN, scriptPubKey.ToString().substr(0,30));
}
void CTxOut::print() const
{
- LogPrintf("%s\n", ToString().c_str());
+ LogPrintf("%s\n", ToString());
}
uint256 CTransaction::GetHash() const
@@ -141,7 +141,7 @@ std::string CTransaction::ToString() const
{
std::string str;
str += strprintf("CTransaction(hash=%s, ver=%d, vin.size=%"PRIszu", vout.size=%"PRIszu", nLockTime=%u)\n",
- GetHash().ToString().substr(0,10).c_str(),
+ GetHash().ToString().substr(0,10),
nVersion,
vin.size(),
vout.size(),
@@ -155,7 +155,7 @@ std::string CTransaction::ToString() const
void CTransaction::print() const
{
- LogPrintf("%s", ToString().c_str());
+ LogPrintf("%s", ToString());
}
// Amount compression:
@@ -270,10 +270,10 @@ uint256 CBlock::CheckMerkleBranch(uint256 hash, const std::vector<uint256>& vMer
void CBlock::print() const
{
LogPrintf("CBlock(hash=%s, ver=%d, hashPrevBlock=%s, hashMerkleRoot=%s, nTime=%u, nBits=%08x, nNonce=%u, vtx=%"PRIszu")\n",
- GetHash().ToString().c_str(),
+ GetHash().ToString(),
nVersion,
- hashPrevBlock.ToString().c_str(),
- hashMerkleRoot.ToString().c_str(),
+ hashPrevBlock.ToString(),
+ hashMerkleRoot.ToString(),
nTime, nBits, nNonce,
vtx.size());
for (unsigned int i = 0; i < vtx.size(); i++)
@@ -283,6 +283,6 @@ void CBlock::print() const
}
LogPrintf(" vMerkleTree: ");
for (unsigned int i = 0; i < vMerkleTree.size(); i++)
- LogPrintf("%s ", vMerkleTree[i].ToString().c_str());
+ LogPrintf("%s ", vMerkleTree[i].ToString());
LogPrintf("\n");
}
diff --git a/src/core.h b/src/core.h
index e61cad90ec..5eb953610d 100644
--- a/src/core.h
+++ b/src/core.h
@@ -156,8 +156,8 @@ public:
// to spend something, then we consider it dust.
// A typical txout is 34 bytes big, and will
// need a CTxIn of at least 148 bytes to spend,
- // so dust is a txout less than 54 uBTC
- // (5460 satoshis) with default nMinRelayTxFee
+ // so dust is a txout less than 546 satoshis
+ // with default nMinRelayTxFee.
return ((nValue*1000)/(3*((int)GetSerializeSize(SER_DISK,0)+148)) < nMinRelayTxFee);
}
diff --git a/src/db.cpp b/src/db.cpp
index 1f2ee1c554..591d4ed477 100644
--- a/src/db.cpp
+++ b/src/db.cpp
@@ -1,5 +1,5 @@
// Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2013 The Bitcoin developers
+// Copyright (c) 2009-2014 The Bitcoin developers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
@@ -10,7 +10,6 @@
#include "protocol.h"
#include "util.h"
-#include <inttypes.h>
#include <stdint.h>
#ifndef WIN32
@@ -75,7 +74,7 @@ bool CDBEnv::Open(const boost::filesystem::path& pathIn)
filesystem::path pathLogDir = path / "database";
filesystem::create_directory(pathLogDir);
filesystem::path pathErrorFile = path / "db.log";
- LogPrintf("dbenv.open LogDir=%s ErrorFile=%s\n", pathLogDir.string().c_str(), pathErrorFile.string().c_str());
+ LogPrintf("dbenv.open LogDir=%s ErrorFile=%s\n", pathLogDir.string(), pathErrorFile.string());
unsigned int nEnvFlags = 0;
if (GetBoolArg("-privdb", true))
@@ -353,7 +352,7 @@ bool CDB::Rewrite(const string& strFile, const char* pszSkip)
bitdb.mapFileUseCount.erase(strFile);
bool fSuccess = true;
- LogPrintf("Rewriting %s...\n", strFile.c_str());
+ LogPrintf("Rewriting %s...\n", strFile);
string strFileRes = strFile + ".rewrite";
{ // surround usage of db with extra {}
CDB db(strFile.c_str(), "r");
@@ -367,7 +366,7 @@ bool CDB::Rewrite(const string& strFile, const char* pszSkip)
0);
if (ret > 0)
{
- LogPrintf("Cannot create database file %s\n", strFileRes.c_str());
+ LogPrintf("Cannot create database file %s\n", strFileRes);
fSuccess = false;
}
@@ -423,7 +422,7 @@ bool CDB::Rewrite(const string& strFile, const char* pszSkip)
fSuccess = false;
}
if (!fSuccess)
- LogPrintf("Rewriting of %s FAILED!\n", strFileRes.c_str());
+ LogPrintf("Rewriting of %s FAILED!\n", strFileRes);
return fSuccess;
}
}
@@ -448,17 +447,17 @@ void CDBEnv::Flush(bool fShutdown)
{
string strFile = (*mi).first;
int nRefCount = (*mi).second;
- LogPrint("db", "%s refcount=%d\n", strFile.c_str(), nRefCount);
+ LogPrint("db", "%s refcount=%d\n", strFile, nRefCount);
if (nRefCount == 0)
{
// Move log data to the dat file
CloseDb(strFile);
- LogPrint("db", "%s checkpoint\n", strFile.c_str());
+ LogPrint("db", "%s checkpoint\n", strFile);
dbenv.txn_checkpoint(0, 0, 0);
- LogPrint("db", "%s detach\n", strFile.c_str());
+ LogPrint("db", "%s detach\n", strFile);
if (!fMockDb)
dbenv.lsn_reset(strFile.c_str(), 0);
- LogPrint("db", "%s closed\n", strFile.c_str());
+ LogPrint("db", "%s closed\n", strFile);
mapFileUseCount.erase(mi++);
}
else
diff --git a/src/init.cpp b/src/init.cpp
index 20279bf733..4cc04f5205 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1,5 +1,5 @@
// Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2013 The Bitcoin developers
+// Copyright (c) 2009-2014 The Bitcoin developers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
@@ -24,7 +24,6 @@
#include "walletdb.h"
#endif
-#include <inttypes.h>
#include <stdint.h>
#ifndef WIN32
@@ -196,7 +195,7 @@ std::string HelpMessage(HelpMessageMode hmm)
strUsage += " -testnet " + _("Use the test network") + "\n";
strUsage += " -pid=<file> " + _("Specify pid file (default: bitcoind.pid)") + "\n";
strUsage += " -gen " + _("Generate coins (default: 0)") + "\n";
- strUsage += " -dbcache=<n> " + _("Set database cache size in megabytes (default: 25)") + "\n";
+ strUsage += " -dbcache=<n> " + strprintf(_("Set database cache size in megabytes (%d to %d, default: %d)"), nMinDbCache, nMaxDbCache, nDefaultDbCache) + "\n";
strUsage += " -timeout=<n> " + _("Specify connection timeout in milliseconds (default: 5000)") + "\n";
strUsage += " -proxy=<ip:port> " + _("Connect through SOCKS proxy") + "\n";
strUsage += " -socks=<n> " + _("Select SOCKS version for -proxy (4 or 5, default: 5)") + "\n";
@@ -270,10 +269,12 @@ std::string HelpMessage(HelpMessageMode hmm)
strUsage += " -disablewallet " + _("Do not load the wallet and disable wallet RPC calls") + "\n";
strUsage += " -paytxfee=<amt> " + _("Fee per kB to add to transactions you send") + "\n";
strUsage += " -rescan " + _("Rescan the block chain for missing wallet transactions") + "\n";
+ strUsage += " -zapwallettxes " + _("Clear list of wallet transactions (diagnostic tool; implies -rescan)") + "\n";
strUsage += " -salvagewallet " + _("Attempt to recover private keys from a corrupt wallet.dat") + "\n";
strUsage += " -upgradewallet " + _("Upgrade wallet to latest format") + "\n";
strUsage += " -wallet=<file> " + _("Specify wallet file (within data directory)") + "\n";
strUsage += " -walletnotify=<cmd> " + _("Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)") + "\n";
+ strUsage += " -spendzeroconfchange " + _("Spend unconfirmed change when sending transactions (default: 1)") + "\n";
#endif
strUsage += "\n" + _("Block creation options:") + "\n";
strUsage += " -blockminsize=<n> " + _("Set minimum block size in bytes (default: 0)") + "\n";
@@ -336,6 +337,8 @@ void ThreadImport(std::vector<boost::filesystem::path> vImportFiles)
LogPrintf("Importing bootstrap.dat...\n");
LoadExternalBlockFile(file);
RenameOver(pathBootstrap, pathBootstrapOld);
+ } else {
+ LogPrintf("Warning: Could not open bootstrap file %s\n", pathBootstrap.string());
}
}
@@ -344,8 +347,10 @@ void ThreadImport(std::vector<boost::filesystem::path> vImportFiles)
FILE *file = fopen(path.string().c_str(), "rb");
if (file) {
CImportingNow imp;
- LogPrintf("Importing %s...\n", path.string().c_str());
+ LogPrintf("Importing blocks file %s...\n", path.string());
LoadExternalBlockFile(file);
+ } else {
+ LogPrintf("Warning: Could not open blocks file %s\n", path.string());
}
}
}
@@ -415,34 +420,48 @@ bool AppInit2(boost::thread_group& threadGroup)
if (mapArgs.count("-bind")) {
// when specifying an explicit binding address, you want to listen on it
// even when -connect or -proxy is specified
- SoftSetBoolArg("-listen", true);
+ if (SoftSetBoolArg("-listen", true))
+ LogPrintf("AppInit2 : parameter interaction: -bind set -> setting -listen=1\n");
}
if (mapArgs.count("-connect") && mapMultiArgs["-connect"].size() > 0) {
// when only connecting to trusted nodes, do not seed via DNS, or listen by default
- SoftSetBoolArg("-dnsseed", false);
- SoftSetBoolArg("-listen", false);
+ if (SoftSetBoolArg("-dnsseed", false))
+ LogPrintf("AppInit2 : parameter interaction: -connect set -> setting -dnsseed=0\n");
+ if (SoftSetBoolArg("-listen", false))
+ LogPrintf("AppInit2 : parameter interaction: -connect set -> setting -listen=0\n");
}
if (mapArgs.count("-proxy")) {
- // to protect privacy, do not listen by default if a proxy server is specified
- SoftSetBoolArg("-listen", false);
+ // to protect privacy, do not listen by default if a default proxy server is specified
+ if (SoftSetBoolArg("-listen", false))
+ LogPrintf("AppInit2 : parameter interaction: -proxy set -> setting -listen=0\n");
}
if (!GetBoolArg("-listen", true)) {
// do not map ports or try to retrieve public IP when not listening (pointless)
- SoftSetBoolArg("-upnp", false);
- SoftSetBoolArg("-discover", false);
+ if (SoftSetBoolArg("-upnp", false))
+ LogPrintf("AppInit2 : parameter interaction: -listen=0 -> setting -upnp=0\n");
+ if (SoftSetBoolArg("-discover", false))
+ LogPrintf("AppInit2 : parameter interaction: -listen=0 -> setting -discover=0\n");
}
if (mapArgs.count("-externalip")) {
// if an explicit public IP is specified, do not try to find others
- SoftSetBoolArg("-discover", false);
+ if (SoftSetBoolArg("-discover", false))
+ LogPrintf("AppInit2 : parameter interaction: -externalip set -> setting -discover=0\n");
}
if (GetBoolArg("-salvagewallet", false)) {
// Rewrite just private keys: rescan to find transactions
- SoftSetBoolArg("-rescan", true);
+ if (SoftSetBoolArg("-rescan", true))
+ LogPrintf("AppInit2 : parameter interaction: -salvagewallet=1 -> setting -rescan=1\n");
+ }
+
+ // -zapwallettx implies a rescan
+ if (GetBoolArg("-zapwallettxes", false)) {
+ if (SoftSetBoolArg("-rescan", true))
+ LogPrintf("AppInit2 : parameter interaction: -zapwallettxes=1 -> setting -rescan=1\n");
}
// Make sure enough file descriptors are available
@@ -512,7 +531,7 @@ bool AppInit2(boost::thread_group& threadGroup)
if (ParseMoney(mapArgs["-mintxfee"], n) && n > 0)
CTransaction::nMinTxFee = n;
else
- return InitError(strprintf(_("Invalid amount for -mintxfee=<amount>: '%s'"), mapArgs["-mintxfee"].c_str()));
+ return InitError(strprintf(_("Invalid amount for -mintxfee=<amount>: '%s'"), mapArgs["-mintxfee"]));
}
if (mapArgs.count("-minrelaytxfee"))
{
@@ -520,17 +539,18 @@ bool AppInit2(boost::thread_group& threadGroup)
if (ParseMoney(mapArgs["-minrelaytxfee"], n) && n > 0)
CTransaction::nMinRelayTxFee = n;
else
- return InitError(strprintf(_("Invalid amount for -minrelaytxfee=<amount>: '%s'"), mapArgs["-minrelaytxfee"].c_str()));
+ return InitError(strprintf(_("Invalid amount for -minrelaytxfee=<amount>: '%s'"), mapArgs["-minrelaytxfee"]));
}
#ifdef ENABLE_WALLET
if (mapArgs.count("-paytxfee"))
{
if (!ParseMoney(mapArgs["-paytxfee"], nTransactionFee))
- return InitError(strprintf(_("Invalid amount for -paytxfee=<amount>: '%s'"), mapArgs["-paytxfee"].c_str()));
+ return InitError(strprintf(_("Invalid amount for -paytxfee=<amount>: '%s'"), mapArgs["-paytxfee"]));
if (nTransactionFee > 0.25 * COIN)
InitWarning(_("Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction."));
}
+ bSpendZeroConfChange = GetArg("-spendzeroconfchange", true);
strWalletFile = GetArg("-wallet", "wallet.dat");
#endif
@@ -540,7 +560,7 @@ bool AppInit2(boost::thread_group& threadGroup)
#ifdef ENABLE_WALLET
// Wallet file must be a plain filename without a directory
if (strWalletFile != boost::filesystem::basename(strWalletFile) + boost::filesystem::extension(strWalletFile))
- return InitError(strprintf(_("Wallet %s resides outside data directory %s"), strWalletFile.c_str(), strDataDir.c_str()));
+ return InitError(strprintf(_("Wallet %s resides outside data directory %s"), strWalletFile, strDataDir));
#endif
// Make sure only a single Bitcoin process is using the data directory.
boost::filesystem::path pathLockFile = GetDataDir() / ".lock";
@@ -548,17 +568,17 @@ bool AppInit2(boost::thread_group& threadGroup)
if (file) fclose(file);
static boost::interprocess::file_lock lock(pathLockFile.string().c_str());
if (!lock.try_lock())
- return InitError(strprintf(_("Cannot obtain a lock on data directory %s. Bitcoin is probably already running."), strDataDir.c_str()));
+ return InitError(strprintf(_("Cannot obtain a lock on data directory %s. Bitcoin is probably already running."), strDataDir));
if (GetBoolArg("-shrinkdebugfile", !fDebug))
ShrinkDebugFile();
LogPrintf("\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n");
- LogPrintf("Bitcoin version %s (%s)\n", FormatFullVersion().c_str(), CLIENT_DATE.c_str());
+ LogPrintf("Bitcoin version %s (%s)\n", FormatFullVersion(), CLIENT_DATE);
LogPrintf("Using OpenSSL version %s\n", SSLeay_version(SSLEAY_VERSION));
if (!fLogTimestamps)
- LogPrintf("Startup time: %s\n", DateTimeStrFormat("%Y-%m-%d %H:%M:%S", GetTime()).c_str());
- LogPrintf("Default data directory %s\n", GetDefaultDataDir().string().c_str());
- LogPrintf("Using data directory %s\n", strDataDir.c_str());
+ LogPrintf("Startup time: %s\n", DateTimeStrFormat("%Y-%m-%d %H:%M:%S", GetTime()));
+ LogPrintf("Default data directory %s\n", GetDefaultDataDir().string());
+ LogPrintf("Using data directory %s\n", strDataDir);
LogPrintf("Using at most %i connections (%i file descriptors available)\n", nMaxConnections, nFD);
std::ostringstream strErrors;
@@ -582,7 +602,7 @@ bool AppInit2(boost::thread_group& threadGroup)
boost::filesystem::path pathDatabaseBak = GetDataDir() / strprintf("database.%"PRId64".bak", GetTime());
try {
boost::filesystem::rename(pathDatabase, pathDatabaseBak);
- LogPrintf("Moved old %s to %s. Retrying.\n", pathDatabase.string().c_str(), pathDatabaseBak.string().c_str());
+ LogPrintf("Moved old %s to %s. Retrying.\n", pathDatabase.string(), pathDatabaseBak.string());
} catch(boost::filesystem::filesystem_error &error) {
// failure is ok (well, not really, but it's not worse than what we started with)
}
@@ -590,7 +610,7 @@ bool AppInit2(boost::thread_group& threadGroup)
// try again
if (!bitdb.Open(GetDataDir())) {
// if it still fails, it probably means we can't even create the database env
- string msg = strprintf(_("Error initializing wallet database environment %s!"), strDataDir.c_str());
+ string msg = strprintf(_("Error initializing wallet database environment %s!"), strDataDir);
return InitError(msg);
}
}
@@ -610,7 +630,7 @@ bool AppInit2(boost::thread_group& threadGroup)
string msg = strprintf(_("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."), strDataDir.c_str());
+ " restore from a backup."), strDataDir);
InitWarning(msg);
}
if (r == CDBEnv::RECOVER_FAIL)
@@ -631,7 +651,7 @@ bool AppInit2(boost::thread_group& threadGroup)
BOOST_FOREACH(std::string snet, mapMultiArgs["-onlynet"]) {
enum Network net = ParseNetwork(snet);
if (net == NET_UNROUTABLE)
- return InitError(strprintf(_("Unknown network specified in -onlynet: '%s'"), snet.c_str()));
+ return InitError(strprintf(_("Unknown network specified in -onlynet: '%s'"), snet));
nets.insert(net);
}
for (int n = 0; n < NET_MAX; n++) {
@@ -652,7 +672,7 @@ bool AppInit2(boost::thread_group& threadGroup)
if (mapArgs.count("-proxy")) {
addrProxy = CService(mapArgs["-proxy"], 9050);
if (!addrProxy.IsValid())
- return InitError(strprintf(_("Invalid -proxy address: '%s'"), mapArgs["-proxy"].c_str()));
+ return InitError(strprintf(_("Invalid -proxy address: '%s'"), mapArgs["-proxy"]));
if (!IsLimited(NET_IPV4))
SetProxy(NET_IPV4, addrProxy, nSocksVersion);
@@ -679,7 +699,7 @@ bool AppInit2(boost::thread_group& threadGroup)
else
addrOnion = mapArgs.count("-onion")?CService(mapArgs["-onion"], 9050):CService(mapArgs["-tor"], 9050);
if (!addrOnion.IsValid())
- return InitError(strprintf(_("Invalid -onion address: '%s'"), mapArgs.count("-onion")?mapArgs["-onion"].c_str():mapArgs["-tor"].c_str()));
+ return InitError(strprintf(_("Invalid -onion address: '%s'"), mapArgs.count("-onion")?mapArgs["-onion"]:mapArgs["-tor"]));
SetProxy(NET_TOR, addrOnion, 5);
SetReachable(NET_TOR);
}
@@ -695,7 +715,7 @@ bool AppInit2(boost::thread_group& threadGroup)
BOOST_FOREACH(std::string strBind, mapMultiArgs["-bind"]) {
CService addrBind;
if (!Lookup(strBind.c_str(), addrBind, GetListenPort(), false))
- return InitError(strprintf(_("Cannot resolve -bind address: '%s'"), strBind.c_str()));
+ return InitError(strprintf(_("Cannot resolve -bind address: '%s'"), strBind));
fBound |= Bind(addrBind, (BF_EXPLICIT | BF_REPORT_ERROR));
}
}
@@ -715,7 +735,7 @@ bool AppInit2(boost::thread_group& threadGroup)
BOOST_FOREACH(string strAddr, mapMultiArgs["-externalip"]) {
CService addrLocal(strAddr, GetListenPort(), fNameLookup);
if (!addrLocal.IsValid())
- return InitError(strprintf(_("Cannot resolve -externalip address: '%s'"), strAddr.c_str()));
+ return InitError(strprintf(_("Cannot resolve -externalip address: '%s'"), strAddr));
AddLocal(CService(strAddr, GetListenPort(), fNameLookup), LOCAL_MANUAL);
}
}
@@ -739,7 +759,7 @@ bool AppInit2(boost::thread_group& threadGroup)
filesystem::path dest = blocksDir / strprintf("blk%05u.dat", i-1);
try {
filesystem::create_hard_link(source, dest);
- LogPrintf("Hardlinked %s -> %s\n", source.string().c_str(), dest.string().c_str());
+ LogPrintf("Hardlinked %s -> %s\n", source.string(), dest.string());
linked = true;
} catch (filesystem::filesystem_error & e) {
// Note: hardlink creation failing is not a disaster, it just means
@@ -755,9 +775,11 @@ bool AppInit2(boost::thread_group& threadGroup)
}
// cache size calculations
- size_t nTotalCache = GetArg("-dbcache", 25) << 20;
- if (nTotalCache < (1 << 22))
- nTotalCache = (1 << 22); // total cache cannot be less than 4 MiB
+ size_t nTotalCache = (GetArg("-dbcache", nDefaultDbCache) << 20);
+ if (nTotalCache < (nMinDbCache << 20))
+ nTotalCache = (nMinDbCache << 20); // total cache cannot be less than nMinDbCache
+ else if (nTotalCache > (nMaxDbCache << 20))
+ nTotalCache = (nMaxDbCache << 20); // total cache cannot be greater than nMaxDbCache
size_t nBlockTreeDBCache = nTotalCache / 8;
if (nBlockTreeDBCache > (1 << 21) && !GetBoolArg("-txindex", false))
nBlockTreeDBCache = (1 << 21); // block tree db cache shouldn't be larger than 2 MiB
@@ -879,7 +901,7 @@ bool AppInit2(boost::thread_group& threadGroup)
}
}
if (nFound == 0)
- LogPrintf("No blocks matching %s were found\n", strMatch.c_str());
+ LogPrintf("No blocks matching %s were found\n", strMatch);
return false;
}
@@ -889,6 +911,20 @@ bool AppInit2(boost::thread_group& threadGroup)
pwalletMain = NULL;
LogPrintf("Wallet disabled!\n");
} else {
+ if (GetBoolArg("-zapwallettxes", false)) {
+ uiInterface.InitMessage(_("Zapping all transactions from wallet..."));
+
+ pwalletMain = new CWallet(strWalletFile);
+ DBErrors nZapWalletRet = pwalletMain->ZapWalletTx();
+ if (nZapWalletRet != DB_LOAD_OK) {
+ uiInterface.InitMessage(_("Error loading wallet.dat: Wallet corrupted"));
+ return false;
+ }
+
+ delete pwalletMain;
+ pwalletMain = NULL;
+ }
+
uiInterface.InitMessage(_("Loading wallet..."));
nStart = GetTimeMillis();
@@ -910,7 +946,7 @@ bool AppInit2(boost::thread_group& threadGroup)
else if (nLoadWalletRet == DB_NEED_REWRITE)
{
strErrors << _("Wallet needed to be rewritten: restart Bitcoin to complete") << "\n";
- LogPrintf("%s", strErrors.str().c_str());
+ LogPrintf("%s", strErrors.str());
return InitError(strErrors.str());
}
else
@@ -948,7 +984,7 @@ bool AppInit2(boost::thread_group& threadGroup)
pwalletMain->SetBestChain(chainActive.GetLocator());
}
- LogPrintf("%s", strErrors.str().c_str());
+ LogPrintf("%s", strErrors.str());
LogPrintf(" wallet %15"PRId64"ms\n", GetTimeMillis() - nStart);
RegisterWallet(pwalletMain);
@@ -983,7 +1019,7 @@ bool AppInit2(boost::thread_group& threadGroup)
// scan for better chains in the block chain database, that are not yet connected in the active best chain
CValidationState state;
- if (!ConnectBestBlock(state))
+ if (!ActivateBestChain(state))
strErrors << "Failed to connect best block";
std::vector<boost::filesystem::path> vImportFiles;
diff --git a/src/leveldbwrapper.cpp b/src/leveldbwrapper.cpp
index aff1ec0283..43c737a599 100644
--- a/src/leveldbwrapper.cpp
+++ b/src/leveldbwrapper.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2013 The Bitcoin developers
+// Copyright (c) 2012-2014 The Bitcoin developers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
@@ -15,7 +15,7 @@
void HandleError(const leveldb::Status &status) throw(leveldb_error) {
if (status.ok())
return;
- LogPrintf("%s\n", status.ToString().c_str());
+ LogPrintf("%s\n", status.ToString());
if (status.IsCorruption())
throw leveldb_error("Database corrupted");
if (status.IsIOError())
@@ -48,11 +48,11 @@ CLevelDBWrapper::CLevelDBWrapper(const boost::filesystem::path &path, size_t nCa
options.env = penv;
} else {
if (fWipe) {
- LogPrintf("Wiping LevelDB in %s\n", path.string().c_str());
+ LogPrintf("Wiping LevelDB in %s\n", path.string());
leveldb::DestroyDB(path.string(), options);
}
boost::filesystem::create_directory(path);
- LogPrintf("Opening LevelDB in %s\n", path.string().c_str());
+ LogPrintf("Opening LevelDB in %s\n", path.string());
}
leveldb::Status status = leveldb::DB::Open(options, path.string(), &pdb);
HandleError(status);
diff --git a/src/m4/bitcoin_qt.m4 b/src/m4/bitcoin_qt.m4
index 758aea3499..068371e83a 100644
--- a/src/m4/bitcoin_qt.m4
+++ b/src/m4/bitcoin_qt.m4
@@ -22,7 +22,7 @@ AC_DEFUN([BITCOIN_QT_CHECK],[
])
dnl BITCOIN_QT_PATH_PROGS([FOO], [foo foo2], [/path/to/search/first], [continue if missing])
-dnl Helper for finding the path of programs needed for QT.
+dnl Helper for finding the path of programs needed for Qt.
dnl Inputs: $1: Variable to be set
dnl Inputs: $2: List of programs to search for
dnl Inputs: $3: Look for $2 here before $PATH
@@ -47,9 +47,9 @@ dnl input variables are set correctly.
dnl CAUTION: Do not use this inside of a conditional.
AC_DEFUN([BITCOIN_QT_INIT],[
dnl enable qt support
- AC_ARG_WITH([qt],
- [AS_HELP_STRING([--with-qt],
- [with qt (no|qt4|qt5|auto. default is auto, qt4 tried first.)])],
+ AC_ARG_WITH([gui],
+ [AS_HELP_STRING([--with-gui],
+ [with GUI (no|qt4|qt5|auto. default is auto, qt4 tried first.)])],
[
bitcoin_qt_want_version=$withval
if test x$bitcoin_qt_want_version = xyes; then
@@ -73,7 +73,7 @@ AC_DEFUN([BITCOIN_QT_INIT],[
dnl Find the appropriate version of Qt libraries and includes.
dnl Inputs: $1: Whether or not pkg-config should be used. yes|no. Default: yes.
-dnl Inputs: $2: If $1 is "yes" and --with-qt=auto, which qt version should be
+dnl Inputs: $2: If $1 is "yes" and --with-gui=auto, which qt version should be
dnl tried first.
dnl Outputs: See _BITCOIN_QT_FIND_LIBS_*
dnl Outputs: Sets variables for all qt-related tools.
@@ -109,11 +109,15 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[
AX_CHECK_LINK_FLAG([[$base_frameworks]],[QT_LIBS="$QT_LIBS $base_frameworks"],[AC_MSG_ERROR(could not find base frameworks)])
])
;;
+ *mingw*)
+ BITCOIN_QT_CHECK([
+ AX_CHECK_LINK_FLAG([[-mwindows]],[QT_LDFLAGS="$QT_LDFLAGS -mwindows"],[AC_MSG_WARN(-mwindows linker support not detected)])
+ ])
esac
dnl enable qt support
- AC_MSG_CHECKING(if QT should be enabled)
+ AC_MSG_CHECKING(whether to build Bitcoin Core GUI)
BITCOIN_QT_CHECK([
bitcoin_enable_qt=yes
bitcoin_enable_qt_test=yes
@@ -137,6 +141,7 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[
AC_SUBST(QT_INCLUDES)
AC_SUBST(QT_LIBS)
+ AC_SUBST(QT_LDFLAGS)
AC_SUBST(QT_DBUS_INCLUDES)
AC_SUBST(QT_DBUS_LIBS)
AC_SUBST(QT_TEST_INCLUDES)
@@ -149,11 +154,11 @@ dnl All macros below are internal and should _not_ be used from the main
dnl configure.ac.
dnl ----
-dnl Internal. Check if the included version of QT is Qt5.
+dnl Internal. Check if the included version of Qt is Qt5.
dnl Requires: INCLUDES must be populated as necessary.
dnl Output: bitcoin_cv_qt5=yes|no
AC_DEFUN([_BITCOIN_QT_CHECK_QT5],[
- AC_CACHE_CHECK(for QT 5, bitcoin_cv_qt5,[
+ AC_CACHE_CHECK(for Qt 5, bitcoin_cv_qt5,[
AC_TRY_COMPILE(
[#include <QtCore>],
[
@@ -167,13 +172,13 @@ AC_DEFUN([_BITCOIN_QT_CHECK_QT5],[
bitcoin_cv_qt5=no)
])])
-dnl Internal. Check if the linked version of QT was built as static libs.
+dnl Internal. Check if the linked version of Qt was built as static libs.
dnl Requires: Qt5. This check cannot determine if Qt4 is static.
dnl Requires: INCLUDES and LIBS must be populated as necessary.
dnl Output: bitcoin_cv_static_qt=yes|no
dnl Output: Defines QT_STATICPLUGIN if plugins are static.
AC_DEFUN([_BITCOIN_QT_IS_STATIC],[
- AC_CACHE_CHECK(for static QT, bitcoin_cv_static_qt,[
+ AC_CACHE_CHECK(for static Qt, bitcoin_cv_static_qt,[
AC_TRY_COMPILE(
[#include <QtCore>],
[
@@ -187,7 +192,7 @@ AC_DEFUN([_BITCOIN_QT_IS_STATIC],[
[bitcoin_cv_static_qt=no])
])
if test xbitcoin_cv_static_qt = xyes; then
- AC_DEFINE(QT_STATICPLUGIN, 1, [Define this symbol for static QT plugins])
+ AC_DEFINE(QT_STATICPLUGIN, 1, [Define this symbol for static Qt plugins])
fi
])
@@ -197,7 +202,7 @@ dnl Inputs: $1: A series of Q_IMPORT_PLUGIN().
dnl Inputs: $2: The libraries that resolve $1.
dnl Output: QT_LIBS is prepended or configure exits.
AC_DEFUN([_BITCOIN_QT_CHECK_STATIC_PLUGINS],[
- AC_MSG_CHECKING(for static QT plugins: $2)
+ AC_MSG_CHECKING(for static Qt plugins: $2)
CHECK_STATIC_PLUGINS_TEMP_LIBS="$LIBS"
LIBS="$2 $QT_LIBS $LIBS"
AC_TRY_LINK([
@@ -211,7 +216,7 @@ AC_DEFUN([_BITCOIN_QT_CHECK_STATIC_PLUGINS],[
])
dnl Internal. Find Qt libraries using pkg-config.
-dnl Inputs: bitcoin_qt_want_version (from --with-qt=). The version to check
+dnl Inputs: bitcoin_qt_want_version (from --with-gui=). The version to check
dnl first.
dnl Inputs: $1: If bitcoin_qt_want_version is "auto", check for this version
dnl first.
@@ -265,7 +270,7 @@ AC_DEFUN([_BITCOIN_QT_FIND_LIBS_WITH_PKGCONFIG],[
dnl Internal. Find Qt libraries without using pkg-config. Version is deduced
dnl from the discovered headers.
-dnl Inputs: bitcoin_qt_want_version (from --with-qt=). The version to use.
+dnl Inputs: bitcoin_qt_want_version (from --with-gui=). The version to use.
dnl If "auto", the version will be discovered by _BITCOIN_QT_CHECK_QT5.
dnl Outputs: All necessary QT_* variables are set.
dnl Outputs: bitcoin_qt_got_major_vers is set to "4" or "5".
diff --git a/src/main.cpp b/src/main.cpp
index 3ff1fd3a91..53b99101d9 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,5 +1,5 @@
// Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2013 The Bitcoin developers
+// Copyright (c) 2009-2014 The Bitcoin developers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
@@ -17,7 +17,6 @@
#include "ui_interface.h"
#include "util.h"
-#include <inttypes.h>
#include <sstream>
#include <boost/algorithm/string/replace.hpp>
@@ -41,6 +40,7 @@ CTxMemPool mempool;
map<uint256, CBlockIndex*> mapBlockIndex;
CChain chainActive;
+CChain chainMostWork;
int64_t nTimeBestReceived = 0;
int nScriptCheckThreads = 0;
bool fImporting = false;
@@ -52,7 +52,7 @@ unsigned int nCoinCacheSize = 5000;
/** Fees smaller than this (in satoshi) are considered zero fee (for transaction creation) */
int64_t CTransaction::nMinTxFee = 10000; // Override with -mintxfee
/** Fees smaller than this (in satoshi) are considered zero fee (for relaying) */
-int64_t CTransaction::nMinRelayTxFee = 10000;
+int64_t CTransaction::nMinRelayTxFee = 1000;
static CMedianFilter<int> cPeerBlockCounts(8, 0); // Amount of blocks that other nodes claim to have
@@ -77,13 +77,21 @@ namespace {
struct CBlockIndexWorkComparator
{
bool operator()(CBlockIndex *pa, CBlockIndex *pb) {
+ // First sort by most total work, ...
if (pa->nChainWork > pb->nChainWork) return false;
if (pa->nChainWork < pb->nChainWork) return true;
- if (pa->GetBlockHash() < pb->GetBlockHash()) return false;
- if (pa->GetBlockHash() > pb->GetBlockHash()) return true;
+ // ... then by earliest time received, ...
+ if (pa->nSequenceId < pb->nSequenceId) return false;
+ if (pa->nSequenceId > pb->nSequenceId) return true;
- return false; // identical blocks
+ // Use pointer address as tie breaker (should only happen with blocks
+ // loaded from disk, as those all have id 0).
+ if (pa < pb) return false;
+ if (pa > pb) return true;
+
+ // Identical blocks.
+ return false;
}
};
@@ -93,6 +101,16 @@ set<CBlockIndex*, CBlockIndexWorkComparator> setBlockIndexValid; // may contain
CCriticalSection cs_LastBlockFile;
CBlockFileInfo infoLastBlockFile;
int nLastBlockFile = 0;
+
+// Every received block is assigned a unique and increasing identifier, so we
+// know which one to give priority in case of a fork.
+CCriticalSection cs_nBlockSequenceId;
+// Blocks loaded from disk are assigned id 0, so start the counter at 1.
+uint32_t nBlockSequenceId = 1;
+
+// Sources of received blocks, to be able to send them reject messages or ban
+// them, if processing happens afterwards. Protected by cs_main.
+map<uint256, NodeId> mapBlockSource;
}
//////////////////////////////////////////////////////////////////////////////
@@ -156,14 +174,26 @@ void SyncWithWallets(const uint256 &hash, const CTransaction &tx, const CBlock *
//
namespace {
+
+struct CBlockReject {
+ unsigned char chRejectCode;
+ string strRejectReason;
+ uint256 hashBlock;
+};
+
// Maintain validation-specific state about nodes, protected by cs_main, instead
// by CNode's own locks. This simplifies asynchronous operation, where
// processing of incoming data is done after the ProcessMessage call returns,
// and we're no longer holding the node's locks.
struct CNodeState {
+ // Accumulated misbehaviour score for this peer.
int nMisbehavior;
+ // Whether this peer should be disconnected and banned.
bool fShouldBan;
+ // String name of this peer (debugging/logging purposes).
std::string name;
+ // List of asynchronously-determined block rejections to notify this peer about.
+ std::vector<CBlockReject> rejects;
CNodeState() {
nMisbehavior = 0;
@@ -171,6 +201,7 @@ struct CNodeState {
}
};
+// Map maintaining per-node state. Requires cs_main.
map<NodeId, CNodeState> mapNodeState;
// Requires cs_main.
@@ -309,7 +340,7 @@ bool AddOrphanTx(const CTransaction& tx)
unsigned int sz = tx.GetSerializeSize(SER_NETWORK, CTransaction::CURRENT_VERSION);
if (sz > 5000)
{
- LogPrint("mempool", "ignoring large orphan tx (size: %u, hash: %s)\n", sz, hash.ToString().c_str());
+ LogPrint("mempool", "ignoring large orphan tx (size: %u, hash: %s)\n", sz, hash.ToString());
return false;
}
@@ -317,7 +348,7 @@ bool AddOrphanTx(const CTransaction& tx)
BOOST_FOREACH(const CTxIn& txin, tx.vin)
mapOrphanTransactionsByPrev[txin.prevout.hash].insert(hash);
- LogPrint("mempool", "stored orphan tx %s (mapsz %"PRIszu")\n", hash.ToString().c_str(),
+ LogPrint("mempool", "stored orphan tx %s (mapsz %"PRIszu")\n", hash.ToString(),
mapOrphanTransactions.size());
return true;
}
@@ -365,7 +396,24 @@ bool IsStandardTx(const CTransaction& tx, string& reason)
return false;
}
- if (!IsFinalTx(tx)) {
+ // Treat non-final transactions as non-standard to prevent a specific type
+ // of double-spend attack, as well as DoS attacks. (if the transaction
+ // can't be mined, the attacker isn't expending resources broadcasting it)
+ // Basically we don't want to propagate transactions that can't included in
+ // the next block.
+ //
+ // However, IsFinalTx() is confusing... Without arguments, it uses
+ // chainActive.Height() to evaluate nLockTime; when a block is accepted, chainActive.Height()
+ // is set to the value of nHeight in the block. However, when IsFinalTx()
+ // is called within CBlock::AcceptBlock(), the height of the block *being*
+ // evaluated is what is used. Thus if we want to know if a transaction can
+ // be part of the *next* block, we need to call IsFinalTx() with one more
+ // than chainActive.Height().
+ //
+ // Timestamps on the other hand don't get any special treatment, because we
+ // can't know what timestamp the next block will have, and there aren't
+ // timestamp applications where it matters.
+ if (!IsFinalTx(tx, chainActive.Height() + 1)) {
reason = "non-final";
return false;
}
@@ -393,6 +441,10 @@ bool IsStandardTx(const CTransaction& tx, string& reason)
reason = "scriptsig-not-pushonly";
return false;
}
+ if (!txin.scriptSig.HasCanonicalPushes()) {
+ reason = "scriptsig-non-canonical-push";
+ return false;
+ }
}
unsigned int nDataOut = 0;
@@ -412,7 +464,7 @@ bool IsStandardTx(const CTransaction& tx, string& reason)
// only one OP_RETURN txout is permitted
if (nDataOut > 1) {
- reason = "mucho-data";
+ reason = "multi-op-return";
return false;
}
@@ -588,14 +640,14 @@ bool CheckTransaction(const CTransaction& tx, CValidationState &state)
// Basic checks that don't depend on any context
if (tx.vin.empty())
return state.DoS(10, error("CheckTransaction() : vin empty"),
- REJECT_INVALID, "vin empty");
+ REJECT_INVALID, "bad-txns-vin-empty");
if (tx.vout.empty())
return state.DoS(10, error("CheckTransaction() : vout empty"),
- REJECT_INVALID, "vout empty");
+ REJECT_INVALID, "bad-txns-vout-empty");
// Size limits
if (::GetSerializeSize(tx, SER_NETWORK, PROTOCOL_VERSION) > MAX_BLOCK_SIZE)
return state.DoS(100, error("CheckTransaction() : size limits failed"),
- REJECT_INVALID, "oversize");
+ REJECT_INVALID, "bad-txns-oversize");
// Check for negative or overflow output values
int64_t nValueOut = 0;
@@ -603,14 +655,14 @@ bool CheckTransaction(const CTransaction& tx, CValidationState &state)
{
if (txout.nValue < 0)
return state.DoS(100, error("CheckTransaction() : txout.nValue negative"),
- REJECT_INVALID, "vout negative");
+ REJECT_INVALID, "bad-txns-vout-negative");
if (txout.nValue > MAX_MONEY)
return state.DoS(100, error("CheckTransaction() : txout.nValue too high"),
- REJECT_INVALID, "vout too large");
+ REJECT_INVALID, "bad-txns-vout-toolarge");
nValueOut += txout.nValue;
if (!MoneyRange(nValueOut))
return state.DoS(100, error("CheckTransaction() : txout total out of range"),
- REJECT_INVALID, "txout total too large");
+ REJECT_INVALID, "bad-txns-txouttotal-toolarge");
}
// Check for duplicate inputs
@@ -619,7 +671,7 @@ bool CheckTransaction(const CTransaction& tx, CValidationState &state)
{
if (vInOutPoints.count(txin.prevout))
return state.DoS(100, error("CheckTransaction() : duplicate inputs"),
- REJECT_INVALID, "duplicate inputs");
+ REJECT_INVALID, "bad-txns-inputs-duplicate");
vInOutPoints.insert(txin.prevout);
}
@@ -627,14 +679,14 @@ bool CheckTransaction(const CTransaction& tx, CValidationState &state)
{
if (tx.vin[0].scriptSig.size() < 2 || tx.vin[0].scriptSig.size() > 100)
return state.DoS(100, error("CheckTransaction() : coinbase script size"),
- REJECT_INVALID, "coinbase script too large");
+ REJECT_INVALID, "bad-cb-length");
}
else
{
BOOST_FOREACH(const CTxIn& txin, tx.vin)
if (txin.prevout.IsNull())
return state.DoS(10, error("CheckTransaction() : prevout is null"),
- REJECT_INVALID, "prevout null");
+ REJECT_INVALID, "bad-txns-prevout-null");
}
return true;
@@ -693,7 +745,7 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransa
string reason;
if (Params().NetworkID() == CChainParams::MAIN && !IsStandardTx(tx, reason))
return state.DoS(0,
- error("AcceptToMemoryPool : nonstandard transaction: %s", reason.c_str()),
+ error("AcceptToMemoryPool : nonstandard transaction: %s", reason),
REJECT_NONSTANDARD, reason);
// is it already in the memory pool?
@@ -742,7 +794,7 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransa
// are the actual inputs available?
if (!view.HaveInputs(tx))
return state.Invalid(error("AcceptToMemoryPool : inputs already spent"),
- REJECT_DUPLICATE, "inputs spent");
+ REJECT_DUPLICATE, "bad-txns-inputs-spent");
// Bring the best block into scope
view.GetBestBlock();
@@ -771,7 +823,7 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransa
int64_t txMinFee = GetMinFee(tx, nSize, true, GMF_RELAY);
if (fLimitFree && nFees < txMinFee)
return state.DoS(0, error("AcceptToMemoryPool : not enough fees %s, %"PRId64" < %"PRId64,
- hash.ToString().c_str(), nFees, txMinFee),
+ hash.ToString(), nFees, txMinFee),
REJECT_INSUFFICIENTFEE, "insufficient fee");
// Continuously rate-limit free transactions
@@ -800,14 +852,14 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransa
if (fRejectInsaneFee && nFees > CTransaction::nMinRelayTxFee * 10000)
return error("AcceptToMemoryPool: : insane fees %s, %"PRId64" > %"PRId64,
- hash.ToString().c_str(),
+ hash.ToString(),
nFees, CTransaction::nMinRelayTxFee * 10000);
// Check against previous transactions
// This is done last to help prevent CPU exhaustion denial-of-service attacks.
if (!CheckInputs(tx, state, view, true, SCRIPT_VERIFY_P2SH | SCRIPT_VERIFY_STRICTENC))
{
- return error("AcceptToMemoryPool: : ConnectInputs failed %s", hash.ToString().c_str());
+ return error("AcceptToMemoryPool: : ConnectInputs failed %s", hash.ToString());
}
// Store transaction in memory
pool.addUnchecked(hash, entry);
@@ -819,7 +871,7 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransa
}
-int CMerkleTx::GetDepthInMainChain(CBlockIndex* &pindexRet) const
+int CMerkleTx::GetDepthInMainChainINTERNAL(CBlockIndex* &pindexRet) const
{
if (hashBlock == 0 || nIndex == -1)
return 0;
@@ -844,6 +896,14 @@ int CMerkleTx::GetDepthInMainChain(CBlockIndex* &pindexRet) const
return chainActive.Height() - pindex->nHeight + 1;
}
+int CMerkleTx::GetDepthInMainChain(CBlockIndex* &pindexRet) const
+{
+ int nResult = GetDepthInMainChainINTERNAL(pindexRet);
+ if (nResult == 0 && !mempool.exists(GetHash()))
+ return -1; // Not in chain, not in mempool
+
+ return nResult;
+}
int CMerkleTx::GetBlocksToMaturity() const
{
@@ -1005,6 +1065,31 @@ uint256 static GetOrphanRoot(const uint256& hash)
} while(true);
}
+// Remove a random orphan block (which does not have any dependent orphans).
+void static PruneOrphanBlocks()
+{
+ if (mapOrphanBlocksByPrev.size() <= MAX_ORPHAN_BLOCKS)
+ return;
+
+ // Pick a random orphan block.
+ int pos = insecure_rand() % mapOrphanBlocksByPrev.size();
+ std::multimap<uint256, COrphanBlock*>::iterator it = mapOrphanBlocksByPrev.begin();
+ while (pos--) it++;
+
+ // As long as this block has other orphans depending on it, move to one of those successors.
+ do {
+ std::multimap<uint256, COrphanBlock*>::iterator it2 = mapOrphanBlocksByPrev.find(it->second->hashBlock);
+ if (it2 == mapOrphanBlocksByPrev.end())
+ break;
+ it = it2;
+ } while(1);
+
+ uint256 hash = it->second->hashBlock;
+ delete it->second;
+ mapOrphanBlocksByPrev.erase(it);
+ mapOrphanBlocks.erase(hash);
+}
+
int64_t GetBlockValue(int nHeight, int64_t nFees)
{
int64_t nSubsidy = 50 * COIN;
@@ -1101,8 +1186,8 @@ unsigned int GetNextWorkRequired(const CBlockIndex* pindexLast, const CBlockHead
/// debug print
LogPrintf("GetNextWorkRequired RETARGET\n");
LogPrintf("nTargetTimespan = %"PRId64" nActualTimespan = %"PRId64"\n", nTargetTimespan, nActualTimespan);
- LogPrintf("Before: %08x %s\n", pindexLast->nBits, CBigNum().SetCompact(pindexLast->nBits).getuint256().ToString().c_str());
- LogPrintf("After: %08x %s\n", bnNew.GetCompact(), bnNew.getuint256().ToString().c_str());
+ LogPrintf("Before: %08x %s\n", pindexLast->nBits, CBigNum().SetCompact(pindexLast->nBits).getuint256().ToString());
+ LogPrintf("After: %08x %s\n", bnNew.GetCompact(), bnNew.getuint256().ToString());
return bnNew.GetCompact();
}
@@ -1176,8 +1261,8 @@ void CheckForkWarningConditions()
if (pindexBestForkTip)
{
LogPrintf("CheckForkWarningConditions: Warning: Large valid fork found\n forking the chain at height %d (%s)\n lasting to height %d (%s).\nChain state database corruption likely.\n",
- pindexBestForkBase->nHeight, pindexBestForkBase->phashBlock->ToString().c_str(),
- pindexBestForkTip->nHeight, pindexBestForkTip->phashBlock->ToString().c_str());
+ pindexBestForkBase->nHeight, pindexBestForkBase->phashBlock->ToString(),
+ pindexBestForkTip->nHeight, pindexBestForkTip->phashBlock->ToString());
fLargeWorkForkFound = true;
}
else
@@ -1225,6 +1310,24 @@ void CheckForkWarningConditionsOnNewFork(CBlockIndex* pindexNewForkTip)
CheckForkWarningConditions();
}
+void Misbehaving(NodeId pnode, int howmuch)
+{
+ if (howmuch == 0)
+ return;
+
+ CNodeState *state = State(pnode);
+ if (state == NULL)
+ return;
+
+ state->nMisbehavior += howmuch;
+ if (state->nMisbehavior >= GetArg("-banscore", 100))
+ {
+ LogPrintf("Misbehaving: %s (%d -> %d) BAN THRESHOLD EXCEEDED\n", state->name, state->nMisbehavior-howmuch, state->nMisbehavior);
+ state->fShouldBan = true;
+ } else
+ LogPrintf("Misbehaving: %s (%d -> %d)\n", state->name, state->nMisbehavior-howmuch, state->nMisbehavior);
+}
+
void static InvalidChainFound(CBlockIndex* pindexNew)
{
if (!pindexBestInvalid || pindexNew->nChainWork > pindexBestInvalid->nChainWork)
@@ -1237,76 +1340,32 @@ void static InvalidChainFound(CBlockIndex* pindexNew)
uiInterface.NotifyBlocksChanged();
}
LogPrintf("InvalidChainFound: invalid block=%s height=%d log2_work=%.8g date=%s\n",
- pindexNew->GetBlockHash().ToString().c_str(), pindexNew->nHeight,
+ pindexNew->GetBlockHash().ToString(), pindexNew->nHeight,
log(pindexNew->nChainWork.getdouble())/log(2.0), DateTimeStrFormat("%Y-%m-%d %H:%M:%S",
- pindexNew->GetBlockTime()).c_str());
+ pindexNew->GetBlockTime()));
LogPrintf("InvalidChainFound: current best=%s height=%d log2_work=%.8g date=%s\n",
- chainActive.Tip()->GetBlockHash().ToString().c_str(), chainActive.Height(), log(chainActive.Tip()->nChainWork.getdouble())/log(2.0),
- DateTimeStrFormat("%Y-%m-%d %H:%M:%S", chainActive.Tip()->GetBlockTime()).c_str());
+ chainActive.Tip()->GetBlockHash().ToString(), chainActive.Height(), log(chainActive.Tip()->nChainWork.getdouble())/log(2.0),
+ DateTimeStrFormat("%Y-%m-%d %H:%M:%S", chainActive.Tip()->GetBlockTime()));
CheckForkWarningConditions();
}
-void static InvalidBlockFound(CBlockIndex *pindex) {
- pindex->nStatus |= BLOCK_FAILED_VALID;
- pblocktree->WriteBlockIndex(CDiskBlockIndex(pindex));
- setBlockIndexValid.erase(pindex);
- InvalidChainFound(pindex);
- if (chainActive.Next(pindex)) {
- CValidationState stateDummy;
- ConnectBestBlock(stateDummy); // reorganise away from the failed block
- }
-}
-
-bool ConnectBestBlock(CValidationState &state) {
- do {
- CBlockIndex *pindexNewBest;
-
- {
- std::set<CBlockIndex*,CBlockIndexWorkComparator>::reverse_iterator it = setBlockIndexValid.rbegin();
- if (it == setBlockIndexValid.rend())
- return true;
- pindexNewBest = *it;
+void static InvalidBlockFound(CBlockIndex *pindex, const CValidationState &state) {
+ int nDoS = 0;
+ if (state.IsInvalid(nDoS)) {
+ std::map<uint256, NodeId>::iterator it = mapBlockSource.find(pindex->GetBlockHash());
+ if (it != mapBlockSource.end() && State(it->second)) {
+ CBlockReject reject = {state.GetRejectCode(), state.GetRejectReason(), pindex->GetBlockHash()};
+ State(it->second)->rejects.push_back(reject);
+ if (nDoS > 0)
+ Misbehaving(it->second, nDoS);
}
-
- if (pindexNewBest == chainActive.Tip() || (chainActive.Tip() && pindexNewBest->nChainWork == chainActive.Tip()->nChainWork))
- return true; // nothing to do
-
- // check ancestry
- CBlockIndex *pindexTest = pindexNewBest;
- std::vector<CBlockIndex*> vAttach;
- do {
- if (pindexTest->nStatus & BLOCK_FAILED_MASK) {
- // mark descendants failed
- CBlockIndex *pindexFailed = pindexNewBest;
- while (pindexTest != pindexFailed) {
- pindexFailed->nStatus |= BLOCK_FAILED_CHILD;
- setBlockIndexValid.erase(pindexFailed);
- pblocktree->WriteBlockIndex(CDiskBlockIndex(pindexFailed));
- pindexFailed = pindexFailed->pprev;
- }
- InvalidChainFound(pindexNewBest);
- break;
- }
-
- if (chainActive.Tip() == NULL || pindexTest->nChainWork > chainActive.Tip()->nChainWork)
- vAttach.push_back(pindexTest);
-
- if (pindexTest->pprev == NULL || chainActive.Next(pindexTest)) {
- reverse(vAttach.begin(), vAttach.end());
- BOOST_FOREACH(CBlockIndex *pindexSwitch, vAttach) {
- boost::this_thread::interruption_point();
- try {
- if (!SetBestChain(state, pindexSwitch))
- return false;
- } catch(std::runtime_error &e) {
- return state.Abort(_("System error: ") + e.what());
- }
- }
- return true;
- }
- pindexTest = pindexTest->pprev;
- } while(true);
- } while(true);
+ }
+ if (!state.CorruptionPossible()) {
+ pindex->nStatus |= BLOCK_FAILED_VALID;
+ pblocktree->WriteBlockIndex(CDiskBlockIndex(pindex));
+ setBlockIndexValid.erase(pindex);
+ InvalidChainFound(pindex);
+ }
}
void UpdateTime(CBlockHeader& block, const CBlockIndex* pindexPrev)
@@ -1350,7 +1409,7 @@ void UpdateCoins(const CTransaction& tx, CValidationState &state, CCoinsViewCach
bool CScriptCheck::operator()() const {
const CScript &scriptSig = ptxTo->vin[nIn].scriptSig;
if (!VerifyScript(scriptSig, scriptPubKey, *ptxTo, nIn, nFlags, nHashType))
- return error("CScriptCheck() : %s VerifySignature failed", ptxTo->GetHash().ToString().c_str());
+ return error("CScriptCheck() : %s VerifySignature failed", ptxTo->GetHash().ToString());
return true;
}
@@ -1369,7 +1428,7 @@ bool CheckInputs(const CTransaction& tx, CValidationState &state, CCoinsViewCach
// This doesn't trigger the DoS code on purpose; if it did, it would make it easier
// for an attacker to attempt to split the network.
if (!inputs.HaveInputs(tx))
- return state.Invalid(error("CheckInputs() : %s inputs unavailable", tx.GetHash().ToString().c_str()));
+ return state.Invalid(error("CheckInputs() : %s inputs unavailable", tx.GetHash().ToString()));
// While checking, GetBestBlock() refers to the parent block.
// This is also true for mempool checks.
@@ -1387,30 +1446,30 @@ bool CheckInputs(const CTransaction& tx, CValidationState &state, CCoinsViewCach
if (nSpendHeight - coins.nHeight < COINBASE_MATURITY)
return state.Invalid(
error("CheckInputs() : tried to spend coinbase at depth %d", nSpendHeight - coins.nHeight),
- REJECT_INVALID, "premature spend of coinbase");
+ REJECT_INVALID, "bad-txns-premature-spend-of-coinbase");
}
// Check for negative or overflow input values
nValueIn += coins.vout[prevout.n].nValue;
if (!MoneyRange(coins.vout[prevout.n].nValue) || !MoneyRange(nValueIn))
return state.DoS(100, error("CheckInputs() : txin values out of range"),
- REJECT_INVALID, "input values out of range");
+ REJECT_INVALID, "bad-txns-inputvalues-outofrange");
}
if (nValueIn < tx.GetValueOut())
- return state.DoS(100, error("CheckInputs() : %s value in < value out", tx.GetHash().ToString().c_str()),
- REJECT_INVALID, "in < out");
+ return state.DoS(100, error("CheckInputs() : %s value in < value out", tx.GetHash().ToString()),
+ REJECT_INVALID, "bad-txns-in-belowout");
// Tally transaction fees
int64_t nTxFee = nValueIn - tx.GetValueOut();
if (nTxFee < 0)
- return state.DoS(100, error("CheckInputs() : %s nTxFee < 0", tx.GetHash().ToString().c_str()),
- REJECT_INVALID, "fee < 0");
+ return state.DoS(100, error("CheckInputs() : %s nTxFee < 0", tx.GetHash().ToString()),
+ REJECT_INVALID, "bad-txns-fee-negative");
nFees += nTxFee;
if (!MoneyRange(nFees))
return state.DoS(100, error("CheckInputs() : nFees out of range"),
- REJECT_INVALID, "fee out of range");
+ REJECT_INVALID, "bad-txns-fee-outofrange");
// The first loop above does all the inexpensive checks.
// Only if ALL inputs pass do we perform expensive ECDSA signature checks.
@@ -1607,7 +1666,7 @@ bool ConnectBlock(CBlock& block, CValidationState& state, CBlockIndex* pindex, C
uint256 hash = block.GetTxHash(i);
if (view.HaveCoins(hash) && !view.GetCoins(hash).IsPruned())
return state.DoS(100, error("ConnectBlock() : tried to overwrite transaction"),
- REJECT_INVALID, "BIP30");
+ REJECT_INVALID, "bad-txns-BIP30");
}
}
@@ -1637,13 +1696,13 @@ bool ConnectBlock(CBlock& block, CValidationState& state, CBlockIndex* pindex, C
nSigOps += GetLegacySigOpCount(tx);
if (nSigOps > MAX_BLOCK_SIGOPS)
return state.DoS(100, error("ConnectBlock() : too many sigops"),
- REJECT_INVALID, "too many sigops");
+ REJECT_INVALID, "bad-blk-sigops");
if (!tx.IsCoinBase())
{
if (!view.HaveInputs(tx))
return state.DoS(100, error("ConnectBlock() : inputs missing/spent"),
- REJECT_INVALID, "inputs missing/spent");
+ REJECT_INVALID, "bad-txns-inputs-missingorspent");
if (fStrictPayToScriptHash)
{
@@ -1653,7 +1712,7 @@ bool ConnectBlock(CBlock& block, CValidationState& state, CBlockIndex* pindex, C
nSigOps += GetP2SHSigOpCount(tx, view);
if (nSigOps > MAX_BLOCK_SIGOPS)
return state.DoS(100, error("ConnectBlock() : too many sigops"),
- REJECT_INVALID, "too many sigops");
+ REJECT_INVALID, "bad-blk-sigops");
}
nFees += view.GetValueIn(tx)-tx.GetValueOut();
@@ -1680,7 +1739,7 @@ bool ConnectBlock(CBlock& block, CValidationState& state, CBlockIndex* pindex, C
return state.DoS(100,
error("ConnectBlock() : coinbase pays too much (actual=%"PRId64" vs limit=%"PRId64")",
block.vtx[0].GetValueOut(), GetBlockValue(pindex->nHeight, nFees)),
- REJECT_INVALID, "coinbase too large");
+ REJECT_INVALID, "bad-cb-amount");
if (!control.Wait())
return state.DoS(100, false);
@@ -1729,147 +1788,41 @@ bool ConnectBlock(CBlock& block, CValidationState& state, CBlockIndex* pindex, C
return true;
}
-bool SetBestChain(CValidationState &state, CBlockIndex* pindexNew)
-{
- mempool.check(pcoinsTip);
-
- // All modifications to the coin state will be done in this cache.
- // Only when all have succeeded, we push it to pcoinsTip.
- CCoinsViewCache view(*pcoinsTip, true);
-
- // Find the fork (typically, there is none)
- std::map<uint256, CBlockIndex*>::iterator it = mapBlockIndex.find(view.GetBestBlock());
- CBlockIndex* ptip = (it != mapBlockIndex.end()) ? it->second : NULL;
- CBlockIndex* pfork = ptip;
- CBlockIndex* plonger = pindexNew;
- while (pfork && pfork != plonger)
- {
- while (plonger->nHeight > pfork->nHeight) {
- plonger = plonger->pprev;
- assert(plonger != NULL);
- }
- if (pfork == plonger)
- break;
- pfork = pfork->pprev;
- assert(pfork != NULL);
- }
-
- // List of what to disconnect (typically nothing)
- vector<CBlockIndex*> vDisconnect;
- for (CBlockIndex* pindex = ptip; pindex != pfork; pindex = pindex->pprev)
- vDisconnect.push_back(pindex);
-
- // List of what to connect (typically only pindexNew)
- vector<CBlockIndex*> vConnect;
- for (CBlockIndex* pindex = pindexNew; pindex != pfork; pindex = pindex->pprev)
- vConnect.push_back(pindex);
- reverse(vConnect.begin(), vConnect.end());
-
- if (vDisconnect.size() > 0) {
- LogPrintf("REORGANIZE: Disconnect %"PRIszu" blocks; %s...\n", vDisconnect.size(), pfork->GetBlockHash().ToString().c_str());
- LogPrintf("REORGANIZE: Connect %"PRIszu" blocks; ...%s\n", vConnect.size(), pindexNew->GetBlockHash().ToString().c_str());
- }
-
- // Disconnect shorter branch
- list<CTransaction> vResurrect;
- BOOST_FOREACH(CBlockIndex* pindex, vDisconnect) {
- CBlock block;
- if (!ReadBlockFromDisk(block, pindex))
- return state.Abort(_("Failed to read block"));
- int64_t nStart = GetTimeMicros();
- if (!DisconnectBlock(block, state, pindex, view))
- return error("SetBestBlock() : DisconnectBlock %s failed", pindex->GetBlockHash().ToString().c_str());
- if (fBenchmark)
- LogPrintf("- Disconnect: %.2fms\n", (GetTimeMicros() - nStart) * 0.001);
-
- // Queue memory transactions to resurrect.
- // We only do this for blocks after the last checkpoint (reorganisation before that
- // point should only happen with -reindex/-loadblock, or a misbehaving peer.
- BOOST_REVERSE_FOREACH(const CTransaction& tx, block.vtx)
- if (!tx.IsCoinBase() && pindex->nHeight > Checkpoints::GetTotalBlocksEstimate())
- vResurrect.push_front(tx);
- }
-
- // Connect longer branch
- vector<CTransaction> vDelete;
- BOOST_FOREACH(CBlockIndex *pindex, vConnect) {
- CBlock block;
- if (!ReadBlockFromDisk(block, pindex))
- return state.Abort(_("Failed to read block"));
- int64_t nStart = GetTimeMicros();
- if (!ConnectBlock(block, state, pindex, view)) {
- if (state.IsInvalid()) {
- InvalidChainFound(pindexNew);
- InvalidBlockFound(pindex);
- }
- return error("SetBestBlock() : ConnectBlock %s failed", pindex->GetBlockHash().ToString().c_str());
- }
- if (fBenchmark)
- LogPrintf("- Connect: %.2fms\n", (GetTimeMicros() - nStart) * 0.001);
-
- // Queue memory transactions to delete
- BOOST_FOREACH(const CTransaction& tx, block.vtx)
- vDelete.push_back(tx);
- }
-
- // Flush changes to global coin state
- int64_t nStart = GetTimeMicros();
- int nModified = view.GetCacheSize();
- bool ret;
- ret = view.Flush();
- assert(ret);
- int64_t nTime = GetTimeMicros() - nStart;
- if (fBenchmark)
- LogPrintf("- Flush %i transactions: %.2fms (%.4fms/tx)\n", nModified, 0.001 * nTime, 0.001 * nTime / nModified);
-
- // Make sure it's successfully written to disk before changing memory structure
- bool fIsInitialDownload = IsInitialBlockDownload();
- if (!fIsInitialDownload || pcoinsTip->GetCacheSize() > nCoinCacheSize) {
+// Update the on-disk chain state.
+bool static WriteChainState(CValidationState &state) {
+ static int64_t nLastWrite = 0;
+ if (!IsInitialBlockDownload() || pcoinsTip->GetCacheSize() > nCoinCacheSize || GetTimeMicros() > nLastWrite + 600*1000000) {
// Typical CCoins structures on disk are around 100 bytes in size.
// Pushing a new one to the database can cause it to be written
// twice (once in the log, and once in the tables). This is already
// an overestimation, as most will delete an existing entry or
// overwrite one. Still, use a conservative safety factor of 2.
if (!CheckDiskSpace(100 * 2 * 2 * pcoinsTip->GetCacheSize()))
- return state.Error();
+ return state.Error("out of disk space");
FlushBlockFile();
pblocktree->Sync();
if (!pcoinsTip->Flush())
return state.Abort(_("Failed to write to coin database"));
+ nLastWrite = GetTimeMicros();
}
+ return true;
+}
- // At this point, all changes have been done to the database.
- // Proceed by updating the memory structures.
-
- // Register new best chain
+// Update chainActive and related internal data structures.
+void static UpdateTip(CBlockIndex *pindexNew) {
chainActive.SetTip(pindexNew);
- // Resurrect memory transactions that were in the disconnected branch
- BOOST_FOREACH(CTransaction& tx, vResurrect) {
- // ignore validation errors in resurrected transactions
- CValidationState stateDummy;
- if (!AcceptToMemoryPool(mempool,stateDummy, tx, false, NULL))
- mempool.remove(tx, true);
- }
-
- // Delete redundant memory transactions that are in the connected branch
- BOOST_FOREACH(CTransaction& tx, vDelete) {
- mempool.remove(tx);
- mempool.removeConflicts(tx);
- }
-
- mempool.check(pcoinsTip);
-
// Update best block in wallet (so we can detect restored wallets)
- if ((pindexNew->nHeight % 20160) == 0 || (!fIsInitialDownload && (pindexNew->nHeight % 144) == 0))
- g_signals.SetBestChain(chainActive.GetLocator(pindexNew));
+ bool fIsInitialDownload = IsInitialBlockDownload();
+ if ((chainActive.Height() % 20160) == 0 || (!fIsInitialDownload && (chainActive.Height() % 144) == 0))
+ g_signals.SetBestChain(chainActive.GetLocator());
// New best block
nTimeBestReceived = GetTime();
mempool.AddTransactionsUpdated(1);
- LogPrintf("SetBestChain: new best=%s height=%d log2_work=%.8g tx=%lu date=%s progress=%f\n",
- chainActive.Tip()->GetBlockHash().ToString().c_str(), chainActive.Height(), log(chainActive.Tip()->nChainWork.getdouble())/log(2.0), (unsigned long)pindexNew->nChainTx,
- DateTimeStrFormat("%Y-%m-%d %H:%M:%S", chainActive.Tip()->GetBlockTime()).c_str(),
+ LogPrintf("UpdateTip: new best=%s height=%d log2_work=%.8g tx=%lu date=%s progress=%f\n",
+ chainActive.Tip()->GetBlockHash().ToString(), chainActive.Height(), log(chainActive.Tip()->nChainWork.getdouble())/log(2.0), (unsigned long)chainActive.Tip()->nChainTx,
+ DateTimeStrFormat("%Y-%m-%d %H:%M:%S", chainActive.Tip()->GetBlockTime()),
Checkpoints::GuessVerificationProgress(chainActive.Tip()));
// Check the version of the last 100 blocks to see if we need to upgrade:
@@ -1884,34 +1837,202 @@ bool SetBestChain(CValidationState &state, CBlockIndex* pindexNew)
pindex = pindex->pprev;
}
if (nUpgraded > 0)
- LogPrintf("SetBestChain: %d of last 100 blocks above version %d\n", nUpgraded, CBlock::CURRENT_VERSION);
+ LogPrintf("SetBestChain: %d of last 100 blocks above version %d\n", nUpgraded, (int)CBlock::CURRENT_VERSION);
if (nUpgraded > 100/2)
// strMiscWarning is read by GetWarnings(), called by Qt and the JSON-RPC code to warn the user:
strMiscWarning = _("Warning: This version is obsolete, upgrade required!");
}
+}
- std::string strCmd = GetArg("-blocknotify", "");
-
- if (!fIsInitialDownload && !strCmd.empty())
+// Disconnect chainActive's tip.
+bool static DisconnectTip(CValidationState &state) {
+ CBlockIndex *pindexDelete = chainActive.Tip();
+ assert(pindexDelete);
+ mempool.check(pcoinsTip);
+ // Read block from disk.
+ CBlock block;
+ if (!ReadBlockFromDisk(block, pindexDelete))
+ return state.Abort(_("Failed to read block"));
+ // Apply the block atomically to the chain state.
+ int64_t nStart = GetTimeMicros();
{
- boost::replace_all(strCmd, "%s", chainActive.Tip()->GetBlockHash().GetHex());
- boost::thread t(runCommand, strCmd); // thread runs free
+ CCoinsViewCache view(*pcoinsTip, true);
+ if (!DisconnectBlock(block, state, pindexDelete, view))
+ return error("DisconnectTip() : DisconnectBlock %s failed", pindexDelete->GetBlockHash().ToString());
+ assert(view.Flush());
+ }
+ if (fBenchmark)
+ LogPrintf("- Disconnect: %.2fms\n", (GetTimeMicros() - nStart) * 0.001);
+ // Write the chain state to disk, if necessary.
+ if (!WriteChainState(state))
+ return false;
+ // Ressurect mempool transactions from the disconnected block.
+ BOOST_FOREACH(const CTransaction &tx, block.vtx) {
+ // ignore validation errors in resurrected transactions
+ CValidationState stateDummy;
+ if (!tx.IsCoinBase())
+ if (!AcceptToMemoryPool(mempool, stateDummy, tx, false, NULL))
+ mempool.remove(tx, true);
}
+ mempool.check(pcoinsTip);
+ // Update chainActive and related variables.
+ UpdateTip(pindexDelete->pprev);
+ return true;
+}
+// Connect a new block to chainActive.
+bool static ConnectTip(CValidationState &state, CBlockIndex *pindexNew) {
+ assert(pindexNew->pprev == chainActive.Tip());
+ mempool.check(pcoinsTip);
+ // Read block from disk.
+ CBlock block;
+ if (!ReadBlockFromDisk(block, pindexNew))
+ return state.Abort(_("Failed to read block"));
+ // Apply the block atomically to the chain state.
+ int64_t nStart = GetTimeMicros();
+ {
+ CCoinsViewCache view(*pcoinsTip, true);
+ CInv inv(MSG_BLOCK, pindexNew->GetBlockHash());
+ if (!ConnectBlock(block, state, pindexNew, view)) {
+ if (state.IsInvalid())
+ InvalidBlockFound(pindexNew, state);
+ return error("ConnectTip() : ConnectBlock %s failed", pindexNew->GetBlockHash().ToString());
+ }
+ mapBlockSource.erase(inv.hash);
+ assert(view.Flush());
+ }
+ if (fBenchmark)
+ LogPrintf("- Connect: %.2fms\n", (GetTimeMicros() - nStart) * 0.001);
+ // Write the chain state to disk, if necessary.
+ if (!WriteChainState(state))
+ return false;
+ // Remove conflicting transactions from the mempool.
+ BOOST_FOREACH(const CTransaction &tx, block.vtx) {
+ mempool.remove(tx);
+ mempool.removeConflicts(tx);
+ }
+ mempool.check(pcoinsTip);
+ // Update chainActive & related variables.
+ UpdateTip(pindexNew);
return true;
}
+// Make chainMostWork correspond to the chain with the most work in it, that isn't
+// known to be invalid (it's however far from certain to be valid).
+void static FindMostWorkChain() {
+ CBlockIndex *pindexNew = NULL;
+
+ // In case the current best is invalid, do not consider it.
+ while (chainMostWork.Tip() && (chainMostWork.Tip()->nStatus & BLOCK_FAILED_MASK)) {
+ setBlockIndexValid.erase(chainMostWork.Tip());
+ chainMostWork.SetTip(chainMostWork.Tip()->pprev);
+ }
+
+ do {
+ // Find the best candidate header.
+ {
+ std::set<CBlockIndex*, CBlockIndexWorkComparator>::reverse_iterator it = setBlockIndexValid.rbegin();
+ if (it == setBlockIndexValid.rend())
+ return;
+ pindexNew = *it;
+ }
+
+ // Check whether all blocks on the path between the currently active chain and the candidate are valid.
+ // Just going until the active chain is an optimization, as we know all blocks in it are valid already.
+ CBlockIndex *pindexTest = pindexNew;
+ bool fInvalidAncestor = false;
+ while (pindexTest && !chainActive.Contains(pindexTest)) {
+ if (pindexTest->nStatus & BLOCK_FAILED_MASK) {
+ // Candidate has an invalid ancestor, remove entire chain from the set.
+ if (pindexBestInvalid == NULL || pindexNew->nChainWork > pindexBestInvalid->nChainWork)
+ pindexBestInvalid = pindexNew; CBlockIndex *pindexFailed = pindexNew;
+ while (pindexTest != pindexFailed) {
+ pindexFailed->nStatus |= BLOCK_FAILED_CHILD;
+ setBlockIndexValid.erase(pindexFailed);
+ pindexFailed = pindexFailed->pprev;
+ }
+ fInvalidAncestor = true;
+ break;
+ }
+ pindexTest = pindexTest->pprev;
+ }
+ if (fInvalidAncestor)
+ continue;
+
+ break;
+ } while(true);
+
+ // Check whether it's actually an improvement.
+ if (chainMostWork.Tip() && !CBlockIndexWorkComparator()(chainMostWork.Tip(), pindexNew))
+ return;
+
+ // We have a new best.
+ chainMostWork.SetTip(pindexNew);
+}
+
+// Try to activate to the most-work chain (thereby connecting it).
+bool ActivateBestChain(CValidationState &state) {
+ CBlockIndex *pindexOldTip = chainActive.Tip();
+ bool fComplete = false;
+ while (!fComplete) {
+ FindMostWorkChain();
+ fComplete = true;
+
+ // Check whether we have something to do.
+ if (chainMostWork.Tip() == NULL) break;
+
+ // Disconnect active blocks which are no longer in the best chain.
+ while (chainActive.Tip() && !chainMostWork.Contains(chainActive.Tip())) {
+ if (!DisconnectTip(state))
+ return false;
+ }
+
+ // Connect new blocks.
+ while (!chainActive.Contains(chainMostWork.Tip())) {
+ CBlockIndex *pindexConnect = chainMostWork[chainActive.Height() + 1];
+ if (!ConnectTip(state, pindexConnect)) {
+ if (state.IsInvalid()) {
+ // The block violates a consensus rule.
+ if (!state.CorruptionPossible())
+ InvalidChainFound(chainMostWork.Tip());
+ fComplete = false;
+ state = CValidationState();
+ break;
+ } else {
+ // A system error occurred (disk space, database error, ...).
+ return false;
+ }
+ }
+ }
+ }
+
+ if (chainActive.Tip() != pindexOldTip) {
+ std::string strCmd = GetArg("-blocknotify", "");
+ if (!IsInitialBlockDownload() && !strCmd.empty())
+ {
+ boost::replace_all(strCmd, "%s", chainActive.Tip()->GetBlockHash().GetHex());
+ boost::thread t(runCommand, strCmd); // thread runs free
+ }
+ }
+
+ return true;
+}
bool AddToBlockIndex(CBlock& block, CValidationState& state, const CDiskBlockPos& pos)
{
// Check for duplicate
uint256 hash = block.GetHash();
if (mapBlockIndex.count(hash))
- return state.Invalid(error("AddToBlockIndex() : %s already exists", hash.ToString().c_str()));
+ return state.Invalid(error("AddToBlockIndex() : %s already exists", hash.ToString()), 0, "duplicate");
// Construct new block index object
CBlockIndex* pindexNew = new CBlockIndex(block);
+ {
+ LOCK(cs_nBlockSequenceId);
+ pindexNew->nSequenceId = nBlockSequenceId++;
+ }
assert(pindexNew);
+ mapAlreadyAskedFor.erase(CInv(MSG_BLOCK, hash));
map<uint256, CBlockIndex*>::iterator mi = mapBlockIndex.insert(make_pair(hash, pindexNew)).first;
pindexNew->phashBlock = &((*mi).first);
map<uint256, CBlockIndex*>::iterator miPrev = mapBlockIndex.find(block.hashPrevBlock);
@@ -1933,7 +2054,7 @@ bool AddToBlockIndex(CBlock& block, CValidationState& state, const CDiskBlockPos
return state.Abort(_("Failed to write block index"));
// New best?
- if (!ConnectBestBlock(state))
+ if (!ActivateBestChain(state))
return false;
if (pindexNew == chainActive.Tip())
@@ -1970,7 +2091,7 @@ bool FindBlockPos(CValidationState &state, CDiskBlockPos &pos, unsigned int nAdd
}
} else {
while (infoLastBlockFile.nSize + nAddSize >= MAX_BLOCKFILE_SIZE) {
- LogPrintf("Leaving block file %i: %s\n", nLastBlockFile, infoLastBlockFile.ToString().c_str());
+ LogPrintf("Leaving block file %i: %s\n", nLastBlockFile, infoLastBlockFile.ToString());
FlushBlockFile(true);
nLastBlockFile++;
infoLastBlockFile.SetNull();
@@ -1997,7 +2118,7 @@ bool FindBlockPos(CValidationState &state, CDiskBlockPos &pos, unsigned int nAdd
}
}
else
- return state.Error();
+ return state.Error("out of disk space");
}
}
@@ -2043,7 +2164,7 @@ bool FindUndoPos(CValidationState &state, int nFile, CDiskBlockPos &pos, unsigne
}
}
else
- return state.Error();
+ return state.Error("out of disk space");
}
return true;
@@ -2058,26 +2179,26 @@ bool CheckBlock(const CBlock& block, CValidationState& state, bool fCheckPOW, bo
// Size limits
if (block.vtx.empty() || block.vtx.size() > MAX_BLOCK_SIZE || ::GetSerializeSize(block, SER_NETWORK, PROTOCOL_VERSION) > MAX_BLOCK_SIZE)
return state.DoS(100, error("CheckBlock() : size limits failed"),
- REJECT_INVALID, "block size too large");
+ REJECT_INVALID, "bad-blk-length");
// Check proof of work matches claimed amount
if (fCheckPOW && !CheckProofOfWork(block.GetHash(), block.nBits))
return state.DoS(50, error("CheckBlock() : proof of work failed"),
- REJECT_INVALID, "invalid pow");
+ REJECT_INVALID, "high-hash");
// Check timestamp
if (block.GetBlockTime() > GetAdjustedTime() + 2 * 60 * 60)
return state.Invalid(error("CheckBlock() : block timestamp too far in the future"),
- REJECT_INVALID, "time in future");
+ REJECT_INVALID, "time-too-new");
// First transaction must be coinbase, the rest must not be
if (block.vtx.empty() || !block.vtx[0].IsCoinBase())
return state.DoS(100, error("CheckBlock() : first tx is not coinbase"),
- REJECT_INVALID, "no coinbase");
+ REJECT_INVALID, "bad-cb-missing");
for (unsigned int i = 1; i < block.vtx.size(); i++)
if (block.vtx[i].IsCoinBase())
return state.DoS(100, error("CheckBlock() : more than one coinbase"),
- REJECT_INVALID, "duplicate coinbase");
+ REJECT_INVALID, "bad-cb-multiple");
// Check transactions
BOOST_FOREACH(const CTransaction& tx, block.vtx)
@@ -2097,7 +2218,7 @@ bool CheckBlock(const CBlock& block, CValidationState& state, bool fCheckPOW, bo
}
if (uniqueTx.size() != block.vtx.size())
return state.DoS(100, error("CheckBlock() : duplicate transaction"),
- REJECT_INVALID, "duplicate transaction", true);
+ REJECT_INVALID, "bad-txns-duplicate", true);
unsigned int nSigOps = 0;
BOOST_FOREACH(const CTransaction& tx, block.vtx)
@@ -2106,12 +2227,12 @@ bool CheckBlock(const CBlock& block, CValidationState& state, bool fCheckPOW, bo
}
if (nSigOps > MAX_BLOCK_SIGOPS)
return state.DoS(100, error("CheckBlock() : out-of-bounds SigOpCount"),
- REJECT_INVALID, "sig op count", true);
+ REJECT_INVALID, "bad-blk-sigops", true);
// Check merkle root
if (fCheckMerkleRoot && block.hashMerkleRoot != block.vMerkleTree.back())
return state.DoS(100, error("CheckBlock() : hashMerkleRoot mismatch"),
- REJECT_INVALID, "bad merkle root", true);
+ REJECT_INVALID, "bad-txnmrklroot", true);
return true;
}
@@ -2121,7 +2242,7 @@ bool AcceptBlock(CBlock& block, CValidationState& state, CDiskBlockPos* dbp)
// Check for duplicate
uint256 hash = block.GetHash();
if (mapBlockIndex.count(hash))
- return state.Invalid(error("AcceptBlock() : block already in mapBlockIndex"));
+ return state.Invalid(error("AcceptBlock() : block already in mapBlockIndex"), 0, "duplicate");
// Get prev block index
CBlockIndex* pindexPrev = NULL;
@@ -2129,31 +2250,36 @@ bool AcceptBlock(CBlock& block, CValidationState& state, CDiskBlockPos* dbp)
if (hash != Params().HashGenesisBlock()) {
map<uint256, CBlockIndex*>::iterator mi = mapBlockIndex.find(block.hashPrevBlock);
if (mi == mapBlockIndex.end())
- return state.DoS(10, error("AcceptBlock() : prev block not found"));
+ return state.DoS(10, error("AcceptBlock() : prev block not found"), 0, "bad-prevblk");
pindexPrev = (*mi).second;
nHeight = pindexPrev->nHeight+1;
// Check proof of work
if (block.nBits != GetNextWorkRequired(pindexPrev, &block))
return state.DoS(100, error("AcceptBlock() : incorrect proof of work"),
- REJECT_INVALID, "bad pow");
+ REJECT_INVALID, "bad-diffbits");
// Check timestamp against prev
if (block.GetBlockTime() <= pindexPrev->GetMedianTimePast())
return state.Invalid(error("AcceptBlock() : block's timestamp is too early"),
- REJECT_INVALID, "timestamp too early");
+ REJECT_INVALID, "time-too-old");
// Check that all transactions are finalized
BOOST_FOREACH(const CTransaction& tx, block.vtx)
if (!IsFinalTx(tx, nHeight, block.GetBlockTime()))
return state.DoS(10, error("AcceptBlock() : contains a non-final transaction"),
- REJECT_INVALID, "non-final tx");
+ REJECT_INVALID, "bad-txns-nonfinal");
// Check that the block chain matches the known block chain up to a checkpoint
if (!Checkpoints::CheckBlock(nHeight, hash))
return state.DoS(100, error("AcceptBlock() : rejected by checkpoint lock-in at %d", nHeight),
REJECT_CHECKPOINT, "checkpoint mismatch");
+ // Don't accept any forks from the main chain prior to last checkpoint
+ CBlockIndex* pcheckpoint = Checkpoints::GetLastCheckpoint(mapBlockIndex);
+ if (pcheckpoint && nHeight < pcheckpoint->nHeight)
+ return state.DoS(100, error("AcceptBlock() : forked chain older than last checkpoint (height %d)", nHeight));
+
// Reject block.nVersion=1 blocks when 95% (75% on testnet) of the network has upgraded:
if (block.nVersion < 2)
{
@@ -2161,7 +2287,7 @@ bool AcceptBlock(CBlock& block, CValidationState& state, CDiskBlockPos* dbp)
(TestNet() && CBlockIndex::IsSuperMajority(2, pindexPrev, 75, 100)))
{
return state.Invalid(error("AcceptBlock() : rejected nVersion=1 block"),
- REJECT_OBSOLETE, "version 1 blocks obsolete");
+ REJECT_OBSOLETE, "bad-version");
}
}
// Enforce block.nVersion=2 rule that the coinbase starts with serialized block height
@@ -2175,7 +2301,7 @@ bool AcceptBlock(CBlock& block, CValidationState& state, CDiskBlockPos* dbp)
if (block.vtx[0].vin[0].scriptSig.size() < expect.size() ||
!std::equal(expect.begin(), expect.end(), block.vtx[0].vin[0].scriptSig.begin()))
return state.DoS(100, error("AcceptBlock() : block height mismatch in coinbase"),
- REJECT_INVALID, "height incorrect in coinbase");
+ REJECT_INVALID, "bad-cb-height");
}
}
}
@@ -2252,13 +2378,16 @@ bool ProcessBlock(CValidationState &state, CNode* pfrom, CBlock* pblock, CDiskBl
// Check for duplicate
uint256 hash = pblock->GetHash();
if (mapBlockIndex.count(hash))
- return state.Invalid(error("ProcessBlock() : already have block %d %s", mapBlockIndex[hash]->nHeight, hash.ToString().c_str()));
+ return state.Invalid(error("ProcessBlock() : already have block %d %s", mapBlockIndex[hash]->nHeight, hash.ToString()), 0, "duplicate");
if (mapOrphanBlocks.count(hash))
- return state.Invalid(error("ProcessBlock() : already have block (orphan) %s", hash.ToString().c_str()));
+ return state.Invalid(error("ProcessBlock() : already have block (orphan) %s", hash.ToString()), 0, "duplicate");
// Preliminary checks
- if (!CheckBlock(*pblock, state))
+ if (!CheckBlock(*pblock, state)) {
+ if (state.CorruptionPossible())
+ mapAlreadyAskedFor.erase(CInv(MSG_BLOCK, hash));
return error("ProcessBlock() : CheckBlock FAILED");
+ }
CBlockIndex* pcheckpoint = Checkpoints::GetLastCheckpoint(mapBlockIndex);
if (pcheckpoint && pblock->hashPrevBlock != (chainActive.Tip() ? chainActive.Tip()->GetBlockHash() : uint256(0)))
@@ -2268,7 +2397,7 @@ bool ProcessBlock(CValidationState &state, CNode* pfrom, CBlock* pblock, CDiskBl
if (deltaTime < 0)
{
return state.DoS(100, error("ProcessBlock() : block with timestamp before last checkpoint"),
- REJECT_CHECKPOINT, "timestamp before checkpoint");
+ REJECT_CHECKPOINT, "time-too-old");
}
CBigNum bnNewBlock;
bnNewBlock.SetCompact(pblock->nBits);
@@ -2277,7 +2406,7 @@ bool ProcessBlock(CValidationState &state, CNode* pfrom, CBlock* pblock, CDiskBl
if (bnNewBlock > bnRequired)
{
return state.DoS(100, error("ProcessBlock() : block with too little proof-of-work"),
- REJECT_INVALID, "invalid pow");
+ REJECT_INVALID, "bad-diffbits");
}
}
@@ -2285,10 +2414,11 @@ bool ProcessBlock(CValidationState &state, CNode* pfrom, CBlock* pblock, CDiskBl
// If we don't already have its previous block, shunt it off to holding area until we get it
if (pblock->hashPrevBlock != 0 && !mapBlockIndex.count(pblock->hashPrevBlock))
{
- LogPrintf("ProcessBlock: ORPHAN BLOCK, prev=%s\n", pblock->hashPrevBlock.ToString().c_str());
+ LogPrintf("ProcessBlock: ORPHAN BLOCK %lu, prev=%s\n", (unsigned long)mapOrphanBlocks.size(), pblock->hashPrevBlock.ToString());
// Accept orphans as long as there is a node to request its parents from
if (pfrom) {
+ PruneOrphanBlocks();
COrphanBlock* pblock2 = new COrphanBlock();
{
CDataStream ss(SER_DISK, CLIENT_VERSION);
@@ -2502,7 +2632,7 @@ uint256 CPartialMerkleTree::ExtractMatches(std::vector<uint256> &vMatch) {
bool AbortNode(const std::string &strMessage) {
strMiscWarning = strMessage;
- LogPrintf("*** %s\n", strMessage.c_str());
+ LogPrintf("*** %s\n", strMessage);
uiInterface.ThreadSafeMessageBox(strMessage, "", CClientUIInterface::MSG_ERROR);
StartShutdown();
return false;
@@ -2529,12 +2659,12 @@ FILE* OpenDiskFile(const CDiskBlockPos &pos, const char *prefix, bool fReadOnly)
if (!file && !fReadOnly)
file = fopen(path.string().c_str(), "wb+");
if (!file) {
- LogPrintf("Unable to open file %s\n", path.string().c_str());
+ LogPrintf("Unable to open file %s\n", path.string());
return NULL;
}
if (pos.nPos) {
if (fseek(file, pos.nPos, SEEK_SET)) {
- LogPrintf("Unable to seek to position %u of %s\n", pos.nPos, path.string().c_str());
+ LogPrintf("Unable to seek to position %u of %s\n", pos.nPos, path.string());
fclose(file);
return NULL;
}
@@ -2601,7 +2731,7 @@ bool static LoadBlockIndexDB()
pblocktree->ReadLastBlockFile(nLastBlockFile);
LogPrintf("LoadBlockIndexDB(): last block file = %i\n", nLastBlockFile);
if (pblocktree->ReadBlockFileInfo(nLastBlockFile, infoLastBlockFile))
- LogPrintf("LoadBlockIndexDB(): last block file info: %s\n", infoLastBlockFile.ToString().c_str());
+ LogPrintf("LoadBlockIndexDB(): last block file info: %s\n", infoLastBlockFile.ToString());
// Check whether we need to continue reindexing
bool fReindexing = false;
@@ -2618,8 +2748,8 @@ bool static LoadBlockIndexDB()
return true;
chainActive.SetTip(it->second);
LogPrintf("LoadBlockIndexDB(): hashBestChain=%s height=%d date=%s\n",
- chainActive.Tip()->GetBlockHash().ToString().c_str(), chainActive.Height(),
- DateTimeStrFormat("%Y-%m-%d %H:%M:%S", chainActive.Tip()->GetBlockTime()).c_str());
+ chainActive.Tip()->GetBlockHash().ToString(), chainActive.Height(),
+ DateTimeStrFormat("%Y-%m-%d %H:%M:%S", chainActive.Tip()->GetBlockTime()));
return true;
}
@@ -2649,24 +2779,24 @@ bool VerifyDB(int nCheckLevel, int nCheckDepth)
CBlock block;
// check level 0: read from disk
if (!ReadBlockFromDisk(block, pindex))
- return error("VerifyDB() : *** ReadBlockFromDisk failed at %d, hash=%s", pindex->nHeight, pindex->GetBlockHash().ToString().c_str());
+ return error("VerifyDB() : *** ReadBlockFromDisk failed at %d, hash=%s", pindex->nHeight, pindex->GetBlockHash().ToString());
// check level 1: verify block validity
if (nCheckLevel >= 1 && !CheckBlock(block, state))
- return error("VerifyDB() : *** found bad block at %d, hash=%s\n", pindex->nHeight, pindex->GetBlockHash().ToString().c_str());
+ return error("VerifyDB() : *** found bad block at %d, hash=%s\n", pindex->nHeight, pindex->GetBlockHash().ToString());
// check level 2: verify undo validity
if (nCheckLevel >= 2 && pindex) {
CBlockUndo undo;
CDiskBlockPos pos = pindex->GetUndoPos();
if (!pos.IsNull()) {
if (!undo.ReadFromDisk(pos, pindex->pprev->GetBlockHash()))
- return error("VerifyDB() : *** found bad undo data at %d, hash=%s\n", pindex->nHeight, pindex->GetBlockHash().ToString().c_str());
+ return error("VerifyDB() : *** found bad undo data at %d, hash=%s\n", pindex->nHeight, pindex->GetBlockHash().ToString());
}
}
// check level 3: check for inconsistencies during memory-only disconnect of tip blocks
if (nCheckLevel >= 3 && pindex == pindexState && (coins.GetCacheSize() + pcoinsTip->GetCacheSize()) <= 2*nCoinCacheSize + 32000) {
bool fClean = true;
if (!DisconnectBlock(block, state, pindex, coins, &fClean))
- return error("VerifyDB() : *** irrecoverable inconsistency in block data at %d, hash=%s", pindex->nHeight, pindex->GetBlockHash().ToString().c_str());
+ return error("VerifyDB() : *** irrecoverable inconsistency in block data at %d, hash=%s", pindex->nHeight, pindex->GetBlockHash().ToString());
pindexState = pindex->pprev;
if (!fClean) {
nGoodTransactions = 0;
@@ -2686,9 +2816,9 @@ bool VerifyDB(int nCheckLevel, int nCheckDepth)
pindex = chainActive.Next(pindex);
CBlock block;
if (!ReadBlockFromDisk(block, pindex))
- return error("VerifyDB() : *** ReadBlockFromDisk failed at %d, hash=%s", pindex->nHeight, pindex->GetBlockHash().ToString().c_str());
+ return error("VerifyDB() : *** ReadBlockFromDisk failed at %d, hash=%s", pindex->nHeight, pindex->GetBlockHash().ToString());
if (!ConnectBlock(block, state, pindex, coins))
- return error("VerifyDB() : *** found unconnectable block at %d, hash=%s", pindex->nHeight, pindex->GetBlockHash().ToString().c_str());
+ return error("VerifyDB() : *** found unconnectable block at %d, hash=%s", pindex->nHeight, pindex->GetBlockHash().ToString());
}
}
@@ -2796,7 +2926,7 @@ void PrintBlockTree()
LogPrintf("%d (blk%05u.dat:0x%x) %s tx %"PRIszu"",
pindex->nHeight,
pindex->GetBlockPos().nFile, pindex->GetBlockPos().nPos,
- DateTimeStrFormat("%Y-%m-%d %H:%M:%S", block.GetBlockTime()).c_str(),
+ DateTimeStrFormat("%Y-%m-%d %H:%M:%S", block.GetBlockTime()),
block.vtx.size());
// put the main time-chain first
@@ -2987,24 +3117,6 @@ bool static AlreadyHave(const CInv& inv)
}
-void Misbehaving(NodeId pnode, int howmuch)
-{
- if (howmuch == 0)
- return;
-
- CNodeState *state = State(pnode);
- if (state == NULL)
- return;
-
- state->nMisbehavior += howmuch;
- if (state->nMisbehavior >= GetArg("-banscore", 100))
- {
- LogPrintf("Misbehaving: %s (%d -> %d) BAN THRESHOLD EXCEEDED\n", state->name.c_str(), state->nMisbehavior-howmuch, state->nMisbehavior);
- state->fShouldBan = true;
- } else
- LogPrintf("Misbehaving: %s (%d -> %d)\n", state->name.c_str(), state->nMisbehavior-howmuch, state->nMisbehavior);
-}
-
void static ProcessGetData(CNode* pfrom)
{
std::deque<CInv>::iterator it = pfrom->vRecvGetData.begin();
@@ -3025,10 +3137,28 @@ void static ProcessGetData(CNode* pfrom)
if (inv.type == MSG_BLOCK || inv.type == MSG_FILTERED_BLOCK)
{
- // Send block from disk
+ bool send = false;
map<uint256, CBlockIndex*>::iterator mi = mapBlockIndex.find(inv.hash);
if (mi != mapBlockIndex.end())
{
+ // If the requested block is at a height below our last
+ // checkpoint, only serve it if it's in the checkpointed chain
+ int nHeight = mi->second->nHeight;
+ CBlockIndex* pcheckpoint = Checkpoints::GetLastCheckpoint(mapBlockIndex);
+ if (pcheckpoint && nHeight < pcheckpoint->nHeight) {
+ if (!chainActive.Contains(mi->second))
+ {
+ LogPrintf("ProcessGetData(): ignoring request for old block that isn't in the main chain\n");
+ } else {
+ send = true;
+ }
+ } else {
+ send = true;
+ }
+ }
+ if (send)
+ {
+ // Send block from disk
CBlock block;
ReadBlockFromDisk(block, (*mi).second);
if (inv.type == MSG_BLOCK)
@@ -3120,7 +3250,7 @@ void static ProcessGetData(CNode* pfrom)
bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
{
RandAddSeedPerfmon();
- LogPrint("net", "received: %s (%"PRIszu" bytes)\n", strCommand.c_str(), vRecv.size());
+ LogPrint("net", "received: %s (%"PRIszu" bytes)\n", strCommand, vRecv.size());
if (mapArgs.count("-dropmessagestest") && GetRand(atoi(mapArgs["-dropmessagestest"])) == 0)
{
LogPrintf("dropmessagestest DROPPING RECV MESSAGE\n");
@@ -3149,7 +3279,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
if (pfrom->nVersion < MIN_PEER_PROTO_VERSION)
{
// disconnect from peers older than this proto version
- LogPrintf("partner %s using obsolete version %i; disconnecting\n", pfrom->addr.ToString().c_str(), pfrom->nVersion);
+ LogPrintf("partner %s using obsolete version %i; disconnecting\n", pfrom->addr.ToString(), pfrom->nVersion);
pfrom->PushMessage("reject", strCommand, REJECT_OBSOLETE,
strprintf("Version must be %d or greater", MIN_PEER_PROTO_VERSION));
pfrom->fDisconnect = true;
@@ -3180,7 +3310,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
// Disconnect if we connected to ourself
if (nNonce == nLocalHostNonce && nNonce > 1)
{
- LogPrintf("connected to self at %s, disconnecting\n", pfrom->addr.ToString().c_str());
+ LogPrintf("connected to self at %s, disconnecting\n", pfrom->addr.ToString());
pfrom->fDisconnect = true;
return true;
}
@@ -3230,7 +3360,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
pfrom->fSuccessfullyConnected = true;
- LogPrintf("receive version message: %s: version %d, blocks=%d, us=%s, them=%s, peer=%s\n", pfrom->cleanSubVer.c_str(), pfrom->nVersion, pfrom->nStartingHeight, addrMe.ToString().c_str(), addrFrom.ToString().c_str(), pfrom->addr.ToString().c_str());
+ LogPrintf("receive version message: %s: version %d, blocks=%d, us=%s, them=%s, peer=%s\n", pfrom->cleanSubVer, pfrom->nVersion, pfrom->nStartingHeight, addrMe.ToString(), addrFrom.ToString(), pfrom->addr.ToString());
AddTimeData(pfrom->addr, nTime);
@@ -3349,7 +3479,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
pfrom->AddInventoryKnown(inv);
bool fAlreadyHave = AlreadyHave(inv);
- LogPrint("net", " got inventory: %s %s\n", inv.ToString().c_str(), fAlreadyHave ? "have" : "new");
+ LogPrint("net", " got inventory: %s %s\n", inv.ToString(), fAlreadyHave ? "have" : "new");
if (!fAlreadyHave) {
if (!fImporting && !fReindex)
@@ -3362,7 +3492,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
// this situation and push another getblocks to continue.
PushGetBlocks(pfrom, mapBlockIndex[inv.hash], uint256(0));
if (fDebug)
- LogPrintf("force request: %s\n", inv.ToString().c_str());
+ LogPrintf("force request: %s\n", inv.ToString());
}
// Track requests for our stuff
@@ -3385,7 +3515,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
LogPrint("net", "received getdata (%"PRIszu" invsz)\n", vInv.size());
if ((fDebug && vInv.size() > 0) || (vInv.size() == 1))
- LogPrint("net", "received getdata for: %s\n", vInv[0].ToString().c_str());
+ LogPrint("net", "received getdata for: %s\n", vInv[0].ToString());
pfrom->vRecvGetData.insert(pfrom->vRecvGetData.end(), vInv.begin(), vInv.end());
ProcessGetData(pfrom);
@@ -3407,12 +3537,12 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
if (pindex)
pindex = chainActive.Next(pindex);
int nLimit = 500;
- LogPrint("net", "getblocks %d to %s limit %d\n", (pindex ? pindex->nHeight : -1), hashStop.ToString().c_str(), nLimit);
+ LogPrint("net", "getblocks %d to %s limit %d\n", (pindex ? pindex->nHeight : -1), hashStop.ToString(), nLimit);
for (; pindex; pindex = chainActive.Next(pindex))
{
if (pindex->GetBlockHash() == hashStop)
{
- LogPrint("net", " getblocks stopping at %d %s\n", pindex->nHeight, pindex->GetBlockHash().ToString().c_str());
+ LogPrint("net", " getblocks stopping at %d %s\n", pindex->nHeight, pindex->GetBlockHash().ToString());
break;
}
pfrom->PushInventory(CInv(MSG_BLOCK, pindex->GetBlockHash()));
@@ -3420,7 +3550,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
{
// When this block is requested, we'll send an inv that'll make them
// getblocks the next batch of inventory.
- LogPrint("net", " getblocks stopping at limit %d %s\n", pindex->nHeight, pindex->GetBlockHash().ToString().c_str());
+ LogPrint("net", " getblocks stopping at limit %d %s\n", pindex->nHeight, pindex->GetBlockHash().ToString());
pfrom->hashContinue = pindex->GetBlockHash();
break;
}
@@ -3456,7 +3586,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
// we must use CBlocks, as CBlockHeaders won't include the 0x00 nTx count at the end
vector<CBlock> vHeaders;
int nLimit = 2000;
- LogPrint("net", "getheaders %d to %s\n", (pindex ? pindex->nHeight : -1), hashStop.ToString().c_str());
+ LogPrint("net", "getheaders %d to %s\n", (pindex ? pindex->nHeight : -1), hashStop.ToString());
for (; pindex; pindex = chainActive.Next(pindex))
{
vHeaders.push_back(pindex->GetBlockHeader());
@@ -3491,8 +3621,8 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
LogPrint("mempool", "AcceptToMemoryPool: %s %s : accepted %s (poolsz %"PRIszu")\n",
- pfrom->addr.ToString().c_str(), pfrom->cleanSubVer.c_str(),
- tx.GetHash().ToString().c_str(),
+ pfrom->addr.ToString(), pfrom->cleanSubVer,
+ tx.GetHash().ToString(),
mempool.mapTx.size());
// Recursively process any orphan transactions that depended on this one
@@ -3513,7 +3643,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
if (AcceptToMemoryPool(mempool, stateDummy, orphanTx, true, &fMissingInputs2))
{
- LogPrint("mempool", " accepted orphan tx %s\n", orphanHash.ToString().c_str());
+ LogPrint("mempool", " accepted orphan tx %s\n", orphanHash.ToString());
RelayTransaction(orphanTx, orphanHash);
mapAlreadyAskedFor.erase(CInv(MSG_TX, orphanHash));
vWorkQueue.push_back(orphanHash);
@@ -3523,7 +3653,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
{
// invalid or too-little-fee orphan
vEraseQueue.push_back(orphanHash);
- LogPrint("mempool", " removed orphan tx %s\n", orphanHash.ToString().c_str());
+ LogPrint("mempool", " removed orphan tx %s\n", orphanHash.ToString());
}
mempool.check(pcoinsTip);
}
@@ -3544,9 +3674,9 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
int nDoS = 0;
if (state.IsInvalid(nDoS))
{
- LogPrint("mempool", "%s from %s %s was not accepted into the memory pool: %s\n", tx.GetHash().ToString().c_str(),
- pfrom->addr.ToString().c_str(), pfrom->cleanSubVer.c_str(),
- state.GetRejectReason().c_str());
+ LogPrint("mempool", "%s from %s %s was not accepted into the memory pool: %s\n", tx.GetHash().ToString(),
+ pfrom->addr.ToString(), pfrom->cleanSubVer,
+ state.GetRejectReason());
pfrom->PushMessage("reject", strCommand, state.GetRejectCode(),
state.GetRejectReason(), inv.hash);
if (nDoS > 0)
@@ -3560,25 +3690,18 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
CBlock block;
vRecv >> block;
- LogPrint("net", "received block %s\n", block.GetHash().ToString().c_str());
+ LogPrint("net", "received block %s\n", block.GetHash().ToString());
// block.print();
CInv inv(MSG_BLOCK, block.GetHash());
pfrom->AddInventoryKnown(inv);
LOCK(cs_main);
+ // Remember who we got this block from.
+ mapBlockSource[inv.hash] = pfrom->GetId();
CValidationState state;
- if (ProcessBlock(state, pfrom, &block) || state.CorruptionPossible())
- mapAlreadyAskedFor.erase(inv);
- int nDoS = 0;
- if (state.IsInvalid(nDoS))
- {
- pfrom->PushMessage("reject", strCommand, state.GetRejectCode(),
- state.GetRejectReason(), inv.hash);
- if (nDoS > 0)
- Misbehaving(pfrom->GetId(), nDoS);
- }
+ ProcessBlock(state, pfrom, &block);
}
@@ -3682,9 +3805,9 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
if (!(sProblem.empty())) {
LogPrint("net", "pong %s %s: %s, %"PRIx64" expected, %"PRIx64" received, %"PRIszu" bytes\n",
- pfrom->addr.ToString().c_str(),
- pfrom->cleanSubVer.c_str(),
- sProblem.c_str(),
+ pfrom->addr.ToString(),
+ pfrom->cleanSubVer,
+ sProblem,
pfrom->nPingNonceSent,
nonce,
nAvail);
@@ -3793,7 +3916,7 @@ bool static ProcessMessage(CNode* pfrom, string strCommand, CDataStream& vRecv)
// Truncate to reasonable length and sanitize before printing:
string s = ss.str();
if (s.size() > 111) s.erase(111, string::npos);
- LogPrint("net", "Reject %s\n", SanitizeString(s).c_str());
+ LogPrint("net", "Reject %s\n", SanitizeString(s));
}
}
@@ -3866,7 +3989,7 @@ bool ProcessMessages(CNode* pfrom)
CMessageHeader& hdr = msg.hdr;
if (!hdr.IsValid())
{
- LogPrintf("\n\nPROCESSMESSAGE: ERRORS IN HEADER %s\n\n\n", hdr.GetCommand().c_str());
+ LogPrintf("\n\nPROCESSMESSAGE: ERRORS IN HEADER %s\n\n\n", hdr.GetCommand());
continue;
}
string strCommand = hdr.GetCommand();
@@ -3882,7 +4005,7 @@ bool ProcessMessages(CNode* pfrom)
if (nChecksum != hdr.nChecksum)
{
LogPrintf("ProcessMessages(%s, %u bytes) : CHECKSUM ERROR nChecksum=%08x hdr.nChecksum=%08x\n",
- strCommand.c_str(), nMessageSize, nChecksum, hdr.nChecksum);
+ strCommand, nMessageSize, nChecksum, hdr.nChecksum);
continue;
}
@@ -3899,12 +4022,12 @@ bool ProcessMessages(CNode* pfrom)
if (strstr(e.what(), "end of data"))
{
// Allow exceptions from under-length message on vRecv
- LogPrintf("ProcessMessages(%s, %u bytes) : Exception '%s' caught, normally caused by a message being shorter than its stated length\n", strCommand.c_str(), nMessageSize, e.what());
+ LogPrintf("ProcessMessages(%s, %u bytes) : Exception '%s' caught, normally caused by a message being shorter than its stated length\n", strCommand, nMessageSize, e.what());
}
else if (strstr(e.what(), "size too large"))
{
// Allow exceptions from over-long size
- LogPrintf("ProcessMessages(%s, %u bytes) : Exception '%s' caught\n", strCommand.c_str(), nMessageSize, e.what());
+ LogPrintf("ProcessMessages(%s, %u bytes) : Exception '%s' caught\n", strCommand, nMessageSize, e.what());
}
else
{
@@ -3921,7 +4044,7 @@ bool ProcessMessages(CNode* pfrom)
}
if (!fRet)
- LogPrintf("ProcessMessage(%s, %u bytes) FAILED\n", strCommand.c_str(), nMessageSize);
+ LogPrintf("ProcessMessage(%s, %u bytes) FAILED\n", strCommand, nMessageSize);
break;
}
@@ -4025,16 +4148,21 @@ bool SendMessages(CNode* pto, bool fSendTrickle)
if (!lockMain)
return true;
- if (State(pto->GetId())->fShouldBan) {
+ CNodeState &state = *State(pto->GetId());
+ if (state.fShouldBan) {
if (pto->addr.IsLocal())
- LogPrintf("Warning: not banning local node %s!\n", pto->addr.ToString().c_str());
+ LogPrintf("Warning: not banning local node %s!\n", pto->addr.ToString());
else {
pto->fDisconnect = true;
CNode::Ban(pto->addr);
}
- State(pto->GetId())->fShouldBan = false;
+ state.fShouldBan = false;
}
+ BOOST_FOREACH(const CBlockReject& reject, state.rejects)
+ pto->PushMessage("reject", (string)"block", reject.chRejectCode, reject.strRejectReason, reject.hashBlock);
+ state.rejects.clear();
+
// Start block sync
if (pto->fStartSync && !fImporting && !fReindex) {
pto->fStartSync = false;
@@ -4109,7 +4237,7 @@ bool SendMessages(CNode* pto, bool fSendTrickle)
if (!AlreadyHave(inv))
{
if (fDebug)
- LogPrint("net", "sending getdata: %s\n", inv.ToString().c_str());
+ LogPrint("net", "sending getdata: %s\n", inv.ToString());
vGetData.push_back(inv);
if (vGetData.size() >= 1000)
{
diff --git a/src/main.h b/src/main.h
index 60e733b23a..781562854f 100644
--- a/src/main.h
+++ b/src/main.h
@@ -1,5 +1,5 @@
// Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2013 The Bitcoin developers
+// Copyright (c) 2009-2014 The Bitcoin developers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
@@ -45,6 +45,8 @@ static const unsigned int MAX_STANDARD_TX_SIZE = 100000;
static const unsigned int MAX_BLOCK_SIGOPS = MAX_BLOCK_SIZE/50;
/** The maximum number of orphan transactions kept in memory */
static const unsigned int MAX_ORPHAN_TRANSACTIONS = MAX_BLOCK_SIZE/100;
+/** The maximum number of orphan blocks kept in memory */
+static const unsigned int MAX_ORPHAN_BLOCKS = 750;
/** The maximum size of a blk?????.dat file (since 0.8) */
static const unsigned int MAX_BLOCKFILE_SIZE = 0x8000000; // 128 MiB
/** The pre-allocation chunk size for blk?????.dat files (since 0.8) */
@@ -75,12 +77,6 @@ static const unsigned char REJECT_CHECKPOINT = 0x43;
extern CScript COINBASE_FLAGS;
-
-
-
-
-
-
extern CCriticalSection cs_main;
extern CTxMemPool mempool;
extern std::map<uint256, CBlockIndex*> mapBlockIndex;
@@ -94,7 +90,6 @@ extern bool fBenchmark;
extern int nScriptCheckThreads;
extern bool fTxIndex;
extern unsigned int nCoinCacheSize;
-extern bool fHaveGUI;
// Minimum disk space required - used in CheckDiskSpace()
static const uint64_t nMinDiskSpace = 52428800;
@@ -165,10 +160,8 @@ bool IsInitialBlockDownload();
std::string GetWarnings(std::string strFor);
/** Retrieve a transaction (from memory pool, or from disk, if possible) */
bool GetTransaction(const uint256 &hash, CTransaction &tx, uint256 &hashBlock, bool fAllowSlow = false);
-/** Connect/disconnect blocks until pindexNew is the new tip of the active block chain */
-bool SetBestChain(CValidationState &state, CBlockIndex* pindexNew);
/** Find the best known block, and make it the tip of the block chain */
-bool ConnectBestBlock(CValidationState &state);
+bool ActivateBestChain(CValidationState &state);
int64_t GetBlockValue(int nHeight, int64_t nFees);
unsigned int GetNextWorkRequired(const CBlockIndex* pindexLast, const CBlockHeader *pblock);
@@ -423,6 +416,8 @@ public:
/** A transaction with a merkle branch linking it to the block chain. */
class CMerkleTx : public CTransaction
{
+private:
+ int GetDepthInMainChainINTERNAL(CBlockIndex* &pindexRet) const;
public:
uint256 hashBlock;
std::vector<uint256> vMerkleBranch;
@@ -461,9 +456,14 @@ public:
int SetMerkleBranch(const CBlock* pblock=NULL);
+
+ // Return depth of transaction in blockchain:
+ // -1 : not in blockchain, and not in memory pool (conflicted transaction)
+ // 0 : in memory pool, waiting to be included in a block
+ // >=1 : this many blocks deep in the main chain
int GetDepthInMainChain(CBlockIndex* &pindexRet) const;
int GetDepthInMainChain() const { CBlockIndex *pindexRet; return GetDepthInMainChain(pindexRet); }
- bool IsInMainChain() const { return GetDepthInMainChain() > 0; }
+ bool IsInMainChain() const { CBlockIndex *pindexRet; return GetDepthInMainChainINTERNAL(pindexRet) > 0; }
int GetBlocksToMaturity() const;
bool AcceptToMemoryPool(bool fLimitFree=true);
};
@@ -716,6 +716,8 @@ public:
unsigned int nBits;
unsigned int nNonce;
+ // (memory only) Sequencial id assigned to distinguish order in which blocks are received.
+ uint32_t nSequenceId;
CBlockIndex()
{
@@ -729,6 +731,7 @@ public:
nTx = 0;
nChainTx = 0;
nStatus = 0;
+ nSequenceId = 0;
nVersion = 0;
hashMerkleRoot = 0;
@@ -749,6 +752,7 @@ public:
nTx = 0;
nChainTx = 0;
nStatus = 0;
+ nSequenceId = 0;
nVersion = block.nVersion;
hashMerkleRoot = block.hashMerkleRoot;
@@ -950,31 +954,33 @@ public:
unsigned char _chRejectCode=0, std::string _strRejectReason="") {
return DoS(0, ret, _chRejectCode, _strRejectReason);
}
- bool Error() {
+ bool Error(std::string strRejectReasonIn="") {
+ if (mode == MODE_VALID)
+ strRejectReason = strRejectReasonIn;
mode = MODE_ERROR;
return false;
}
bool Abort(const std::string &msg) {
AbortNode(msg);
- return Error();
+ return Error(msg);
}
- bool IsValid() {
+ bool IsValid() const {
return mode == MODE_VALID;
}
- bool IsInvalid() {
+ bool IsInvalid() const {
return mode == MODE_INVALID;
}
- bool IsError() {
+ bool IsError() const {
return mode == MODE_ERROR;
}
- bool IsInvalid(int &nDoSOut) {
+ bool IsInvalid(int &nDoSOut) const {
if (IsInvalid()) {
nDoSOut = nDoS;
return true;
}
return false;
}
- bool CorruptionPossible() {
+ bool CorruptionPossible() const {
return corruptionPossible;
}
unsigned char GetRejectCode() const { return chRejectCode; }
@@ -1041,6 +1047,8 @@ public:
/** The currently-connected chain of blocks. */
extern CChain chainActive;
+/** The currently best known chain of headers (some of which may be invalid). */
+extern CChain chainMostWork;
/** Global variable that points to the active CCoinsView (protected by cs_main) */
extern CCoinsViewCache *pcoinsTip;
diff --git a/src/miner.cpp b/src/miner.cpp
index 21a9fa256b..73dd0a749d 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -1,5 +1,5 @@
// Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2013 The Bitcoin developers
+// Copyright (c) 2009-2014 The Bitcoin developers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
@@ -70,9 +70,9 @@ public:
void print() const
{
LogPrintf("COrphan(hash=%s, dPriority=%.1f, dFeePerKb=%.1f)\n",
- ptx->GetHash().ToString().c_str(), dPriority, dFeePerKb);
+ ptx->GetHash().ToString(), dPriority, dFeePerKb);
BOOST_FOREACH(uint256 hash, setDependsOn)
- LogPrintf(" setDependsOn %s\n", hash.ToString().c_str());
+ LogPrintf(" setDependsOn %s\n", hash.ToString());
}
};
@@ -158,7 +158,7 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn)
mi != mempool.mapTx.end(); ++mi)
{
const CTransaction& tx = mi->second.GetTx();
- if (tx.IsCoinBase() || !IsFinalTx(tx))
+ if (tx.IsCoinBase() || !IsFinalTx(tx, pindexPrev->nHeight + 1))
continue;
COrphan* porphan = NULL;
@@ -296,7 +296,7 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn)
if (fPrintPriority)
{
LogPrintf("priority %.1f feeperkb %.1f txid %s\n",
- dPriority, dFeePerKb, tx.GetHash().ToString().c_str());
+ dPriority, dFeePerKb, tx.GetHash().ToString());
}
// Add transactions that depend on this one to the priority queue
@@ -470,9 +470,9 @@ bool CheckWork(CBlock* pblock, CWallet& wallet, CReserveKey& reservekey)
//// debug print
LogPrintf("BitcoinMiner:\n");
- LogPrintf("proof-of-work found \n hash: %s \ntarget: %s\n", hash.GetHex().c_str(), hashTarget.GetHex().c_str());
+ LogPrintf("proof-of-work found \n hash: %s \ntarget: %s\n", hash.GetHex(), hashTarget.GetHex());
pblock->print();
- LogPrintf("generated %s\n", FormatMoney(pblock->vtx[0].vout[0].nValue).c_str());
+ LogPrintf("generated %s\n", FormatMoney(pblock->vtx[0].vout[0].nValue));
// Found a solution
{
diff --git a/src/net.cpp b/src/net.cpp
index ab39be60b5..359e629295 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -1,5 +1,5 @@
// Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2013 The Bitcoin developers
+// Copyright (c) 2009-2014 The Bitcoin developers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
@@ -227,7 +227,7 @@ bool AddLocal(const CService& addr, int nScore)
if (IsLimited(addr))
return false;
- LogPrintf("AddLocal(%s,%i)\n", addr.ToString().c_str(), nScore);
+ LogPrintf("AddLocal(%s,%i)\n", addr.ToString(), nScore);
{
LOCK(cs_mapLocalHost);
@@ -304,7 +304,7 @@ bool GetMyExternalIP2(const CService& addrConnect, const char* pszGet, const cha
{
SOCKET hSocket;
if (!ConnectSocket(addrConnect, hSocket))
- return error("GetMyExternalIP() : connection to %s failed", addrConnect.ToString().c_str());
+ return error("GetMyExternalIP() : connection to %s failed", addrConnect.ToString());
send(hSocket, pszGet, strlen(pszGet), MSG_NOSIGNAL);
@@ -335,7 +335,7 @@ bool GetMyExternalIP2(const CService& addrConnect, const char* pszGet, const cha
while (strLine.size() > 0 && isspace(strLine[strLine.size()-1]))
strLine.resize(strLine.size()-1);
CService addr(strLine,0,true);
- LogPrintf("GetMyExternalIP() received [%s] %s\n", strLine.c_str(), addr.ToString().c_str());
+ LogPrintf("GetMyExternalIP() received [%s] %s\n", strLine, addr.ToString());
if (!addr.IsValid() || !addr.IsRoutable())
return false;
ipRet.SetIP(addr);
@@ -410,7 +410,7 @@ void ThreadGetMyExternalIP()
CNetAddr addrLocalHost;
if (GetMyExternalIP(addrLocalHost))
{
- LogPrintf("GetMyExternalIP() returned %s\n", addrLocalHost.ToStringIP().c_str());
+ LogPrintf("GetMyExternalIP() returned %s\n", addrLocalHost.ToStringIP());
AddLocal(addrLocalHost, LOCAL_HTTP);
}
}
@@ -477,7 +477,7 @@ CNode* ConnectNode(CAddress addrConnect, const char *pszDest)
/// debug print
LogPrint("net", "trying connection %s lastseen=%.1fhrs\n",
- pszDest ? pszDest : addrConnect.ToString().c_str(),
+ pszDest ? pszDest : addrConnect.ToString(),
pszDest ? 0 : (double)(GetAdjustedTime() - addrConnect.nTime)/3600.0);
// Connect
@@ -486,7 +486,7 @@ CNode* ConnectNode(CAddress addrConnect, const char *pszDest)
{
addrman.Attempt(addrConnect);
- LogPrint("net", "connected %s\n", pszDest ? pszDest : addrConnect.ToString().c_str());
+ LogPrint("net", "connected %s\n", pszDest ? pszDest : addrConnect.ToString());
// Set to non-blocking
#ifdef WIN32
@@ -521,7 +521,7 @@ void CNode::CloseSocketDisconnect()
fDisconnect = true;
if (hSocket != INVALID_SOCKET)
{
- LogPrint("net", "disconnecting node %s\n", addrName.c_str());
+ LogPrint("net", "disconnecting node %s\n", addrName);
closesocket(hSocket);
hSocket = INVALID_SOCKET;
}
@@ -550,7 +550,7 @@ void CNode::PushVersion()
CAddress addrYou = (addr.IsRoutable() && !IsProxy(addr) ? addr : CAddress(CService("0.0.0.0",0)));
CAddress addrMe = GetLocalAddress(&addr);
RAND_bytes((unsigned char*)&nLocalHostNonce, sizeof(nLocalHostNonce));
- LogPrint("net", "send version message: version %d, blocks=%d, us=%s, them=%s, peer=%s\n", PROTOCOL_VERSION, nBestHeight, addrMe.ToString().c_str(), addrYou.ToString().c_str(), addr.ToString().c_str());
+ LogPrint("net", "send version message: version %d, blocks=%d, us=%s, them=%s, peer=%s\n", PROTOCOL_VERSION, nBestHeight, addrMe.ToString(), addrYou.ToString(), addr.ToString());
PushMessage("version", PROTOCOL_VERSION, nLocalServices, nTime, addrYou, addrMe,
nLocalHostNonce, FormatSubVersion(CLIENT_NAME, CLIENT_VERSION, std::vector<string>()), nBestHeight, true);
}
@@ -952,12 +952,12 @@ void ThreadSocketHandler()
}
else if (CNode::IsBanned(addr))
{
- LogPrintf("connection from %s dropped (banned)\n", addr.ToString().c_str());
+ LogPrintf("connection from %s dropped (banned)\n", addr.ToString());
closesocket(hSocket);
}
else
{
- LogPrint("net", "accepted connection %s\n", addr.ToString().c_str());
+ LogPrint("net", "accepted connection %s\n", addr.ToString());
CNode* pnode = new CNode(hSocket, addr, "", true);
pnode->AddRef();
{
@@ -1138,7 +1138,7 @@ void ThreadMapPort()
if(r!=UPNPCOMMAND_SUCCESS)
LogPrintf("AddPortMapping(%s, %s, %s) failed with code %d (%s)\n",
- port.c_str(), port.c_str(), lanaddr, r, strupnperror(r));
+ port, port, lanaddr, r, strupnperror(r));
else
LogPrintf("UPnP Port Mapping successful.\n");;
@@ -1592,8 +1592,8 @@ bool BindListenPort(const CService &addrBind, string& strError)
socklen_t len = sizeof(sockaddr);
if (!addrBind.GetSockAddr((struct sockaddr*)&sockaddr, &len))
{
- strError = strprintf("Error: bind address family for %s not supported", addrBind.ToString().c_str());
- LogPrintf("%s\n", strError.c_str());
+ strError = strprintf("Error: bind address family for %s not supported", addrBind.ToString());
+ LogPrintf("%s\n", strError);
return false;
}
@@ -1601,7 +1601,7 @@ bool BindListenPort(const CService &addrBind, string& strError)
if (hListenSocket == INVALID_SOCKET)
{
strError = strprintf("Error: Couldn't open socket for incoming connections (socket returned error %d)", WSAGetLastError());
- LogPrintf("%s\n", strError.c_str());
+ LogPrintf("%s\n", strError);
return false;
}
@@ -1625,7 +1625,7 @@ bool BindListenPort(const CService &addrBind, string& strError)
#endif
{
strError = strprintf("Error: Couldn't set properties on socket for incoming connections (error %d)", WSAGetLastError());
- LogPrintf("%s\n", strError.c_str());
+ LogPrintf("%s\n", strError);
return false;
}
@@ -1653,19 +1653,19 @@ bool BindListenPort(const CService &addrBind, string& strError)
{
int nErr = WSAGetLastError();
if (nErr == WSAEADDRINUSE)
- strError = strprintf(_("Unable to bind to %s on this computer. Bitcoin is probably already running."), addrBind.ToString().c_str());
+ strError = strprintf(_("Unable to bind to %s on this computer. Bitcoin is probably already running."), addrBind.ToString());
else
- strError = strprintf(_("Unable to bind to %s on this computer (bind returned error %d, %s)"), addrBind.ToString().c_str(), nErr, strerror(nErr));
- LogPrintf("%s\n", strError.c_str());
+ strError = strprintf(_("Unable to bind to %s on this computer (bind returned error %d, %s)"), addrBind.ToString(), nErr, strerror(nErr));
+ LogPrintf("%s\n", strError);
return false;
}
- LogPrintf("Bound to %s\n", addrBind.ToString().c_str());
+ LogPrintf("Bound to %s\n", addrBind.ToString());
// Listen for incoming connections
if (listen(hListenSocket, SOMAXCONN) == SOCKET_ERROR)
{
strError = strprintf("Error: Listening for incoming connections failed (listen returned error %d)", WSAGetLastError());
- LogPrintf("%s\n", strError.c_str());
+ LogPrintf("%s\n", strError);
return false;
}
@@ -1712,7 +1712,7 @@ void static Discover(boost::thread_group& threadGroup)
struct sockaddr_in* s4 = (struct sockaddr_in*)(ifa->ifa_addr);
CNetAddr addr(s4->sin_addr);
if (AddLocal(addr, LOCAL_IF))
- LogPrintf("IPv4 %s: %s\n", ifa->ifa_name, addr.ToString().c_str());
+ LogPrintf("IPv4 %s: %s\n", ifa->ifa_name, addr.ToString());
}
#ifdef USE_IPV6
else if (ifa->ifa_addr->sa_family == AF_INET6)
@@ -1720,7 +1720,7 @@ void static Discover(boost::thread_group& threadGroup)
struct sockaddr_in6* s6 = (struct sockaddr_in6*)(ifa->ifa_addr);
CNetAddr addr(s6->sin6_addr);
if (AddLocal(addr, LOCAL_IF))
- LogPrintf("IPv6 %s: %s\n", ifa->ifa_name, addr.ToString().c_str());
+ LogPrintf("IPv6 %s: %s\n", ifa->ifa_name, addr.ToString());
}
#endif
}
diff --git a/src/net.h b/src/net.h
index a181e275ca..da590f89e1 100644
--- a/src/net.h
+++ b/src/net.h
@@ -1,5 +1,5 @@
// Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2013 The Bitcoin developers
+// Copyright (c) 2009-2014 The Bitcoin developers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
@@ -18,7 +18,6 @@
#include "util.h"
#include <deque>
-#include <inttypes.h>
#include <stdint.h>
#ifndef WIN32
diff --git a/src/netbase.cpp b/src/netbase.cpp
index 37e1df9138..d5b75d6afd 100644
--- a/src/netbase.cpp
+++ b/src/netbase.cpp
@@ -1,5 +1,5 @@
// Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2013 The Bitcoin developers
+// Copyright (c) 2009-2014 The Bitcoin developers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
@@ -171,7 +171,7 @@ bool LookupNumeric(const char *pszName, CService& addr, int portDefault)
bool static Socks4(const CService &addrDest, SOCKET& hSocket)
{
- LogPrintf("SOCKS4 connecting %s\n", addrDest.ToString().c_str());
+ LogPrintf("SOCKS4 connecting %s\n", addrDest.ToString());
if (!addrDest.IsIPv4())
{
closesocket(hSocket);
@@ -209,13 +209,13 @@ bool static Socks4(const CService &addrDest, SOCKET& hSocket)
LogPrintf("ERROR: Proxy returned error %d\n", pchRet[1]);
return false;
}
- LogPrintf("SOCKS4 connected %s\n", addrDest.ToString().c_str());
+ LogPrintf("SOCKS4 connected %s\n", addrDest.ToString());
return true;
}
bool static Socks5(string strDest, int port, SOCKET& hSocket)
{
- LogPrintf("SOCKS5 connecting %s\n", strDest.c_str());
+ LogPrintf("SOCKS5 connecting %s\n", strDest);
if (strDest.size() > 255)
{
closesocket(hSocket);
@@ -311,7 +311,7 @@ bool static Socks5(string strDest, int port, SOCKET& hSocket)
closesocket(hSocket);
return error("Error reading from proxy");
}
- LogPrintf("SOCKS5 connected %s\n", strDest.c_str());
+ LogPrintf("SOCKS5 connected %s\n", strDest);
return true;
}
@@ -326,7 +326,7 @@ bool static ConnectSocketDirectly(const CService &addrConnect, SOCKET& hSocketRe
#endif
socklen_t len = sizeof(sockaddr);
if (!addrConnect.GetSockAddr((struct sockaddr*)&sockaddr, &len)) {
- LogPrintf("Cannot connect to %s: unsupported network\n", addrConnect.ToString().c_str());
+ LogPrintf("Cannot connect to %s: unsupported network\n", addrConnect.ToString());
return false;
}
@@ -365,13 +365,13 @@ bool static ConnectSocketDirectly(const CService &addrConnect, SOCKET& hSocketRe
int nRet = select(hSocket + 1, NULL, &fdset, NULL, &timeout);
if (nRet == 0)
{
- LogPrint("net", "connection to %s timeout\n", addrConnect.ToString().c_str());
+ LogPrint("net", "connection to %s timeout\n", addrConnect.ToString());
closesocket(hSocket);
return false;
}
if (nRet == SOCKET_ERROR)
{
- LogPrintf("select() for %s failed: %i\n", addrConnect.ToString().c_str(), WSAGetLastError());
+ LogPrintf("select() for %s failed: %i\n", addrConnect.ToString(), WSAGetLastError());
closesocket(hSocket);
return false;
}
@@ -382,13 +382,13 @@ bool static ConnectSocketDirectly(const CService &addrConnect, SOCKET& hSocketRe
if (getsockopt(hSocket, SOL_SOCKET, SO_ERROR, &nRet, &nRetSize) == SOCKET_ERROR)
#endif
{
- LogPrintf("getsockopt() for %s failed: %i\n", addrConnect.ToString().c_str(), WSAGetLastError());
+ LogPrintf("getsockopt() for %s failed: %i\n", addrConnect.ToString(), WSAGetLastError());
closesocket(hSocket);
return false;
}
if (nRet != 0)
{
- LogPrintf("connect() to %s failed after select(): %s\n", addrConnect.ToString().c_str(), strerror(nRet));
+ LogPrintf("connect() to %s failed after select(): %s\n", addrConnect.ToString(), strerror(nRet));
closesocket(hSocket);
return false;
}
@@ -399,7 +399,7 @@ bool static ConnectSocketDirectly(const CService &addrConnect, SOCKET& hSocketRe
else
#endif
{
- LogPrintf("connect() to %s failed: %i\n", addrConnect.ToString().c_str(), WSAGetLastError());
+ LogPrintf("connect() to %s failed: %i\n", addrConnect.ToString(), WSAGetLastError());
closesocket(hSocket);
return false;
}
@@ -895,7 +895,7 @@ uint64_t CNetAddr::GetHash() const
void CNetAddr::print() const
{
- LogPrintf("CNetAddr(%s)\n", ToString().c_str());
+ LogPrintf("CNetAddr(%s)\n", ToString());
}
// private extensions to enum Network, only returned by GetExtNetwork,
@@ -1136,7 +1136,7 @@ std::string CService::ToString() const
void CService::print() const
{
- LogPrintf("CService(%s)\n", ToString().c_str());
+ LogPrintf("CService(%s)\n", ToString());
}
void CService::SetPort(unsigned short portIn)
diff --git a/src/noui.cpp b/src/noui.cpp
index 86954f3c34..32c861b0d9 100644
--- a/src/noui.cpp
+++ b/src/noui.cpp
@@ -1,5 +1,5 @@
// Copyright (c) 2010 Satoshi Nakamoto
-// Copyright (c) 2009-2013 The Bitcoin developers
+// Copyright (c) 2009-2014 The Bitcoin developers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
@@ -29,14 +29,14 @@ static bool noui_ThreadSafeMessageBox(const std::string& message, const std::str
strCaption += caption; // Use supplied caption (can be empty)
}
- LogPrintf("%s: %s\n", strCaption.c_str(), message.c_str());
+ LogPrintf("%s: %s\n", strCaption, message);
fprintf(stderr, "%s: %s\n", strCaption.c_str(), message.c_str());
return false;
}
static void noui_InitMessage(const std::string &message)
{
- LogPrintf("init message: %s\n", message.c_str());
+ LogPrintf("init message: %s\n", message);
}
void noui_connect()
diff --git a/src/protocol.cpp b/src/protocol.cpp
index be835507ab..c77a92f020 100644
--- a/src/protocol.cpp
+++ b/src/protocol.cpp
@@ -1,5 +1,5 @@
// Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2013 The Bitcoin developers
+// Copyright (c) 2009-2014 The Bitcoin developers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
@@ -67,7 +67,7 @@ bool CMessageHeader::IsValid() const
// Message size
if (nMessageSize > MAX_SIZE)
{
- LogPrintf("CMessageHeader::IsValid() : (%s, %u bytes) nMessageSize > MAX_SIZE\n", GetCommand().c_str(), nMessageSize);
+ LogPrintf("CMessageHeader::IsValid() : (%s, %u bytes) nMessageSize > MAX_SIZE\n", GetCommand(), nMessageSize);
return false;
}
@@ -118,7 +118,7 @@ CInv::CInv(const std::string& strType, const uint256& hashIn)
}
}
if (i == ARRAYLEN(ppszTypeName))
- throw std::out_of_range(strprintf("CInv::CInv(string, uint256) : unknown type '%s'", strType.c_str()));
+ throw std::out_of_range(strprintf("CInv::CInv(string, uint256) : unknown type '%s'", strType));
hash = hashIn;
}
@@ -141,11 +141,11 @@ const char* CInv::GetCommand() const
std::string CInv::ToString() const
{
- return strprintf("%s %s", GetCommand(), hash.ToString().c_str());
+ return strprintf("%s %s", GetCommand(), hash.ToString());
}
void CInv::print() const
{
- LogPrintf("CInv(%s)\n", ToString().c_str());
+ LogPrintf("CInv(%s)\n", ToString());
}
diff --git a/src/qt/Makefile.am b/src/qt/Makefile.am
index 274cebcf3a..030804db6e 100644
--- a/src/qt/Makefile.am
+++ b/src/qt/Makefile.am
@@ -80,6 +80,7 @@ QT_FORMS_UI = \
forms/askpassphrasedialog.ui \
forms/coincontroldialog.ui \
forms/editaddressdialog.ui \
+ forms/helpmessagedialog.ui \
forms/intro.ui \
forms/openuridialog.ui \
forms/optionsdialog.ui \
@@ -93,7 +94,6 @@ QT_FORMS_UI = \
forms/transactiondescdialog.ui
QT_MOC_CPP = \
- moc_aboutdialog.cpp \
moc_addressbookpage.cpp \
moc_addresstablemodel.cpp \
moc_askpassphrasedialog.cpp \
@@ -133,6 +133,7 @@ QT_MOC_CPP = \
moc_transactionfilterproxy.cpp \
moc_transactiontablemodel.cpp \
moc_transactionview.cpp \
+ moc_utilitydialog.cpp \
moc_walletframe.cpp \
moc_walletmodel.cpp \
moc_walletview.cpp
@@ -155,7 +156,6 @@ PROTOBUF_H = paymentrequest.pb.h
PROTOBUF_PROTO = paymentrequest.proto
BITCOIN_QT_H = \
- aboutdialog.h \
addressbookpage.h \
addresstablemodel.h \
askpassphrasedialog.h \
@@ -198,6 +198,7 @@ BITCOIN_QT_H = \
transactionrecord.h \
transactiontablemodel.h \
transactionview.h \
+ utilitydialog.h \
walletframe.h \
walletmodel.h \
walletmodeltransaction.h \
@@ -242,13 +243,13 @@ RES_ICONS = \
res/icons/toolbar_testnet.png \
res/icons/transaction0.png \
res/icons/transaction2.png \
+ res/icons/transaction_conflicted.png \
res/icons/tx_inout.png \
res/icons/tx_input.png \
res/icons/tx_output.png \
res/icons/tx_mined.png
BITCOIN_QT_CPP = \
- aboutdialog.cpp \
bitcoin.cpp \
bitcoinaddressvalidator.cpp \
bitcoinamountfield.cpp \
@@ -267,7 +268,8 @@ BITCOIN_QT_CPP = \
rpcconsole.cpp \
signverifymessagedialog.cpp \
splashscreen.cpp \
- trafficgraphwidget.cpp
+ trafficgraphwidget.cpp \
+ utilitydialog.cpp
if ENABLE_WALLET
BITCOIN_QT_CPP += \
@@ -322,24 +324,23 @@ BUILT_SOURCES = $(nodist_libbitcoinqt_a_SOURCES)
$(QT_MOC): $(PROTOBUF_H)
$(QT_MOC_CPP): $(PROTOBUF_H)
-if TARGET_DARWIN
- libbitcoinqt_a_SOURCES += $(BITCOIN_MM)
-endif
-if TARGET_WINDOWS
- libbitcoinqt_a_SOURCES += $(BITCOIN_RC)
-endif
-#
-
# bitcoin-qt binary #
bitcoin_qt_CPPFLAGS = $(AM_CPPFLAGS) $(QT_INCLUDES) \
-I$(top_srcdir)/src/qt/forms
bitcoin_qt_SOURCES = bitcoin.cpp
+if TARGET_DARWIN
+ bitcoin_qt_SOURCES += $(BITCOIN_MM)
+endif
+if TARGET_WINDOWS
+ bitcoin_qt_SOURCES += $(BITCOIN_RC)
+endif
bitcoin_qt_LDADD = libbitcoinqt.a $(LIBBITCOIN_SERVER)
if ENABLE_WALLET
bitcoin_qt_LDADD += $(LIBBITCOIN_WALLET)
endif
bitcoin_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBLEVELDB) $(LIBMEMENV) \
$(BOOST_LIBS) $(QT_LIBS) $(QT_DBUS_LIBS) $(QR_LIBS) $(PROTOBUF_LIBS) $(BDB_LIBS)
+bitcoin_qt_LDFLAGS = $(QT_LDFLAGS)
# forms/foo.h -> forms/ui_foo.h
QT_FORMS_H=$(join $(dir $(QT_FORMS_UI)),$(addprefix ui_, $(notdir $(QT_FORMS_UI:.ui=.h))))
diff --git a/src/qt/aboutdialog.cpp b/src/qt/aboutdialog.cpp
deleted file mode 100644
index 6581a19c18..0000000000
--- a/src/qt/aboutdialog.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright (c) 2011-2013 The Bitcoin developers
-// Distributed under the MIT/X11 software license, see the accompanying
-// file COPYING or http://www.opensource.org/licenses/mit-license.php.
-
-#include "aboutdialog.h"
-#include "ui_aboutdialog.h"
-
-#include "clientmodel.h"
-
-#include "clientversion.h"
-
-AboutDialog::AboutDialog(QWidget *parent) :
- QDialog(parent),
- ui(new Ui::AboutDialog)
-{
- ui->setupUi(this);
-
- // Set current copyright year
- ui->copyrightLabel->setText(tr("Copyright") + QString(" &copy; 2009-%1 ").arg(COPYRIGHT_YEAR) + tr("The Bitcoin Core developers"));
-}
-
-void AboutDialog::setModel(ClientModel *model)
-{
- if(model)
- {
- ui->versionLabel->setText(model->formatFullVersion());
- }
-}
-
-AboutDialog::~AboutDialog()
-{
- delete ui;
-}
-
-void AboutDialog::on_buttonBox_accepted()
-{
- close();
-}
diff --git a/src/qt/aboutdialog.h b/src/qt/aboutdialog.h
deleted file mode 100644
index 1b131c4dcc..0000000000
--- a/src/qt/aboutdialog.h
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright (c) 2011-2013 The Bitcoin developers
-// Distributed under the MIT/X11 software license, see the accompanying
-// file COPYING or http://www.opensource.org/licenses/mit-license.php.
-
-#ifndef ABOUTDIALOG_H
-#define ABOUTDIALOG_H
-
-#include <QDialog>
-
-class ClientModel;
-
-namespace Ui {
- class AboutDialog;
-}
-
-/** "About" dialog box */
-class AboutDialog : public QDialog
-{
- Q_OBJECT
-
-public:
- explicit AboutDialog(QWidget *parent);
- ~AboutDialog();
-
- void setModel(ClientModel *model);
-
-private:
- Ui::AboutDialog *ui;
-
-private slots:
- void on_buttonBox_accepted();
-};
-
-#endif // ABOUTDIALOG_H
diff --git a/src/qt/addressbookpage.cpp b/src/qt/addressbookpage.cpp
index abda6c7981..2dc56a5107 100644
--- a/src/qt/addressbookpage.cpp
+++ b/src/qt/addressbookpage.cpp
@@ -138,7 +138,7 @@ void AddressBookPage::setModel(AddressTableModel *model)
#endif
connect(ui->tableView->selectionModel(), SIGNAL(selectionChanged(QItemSelection,QItemSelection)),
- this, SLOT(selectionChanged()));
+ this, SLOT(selectionChanged()));
// Select row for newly created address
connect(model, SIGNAL(rowsInserted(QModelIndex,int,int)), this, SLOT(selectNewAddress(QModelIndex,int,int)));
@@ -270,7 +270,8 @@ void AddressBookPage::on_exportButton_clicked()
tr("Export Address List"), QString(),
tr("Comma separated file (*.csv)"), NULL);
- if (filename.isNull()) return;
+ if (filename.isNull())
+ return;
CSVModelWriter writer(filename);
@@ -279,10 +280,9 @@ void AddressBookPage::on_exportButton_clicked()
writer.addColumn("Label", AddressTableModel::Label, Qt::EditRole);
writer.addColumn("Address", AddressTableModel::Address, Qt::EditRole);
- if(!writer.write())
- {
- QMessageBox::critical(this, tr("Error exporting"), tr("Could not write to file %1.").arg(filename),
- QMessageBox::Abort, QMessageBox::Abort);
+ if(!writer.write()) {
+ QMessageBox::critical(this, tr("Exporting Failed"),
+ tr("There was an error trying to save the address list to %1.").arg(filename));
}
}
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
index 3cf7e53c02..162009f5de 100644
--- a/src/qt/bitcoin.cpp
+++ b/src/qt/bitcoin.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2013 The Bitcoin developers
+// Copyright (c) 2011-2014 The Bitcoin developers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
@@ -14,6 +14,7 @@
#include "intro.h"
#include "optionsmodel.h"
#include "splashscreen.h"
+#include "utilitydialog.h"
#ifdef ENABLE_WALLET
#include "paymentserver.h"
#include "walletmodel.h"
@@ -21,6 +22,7 @@
#include "init.h"
#include "main.h"
+#include "rpcserver.h"
#include "ui_interface.h"
#include "util.h"
#include "wallet.h"
@@ -36,8 +38,6 @@
#include <QTimer>
#include <QTranslator>
#include <QThread>
-#include <QVBoxLayout>
-#include <QLabel>
#if defined(QT_STATICPLUGIN)
#include <QtPlugin>
@@ -62,7 +62,7 @@ Q_DECLARE_METATYPE(bool*)
static void InitMessage(const std::string &message)
{
- LogPrintf("init message: %s\n", message.c_str());
+ LogPrintf("init message: %s\n", message);
}
/*
@@ -227,6 +227,13 @@ void BitcoinCore::initialize()
{
LogPrintf("Running AppInit2 in thread\n");
int rv = AppInit2(threadGroup);
+ if(rv)
+ {
+ /* Start a dummy RPC thread if no RPC thread is active yet
+ * to handle timeouts.
+ */
+ StartDummyRPCThread();
+ }
emit initializeResult(rv);
} catch (std::exception& e) {
handleRunawayException(&e);
@@ -356,17 +363,7 @@ void BitcoinApplication::requestShutdown()
clientModel = 0;
// Show a simple window indicating shutdown status
- QWidget *shutdownWindow = new QWidget();
- QVBoxLayout *layout = new QVBoxLayout();
- layout->addWidget(new QLabel(
- tr("Bitcoin Core is shutting down...") + "<br /><br />" +
- tr("Do not shut down the computer until this window disappears.")));
- shutdownWindow->setLayout(layout);
-
- // Center shutdown window at where main window was
- const QPoint global = window->mapToGlobal(window->rect().center());
- shutdownWindow->move(global.x() - shutdownWindow->width() / 2, global.y() - shutdownWindow->height() / 2);
- shutdownWindow->show();
+ ShutdownWindow::showShutdownWindow(window);
// Request shutdown from core thread
emit requestedShutdown();
@@ -379,9 +376,6 @@ void BitcoinApplication::initializeResult(int retval)
returnValue = retval ? 0 : 1;
if(retval)
{
- // Miscellaneous initialization after core is initialized
- optionsModel->Upgrade(); // Must be done after AppInit2
-
#ifdef ENABLE_WALLET
PaymentServer::LoadRootCAs();
paymentServer->setOptionsModel(optionsModel);
@@ -503,7 +497,7 @@ int main(int argc, char *argv[])
// but before showing splash screen.
if (mapArgs.count("-?") || mapArgs.count("--help"))
{
- GUIUtil::HelpMessageBox help;
+ HelpMessageDialog help(NULL);
help.showOrPrint();
return 1;
}
diff --git a/src/qt/bitcoin.qrc b/src/qt/bitcoin.qrc
index 746b5a4092..7c3a7756b7 100644
--- a/src/qt/bitcoin.qrc
+++ b/src/qt/bitcoin.qrc
@@ -12,6 +12,7 @@
<file alias="connect_4">res/icons/connect4_16.png</file>
<file alias="transaction_0">res/icons/transaction0.png</file>
<file alias="transaction_confirmed">res/icons/transaction2.png</file>
+ <file alias="transaction_conflicted">res/icons/transaction_conflicted.png</file>
<file alias="transaction_1">res/icons/clock1.png</file>
<file alias="transaction_2">res/icons/clock2.png</file>
<file alias="transaction_3">res/icons/clock3.png</file>
diff --git a/src/qt/bitcoinaddressvalidator.cpp b/src/qt/bitcoinaddressvalidator.cpp
index 604f24192b..293cc168b9 100644
--- a/src/qt/bitcoinaddressvalidator.cpp
+++ b/src/qt/bitcoinaddressvalidator.cpp
@@ -1,9 +1,11 @@
-// Copyright (c) 2011-2013 The Bitcoin developers
+// Copyright (c) 2011-2014 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 "bitcoinaddressvalidator.h"
+#include "base58.h"
+
/* Base58 characters are:
"123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz"
@@ -11,21 +13,23 @@
- All numbers except for '0'
- All upper-case letters except for 'I' and 'O'
- All lower-case letters except for 'l'
-
- User friendly Base58 input can map
- - 'l' and 'I' to '1'
- - '0' and 'O' to 'o'
*/
-BitcoinAddressValidator::BitcoinAddressValidator(QObject *parent) :
+BitcoinAddressEntryValidator::BitcoinAddressEntryValidator(QObject *parent) :
QValidator(parent)
{
}
-QValidator::State BitcoinAddressValidator::validate(QString &input, int &pos) const
+QValidator::State BitcoinAddressEntryValidator::validate(QString &input, int &pos) const
{
+ Q_UNUSED(pos);
+
+ // Empty address is "intermediate" input
+ if (input.isEmpty())
+ return QValidator::Intermediate;
+
// Correction
- for(int idx=0; idx<input.size();)
+ for (int idx = 0; idx < input.size();)
{
bool removeChar = false;
QChar ch = input.at(idx);
@@ -42,11 +46,13 @@ QValidator::State BitcoinAddressValidator::validate(QString &input, int &pos) co
default:
break;
}
+
// Remove whitespace
- if(ch.isSpace())
+ if (ch.isSpace())
removeChar = true;
+
// To next character
- if(removeChar)
+ if (removeChar)
input.remove(idx, 1);
else
++idx;
@@ -54,14 +60,14 @@ QValidator::State BitcoinAddressValidator::validate(QString &input, int &pos) co
// Validation
QValidator::State state = QValidator::Acceptable;
- for(int idx=0; idx<input.size(); ++idx)
+ for (int idx = 0; idx < input.size(); ++idx)
{
int ch = input.at(idx).unicode();
- if(((ch >= '0' && ch<='9') ||
- (ch >= 'a' && ch<='z') ||
- (ch >= 'A' && ch<='Z')) &&
- ch != 'l' && ch != 'I' && ch != '0' && ch != 'O')
+ if (((ch >= '0' && ch<='9') ||
+ (ch >= 'a' && ch<='z') ||
+ (ch >= 'A' && ch<='Z')) &&
+ ch != 'l' && ch != 'I' && ch != '0' && ch != 'O')
{
// Alphanumeric and not a 'forbidden' character
}
@@ -71,11 +77,21 @@ QValidator::State BitcoinAddressValidator::validate(QString &input, int &pos) co
}
}
- // Empty address is "intermediate" input
- if(input.isEmpty())
- {
- state = QValidator::Intermediate;
- }
-
return state;
}
+
+BitcoinAddressCheckValidator::BitcoinAddressCheckValidator(QObject *parent) :
+ QValidator(parent)
+{
+}
+
+QValidator::State BitcoinAddressCheckValidator::validate(QString &input, int &pos) const
+{
+ Q_UNUSED(pos);
+ // Validate the passed Bitcoin address
+ CBitcoinAddress addr(input.toStdString());
+ if (addr.IsValid())
+ return QValidator::Acceptable;
+
+ return QValidator::Invalid;
+}
diff --git a/src/qt/bitcoinaddressvalidator.h b/src/qt/bitcoinaddressvalidator.h
index 91d248abd1..0fb779f7d8 100644
--- a/src/qt/bitcoinaddressvalidator.h
+++ b/src/qt/bitcoinaddressvalidator.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2013 The Bitcoin developers
+// Copyright (c) 2011-2014 The Bitcoin developers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
@@ -7,19 +7,29 @@
#include <QValidator>
-/** Base58 entry widget validator.
- Corrects near-miss characters and refuses characters that are not part of base58.
+/** Base58 entry widget validator, checks for valid characters and
+ * removes some whitespace.
*/
-class BitcoinAddressValidator : public QValidator
+class BitcoinAddressEntryValidator : public QValidator
{
Q_OBJECT
public:
- explicit BitcoinAddressValidator(QObject *parent = 0);
+ explicit BitcoinAddressEntryValidator(QObject *parent);
State validate(QString &input, int &pos) const;
+};
+
+/** Bitcoin address widget validator, checks for a valid bitcoin address.
+ */
+class BitcoinAddressCheckValidator : public QValidator
+{
+ Q_OBJECT
+
+public:
+ explicit BitcoinAddressCheckValidator(QObject *parent);
- static const int MaxAddressLength = 35;
+ State validate(QString &input, int &pos) const;
};
#endif // BITCOINADDRESSVALIDATOR_H
diff --git a/src/qt/bitcoinamountfield.cpp b/src/qt/bitcoinamountfield.cpp
index 1698595188..25ad0c66af 100644
--- a/src/qt/bitcoinamountfield.cpp
+++ b/src/qt/bitcoinamountfield.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2013 The Bitcoin developers
+// Copyright (c) 2011-2014 The Bitcoin developers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
@@ -19,12 +19,12 @@ BitcoinAmountField::BitcoinAmountField(QWidget *parent) :
amount(0),
currentUnit(-1)
{
+ nSingleStep = 100000; // satoshis
+
amount = new QDoubleSpinBox(this);
amount->setLocale(QLocale::c());
- amount->setDecimals(8);
amount->installEventFilter(this);
amount->setMaximumWidth(170);
- amount->setSingleStep(0.001);
QHBoxLayout *layout = new QHBoxLayout(this);
layout->addWidget(amount);
@@ -116,7 +116,8 @@ bool BitcoinAmountField::eventFilter(QObject *object, QEvent *event)
QWidget *BitcoinAmountField::setupTabChain(QWidget *prev)
{
QWidget::setTabOrder(prev, amount);
- return amount;
+ QWidget::setTabOrder(amount, unit);
+ return unit;
}
qint64 BitcoinAmountField::value(bool *valid_out) const
@@ -158,11 +159,7 @@ void BitcoinAmountField::unitChanged(int idx)
// Set max length after retrieving the value, to prevent truncation
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);
+ amount->setSingleStep((double)nSingleStep / (double)BitcoinUnits::factor(currentUnit));
if (valid)
{
@@ -181,3 +178,9 @@ void BitcoinAmountField::setDisplayUnit(int newUnit)
{
unit->setValue(newUnit);
}
+
+void BitcoinAmountField::setSingleStep(qint64 step)
+{
+ nSingleStep = step;
+ unitChanged(unit->currentIndex());
+}
diff --git a/src/qt/bitcoinamountfield.h b/src/qt/bitcoinamountfield.h
index d54f536b1f..521a9ed561 100644
--- a/src/qt/bitcoinamountfield.h
+++ b/src/qt/bitcoinamountfield.h
@@ -26,6 +26,9 @@ public:
qint64 value(bool *valid=0) const;
void setValue(qint64 value);
+ /** Set single step in satoshis **/
+ void setSingleStep(qint64 step);
+
/** Make read-only **/
void setReadOnly(bool fReadOnly);
@@ -56,6 +59,7 @@ private:
QDoubleSpinBox *amount;
QValueComboBox *unit;
int currentUnit;
+ qint64 nSingleStep;
void setText(const QString &text);
QString text() const;
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index 692fb6dc1d..f66fab496c 100644
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -1,10 +1,9 @@
-// Copyright (c) 2011-2013 The Bitcoin developers
+// Copyright (c) 2011-2014 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 "bitcoingui.h"
-#include "aboutdialog.h"
#include "bitcoinunits.h"
#include "clientmodel.h"
#include "guiconstants.h"
@@ -14,6 +13,7 @@
#include "optionsdialog.h"
#include "optionsmodel.h"
#include "rpcconsole.h"
+#include "utilitydialog.h"
#ifdef ENABLE_WALLET
#include "walletframe.h"
#include "walletmodel.h"
@@ -308,11 +308,15 @@ void BitcoinGUI::createActions(bool fIsTestnet)
openAction = new QAction(QApplication::style()->standardIcon(QStyle::SP_FileIcon), tr("Open &URI..."), this);
openAction->setStatusTip(tr("Open a bitcoin: URI or payment request"));
+ showHelpMessageAction = new QAction(QApplication::style()->standardIcon(QStyle::SP_MessageBoxInformation), tr("&Command-line options"), this);
+ showHelpMessageAction->setStatusTip(tr("Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options"));
+
connect(quitAction, SIGNAL(triggered()), qApp, SLOT(quit()));
connect(aboutAction, SIGNAL(triggered()), this, SLOT(aboutClicked()));
connect(aboutQtAction, SIGNAL(triggered()), qApp, SLOT(aboutQt()));
connect(optionsAction, SIGNAL(triggered()), this, SLOT(optionsClicked()));
connect(toggleHideAction, SIGNAL(triggered()), this, SLOT(toggleHidden()));
+ connect(showHelpMessageAction, SIGNAL(triggered()), this, SLOT(showHelpMessageClicked()));
#ifdef ENABLE_WALLET
if(walletFrame)
{
@@ -366,8 +370,9 @@ void BitcoinGUI::createMenuBar()
if(walletFrame)
{
help->addAction(openRPCConsoleAction);
- help->addSeparator();
}
+ help->addAction(showHelpMessageAction);
+ help->addSeparator();
help->addAction(aboutAction);
help->addAction(aboutQtAction);
}
@@ -546,6 +551,13 @@ void BitcoinGUI::aboutClicked()
dlg.exec();
}
+void BitcoinGUI::showHelpMessageClicked()
+{
+ HelpMessageDialog *help = new HelpMessageDialog(this);
+ help->setAttribute(Qt::WA_DeleteOnClose);
+ help->show();
+}
+
#ifdef ENABLE_WALLET
void BitcoinGUI::openClicked()
{
diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h
index d5bbdca484..0cc1ebc502 100644
--- a/src/qt/bitcoingui.h
+++ b/src/qt/bitcoingui.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2013 The Bitcoin developers
+// Copyright (c) 2011-2014 The Bitcoin developers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
@@ -93,6 +93,7 @@ private:
QAction *aboutQtAction;
QAction *openRPCConsoleAction;
QAction *openAction;
+ QAction *showHelpMessageAction;
QSystemTrayIcon *trayIcon;
Notificator *notificator;
@@ -176,6 +177,8 @@ private slots:
void optionsClicked();
/** Show about dialog */
void aboutClicked();
+ /** Show help message dialog */
+ void showHelpMessageClicked();
#ifndef Q_OS_MAC
/** Handle tray icon clicked */
void trayIconActivated(QSystemTrayIcon::ActivationReason reason);
diff --git a/src/qt/forms/aboutdialog.ui b/src/qt/forms/aboutdialog.ui
index 10a5857cab..3ab4675bf3 100644
--- a/src/qt/forms/aboutdialog.ui
+++ b/src/qt/forms/aboutdialog.ui
@@ -160,12 +160,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
- <x>360</x>
- <y>308</y>
+ <x>20</x>
+ <y>20</y>
</hint>
<hint type="destinationlabel">
- <x>157</x>
- <y>274</y>
+ <x>20</x>
+ <y>20</y>
</hint>
</hints>
</connection>
@@ -176,12 +176,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
- <x>428</x>
- <y>308</y>
+ <x>20</x>
+ <y>20</y>
</hint>
<hint type="destinationlabel">
- <x>286</x>
- <y>274</y>
+ <x>20</x>
+ <y>20</y>
</hint>
</hints>
</connection>
diff --git a/src/qt/forms/askpassphrasedialog.ui b/src/qt/forms/askpassphrasedialog.ui
index 25169042a1..bc4921455f 100644
--- a/src/qt/forms/askpassphrasedialog.ui
+++ b/src/qt/forms/askpassphrasedialog.ui
@@ -122,12 +122,12 @@
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
- <x>248</x>
- <y>254</y>
+ <x>20</x>
+ <y>20</y>
</hint>
<hint type="destinationlabel">
- <x>157</x>
- <y>274</y>
+ <x>20</x>
+ <y>20</y>
</hint>
</hints>
</connection>
@@ -138,12 +138,12 @@
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
- <x>316</x>
- <y>260</y>
+ <x>20</x>
+ <y>20</y>
</hint>
<hint type="destinationlabel">
- <x>286</x>
- <y>274</y>
+ <x>20</x>
+ <y>20</y>
</hint>
</hints>
</connection>
diff --git a/src/qt/forms/coincontroldialog.ui b/src/qt/forms/coincontroldialog.ui
index e4faa312d4..a31c491e95 100644
--- a/src/qt/forms/coincontroldialog.ui
+++ b/src/qt/forms/coincontroldialog.ui
@@ -346,83 +346,77 @@
<property name="frameShadow">
<enum>QFrame::Sunken</enum>
</property>
- <widget class="QWidget" name="horizontalLayoutWidget">
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>0</y>
- <width>781</width>
- <height>41</height>
- </rect>
- </property>
- <layout class="QHBoxLayout" name="horizontalLayoutPanel" stretch="0,0,0,0,0">
- <property name="spacing">
- <number>14</number>
- </property>
- <item>
- <widget class="QPushButton" name="pushButtonSelectAll">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>(un)select all</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QRadioButton" name="radioTreeMode">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>Tree mode</string>
- </property>
- <property name="checked">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QRadioButton" name="radioListMode">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>List mode</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="labelLocked">
- <property name="text">
- <string notr="true">(1 locked)</string>
- </property>
- </widget>
- </item>
- <item>
- <spacer name="horizontalSpacer">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </widget>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayoutPanel" stretch="0,0,0,0,0">
+ <property name="spacing">
+ <number>14</number>
+ </property>
+ <item>
+ <widget class="QPushButton" name="pushButtonSelectAll">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>(un)select all</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QRadioButton" name="radioTreeMode">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>Tree mode</string>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QRadioButton" name="radioListMode">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>List mode</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="labelLocked">
+ <property name="text">
+ <string notr="true">(1 locked)</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ </layout>
</widget>
</item>
<item>
diff --git a/src/qt/forms/editaddressdialog.ui b/src/qt/forms/editaddressdialog.ui
index 8ff3805226..c1aea36338 100644
--- a/src/qt/forms/editaddressdialog.ui
+++ b/src/qt/forms/editaddressdialog.ui
@@ -47,7 +47,7 @@
</widget>
</item>
<item row="1" column="1">
- <widget class="QLineEdit" name="addressEdit">
+ <widget class="QValidatedLineEdit" name="addressEdit">
<property name="toolTip">
<string>The address associated with this address list entry. This can only be modified for sending addresses.</string>
</property>
@@ -67,6 +67,13 @@
</item>
</layout>
</widget>
+ <customwidgets>
+ <customwidget>
+ <class>QValidatedLineEdit</class>
+ <extends>QLineEdit</extends>
+ <header>qvalidatedlineedit.h</header>
+ </customwidget>
+ </customwidgets>
<resources/>
<connections>
<connection>
@@ -76,12 +83,12 @@
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
- <x>248</x>
- <y>254</y>
+ <x>20</x>
+ <y>20</y>
</hint>
<hint type="destinationlabel">
- <x>157</x>
- <y>274</y>
+ <x>20</x>
+ <y>20</y>
</hint>
</hints>
</connection>
@@ -92,12 +99,12 @@
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
- <x>316</x>
- <y>260</y>
+ <x>20</x>
+ <y>20</y>
</hint>
<hint type="destinationlabel">
- <x>286</x>
- <y>274</y>
+ <x>20</x>
+ <y>20</y>
</hint>
</hints>
</connection>
diff --git a/src/qt/forms/helpmessagedialog.ui b/src/qt/forms/helpmessagedialog.ui
new file mode 100644
index 0000000000..f68fea7e64
--- /dev/null
+++ b/src/qt/forms/helpmessagedialog.ui
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>HelpMessageDialog</class>
+ <widget class="QDialog" name="HelpMessageDialog">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>800</width>
+ <height>400</height>
+ </rect>
+ </property>
+ <property name="font">
+ <font>
+ <pointsize>10</pointsize>
+ </font>
+ </property>
+ <property name="windowTitle">
+ <string>Bitcoin Core - Command-line options</string>
+ </property>
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item>
+ <widget class="QLabel" name="graphic">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Ignored">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="pixmap">
+ <pixmap resource="../bitcoin.qrc">:/images/about</pixmap>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <widget class="QScrollArea" name="scrollArea">
+ <property name="verticalScrollBarPolicy">
+ <enum>Qt::ScrollBarAlwaysOn</enum>
+ </property>
+ <property name="widgetResizable">
+ <bool>true</bool>
+ </property>
+ <widget class="QWidget" name="scrollAreaWidgetContents">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>659</width>
+ <height>348</height>
+ </rect>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout_2">
+ <item>
+ <widget class="QLabel" name="helpMessageLabel">
+ <property name="font">
+ <font>
+ <family>Terminal</family>
+ </font>
+ </property>
+ <property name="cursor">
+ <cursorShape>IBeamCursor</cursorShape>
+ </property>
+ <property name="textFormat">
+ <enum>Qt::PlainText</enum>
+ </property>
+ <property name="textInteractionFlags">
+ <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </widget>
+ </item>
+ <item>
+ <widget class="QDialogButtonBox" name="okButton">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="standardButtons">
+ <set>QDialogButtonBox::Ok</set>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ <resources>
+ <include location="../bitcoin.qrc"/>
+ </resources>
+ <connections>
+ <connection>
+ <sender>okButton</sender>
+ <signal>accepted()</signal>
+ <receiver>HelpMessageDialog</receiver>
+ <slot>accept()</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>20</x>
+ <y>20</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>20</x>
+ <y>20</y>
+ </hint>
+ </hints>
+ </connection>
+ <connection>
+ <sender>okButton</sender>
+ <signal>rejected()</signal>
+ <receiver>HelpMessageDialog</receiver>
+ <slot>reject()</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>20</x>
+ <y>20</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>20</x>
+ <y>20</y>
+ </hint>
+ </hints>
+ </connection>
+ </connections>
+</ui>
diff --git a/src/qt/forms/intro.ui b/src/qt/forms/intro.ui
index 05ee9466c4..09e7bdb024 100644
--- a/src/qt/forms/intro.ui
+++ b/src/qt/forms/intro.ui
@@ -237,12 +237,12 @@
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
- <x>248</x>
- <y>254</y>
+ <x>20</x>
+ <y>20</y>
</hint>
<hint type="destinationlabel">
- <x>157</x>
- <y>274</y>
+ <x>20</x>
+ <y>20</y>
</hint>
</hints>
</connection>
@@ -253,12 +253,12 @@
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
- <x>316</x>
- <y>260</y>
+ <x>20</x>
+ <y>20</y>
</hint>
<hint type="destinationlabel">
- <x>286</x>
- <y>274</y>
+ <x>20</x>
+ <y>20</y>
</hint>
</hints>
</connection>
diff --git a/src/qt/forms/optionsdialog.ui b/src/qt/forms/optionsdialog.ui
index e0d99aac39..a555f13c2a 100644
--- a/src/qt/forms/optionsdialog.ui
+++ b/src/qt/forms/optionsdialog.ui
@@ -28,52 +28,6 @@
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_Main">
<item>
- <widget class="QLabel" name="transactionFeeInfoLabel">
- <property name="text">
- <string>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</string>
- </property>
- <property name="textFormat">
- <enum>Qt::PlainText</enum>
- </property>
- <property name="wordWrap">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_1_Main">
- <item>
- <widget class="QLabel" name="transactionFeeLabel">
- <property name="text">
- <string>Pay transaction &amp;fee</string>
- </property>
- <property name="textFormat">
- <enum>Qt::PlainText</enum>
- </property>
- <property name="buddy">
- <cstring>transactionFee</cstring>
- </property>
- </widget>
- </item>
- <item>
- <widget class="BitcoinAmountField" name="transactionFee"/>
- </item>
- <item>
- <spacer name="horizontalSpacer_1_Main">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </item>
- <item>
<widget class="QCheckBox" name="bitcoinAtStartup">
<property name="toolTip">
<string>Automatically start Bitcoin after logging in to the system.</string>
@@ -99,17 +53,7 @@
</widget>
</item>
<item>
- <widget class="QSpinBox" name="databaseCache">
- <property name="toolTip">
- <string>Set database cache size in megabytes (default: 25)</string>
- </property>
- <property name="maximum">
- <number>1024</number>
- </property>
- <property name="value">
- <number>25</number>
- </property>
- </widget>
+ <widget class="QSpinBox" name="databaseCache"/>
</item>
<item>
<widget class="QLabel" name="databaseCacheUnitLabel">
@@ -194,6 +138,92 @@
</item>
</layout>
</widget>
+ <widget class="QWidget" name="tabWallet">
+ <attribute name="title">
+ <string>W&amp;allet</string>
+ </attribute>
+ <layout class="QVBoxLayout" name="verticalLayout_Wallet">
+ <item>
+ <widget class="QLabel" name="transactionFeeInfoLabel">
+ <property name="text">
+ <string>Optional transaction fee per kB that helps make sure your transactions are processed quickly. Most transactions are 1 kB.</string>
+ </property>
+ <property name="textFormat">
+ <enum>Qt::PlainText</enum>
+ </property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_1_Wallet">
+ <item>
+ <widget class="QLabel" name="transactionFeeLabel">
+ <property name="text">
+ <string>Pay transaction &amp;fee</string>
+ </property>
+ <property name="textFormat">
+ <enum>Qt::PlainText</enum>
+ </property>
+ <property name="buddy">
+ <cstring>transactionFee</cstring>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="BitcoinAmountField" name="transactionFee"/>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_1_Wallet">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="QLabel" name="spendZeroConfChangeInfoLabel">
+ <property name="text">
+ <string>If you disable the spending of unconfirmed change, the change from a transaction cannot be used until that transaction has at least one confirmation. This also affects how your balance is computed.</string>
+ </property>
+ <property name="textFormat">
+ <enum>Qt::PlainText</enum>
+ </property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="spendZeroConfChange">
+ <property name="text">
+ <string>&amp;Spend unconfirmed change (experts only)</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="verticalSpacer_Wallet">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </widget>
<widget class="QWidget" name="tabNetwork">
<attribute name="title">
<string>&amp;Network</string>
diff --git a/src/qt/forms/overviewpage.ui b/src/qt/forms/overviewpage.ui
index d1ca969431..e662912781 100644
--- a/src/qt/forms/overviewpage.ui
+++ b/src/qt/forms/overviewpage.ui
@@ -105,7 +105,7 @@
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="text">
- <string>Confirmed:</string>
+ <string>Available:</string>
</property>
</widget>
</item>
@@ -137,7 +137,7 @@
<item row="1" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
- <string>Unconfirmed:</string>
+ <string>Pending:</string>
</property>
</widget>
</item>
diff --git a/src/qt/forms/receivecoinsdialog.ui b/src/qt/forms/receivecoinsdialog.ui
index 8242763e77..3e1a8bccc7 100644
--- a/src/qt/forms/receivecoinsdialog.ui
+++ b/src/qt/forms/receivecoinsdialog.ui
@@ -10,8 +10,23 @@
<height>364</height>
</rect>
</property>
- <layout class="QVBoxLayout" name="verticalLayout">
+ <layout class="QVBoxLayout" name="verticalLayout" stretch="0,0,1">
<item>
+ <widget class="QFrame" name="frame2">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="frameShape">
+ <enum>QFrame::StyledPanel</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>QFrame::Sunken</enum>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout_3">
+ <item>
<layout class="QGridLayout" name="gridLayout">
<item row="7" column="2">
<widget class="QCheckBox" name="reuseAddress">
@@ -32,6 +47,9 @@
</item>
<item row="6" column="0">
<widget class="QLabel" name="label_3">
+ <property name="toolTip">
+ <string>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</string>
+ </property>
<property name="text">
<string>&amp;Message:</string>
</property>
@@ -46,26 +64,29 @@
<item row="4" column="2">
<widget class="QLineEdit" name="reqLabel">
<property name="toolTip">
- <string>The label to associate with the new receiving address</string>
+ <string>An optional label to associate with the new receiving address.</string>
</property>
</widget>
</item>
<item row="6" column="2">
<widget class="QLineEdit" name="reqMessage">
<property name="toolTip">
- <string>The message to attach to payment request</string>
+ <string>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</string>
</property>
</widget>
</item>
<item row="2" column="2">
<widget class="QLabel" name="label_5">
<property name="text">
- <string>Use this form to request payments. All fields are optional.</string>
+ <string>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</string>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label_2">
+ <property name="toolTip">
+ <string>An optional label to associate with the new receiving address.</string>
+ </property>
<property name="text">
<string>&amp;Label:</string>
</property>
@@ -79,6 +100,9 @@
</item>
<item row="5" column="0">
<widget class="QLabel" name="label">
+ <property name="toolTip">
+ <string>An optional amount to request. Leave this empty or zero to not request a specific amount.</string>
+ </property>
<property name="text">
<string>&amp;Amount:</string>
</property>
@@ -99,15 +123,30 @@
</size>
</property>
<property name="toolTip">
- <string>The amount to request</string>
+ <string>An optional amount to request. Leave this empty or zero to not request a specific amount.</string>
</property>
</widget>
</item>
- </layout>
- </item>
- <item>
+ <item row="8" column="2">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
+ <widget class="QPushButton" name="receiveButton">
+ <property name="minimumSize">
+ <size>
+ <width>150</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="text">
+ <string>&amp;Request payment</string>
+ </property>
+ <property name="icon">
+ <iconset resource="../bitcoin.qrc">
+ <normaloff>:/icons/receiving_addresses</normaloff>:/icons/receiving_addresses</iconset>
+ </property>
+ </widget>
+ </item>
+ <item>
<widget class="QPushButton" name="clearButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
@@ -146,25 +185,20 @@
</property>
</spacer>
</item>
- <item>
- <widget class="QPushButton" name="receiveButton">
- <property name="minimumSize">
- <size>
- <width>150</width>
- <height>0</height>
- </size>
- </property>
+ </layout>
+ </item>
+ <item row="8" column="0">
+ <widget class="QLabel" name="label_7">
<property name="text">
- <string>&amp;Request payment</string>
- </property>
- <property name="icon">
- <iconset resource="../bitcoin.qrc">
- <normaloff>:/icons/receiving_addresses</normaloff>:/icons/receiving_addresses</iconset>
+ <string/>
</property>
</widget>
</item>
</layout>
</item>
+ </layout>
+ </widget>
+ </item>
<item>
<spacer name="verticalSpacer_2">
<property name="orientation">
@@ -173,7 +207,7 @@
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
- <height>40</height>
+ <height>10</height>
</size>
</property>
</spacer>
@@ -202,12 +236,22 @@
</font>
</property>
<property name="text">
- <string>Requested payments</string>
+ <string>Requested payments history</string>
</property>
</widget>
</item>
<item>
- <widget class="QTableView" name="recentRequestsView"/>
+ <widget class="QTableView" name="recentRequestsView">
+ <property name="contextMenuPolicy">
+ <enum>Qt::CustomContextMenu</enum>
+ </property>
+ <property name="tabKeyNavigation">
+ <bool>false</bool>
+ </property>
+ <property name="sortingEnabled">
+ <bool>true</bool>
+ </property>
+ </widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
@@ -271,8 +315,8 @@
<tabstop>reqAmount</tabstop>
<tabstop>reqMessage</tabstop>
<tabstop>reuseAddress</tabstop>
- <tabstop>clearButton</tabstop>
<tabstop>receiveButton</tabstop>
+ <tabstop>clearButton</tabstop>
<tabstop>recentRequestsView</tabstop>
<tabstop>showRequestButton</tabstop>
<tabstop>removeRequestButton</tabstop>
diff --git a/src/qt/forms/rpcconsole.ui b/src/qt/forms/rpcconsole.ui
index 69504f3159..31d61ec468 100644
--- a/src/qt/forms/rpcconsole.ui
+++ b/src/qt/forms/rpcconsole.ui
@@ -339,32 +339,6 @@
</widget>
</item>
<item row="16" column="0">
- <widget class="QLabel" name="labelCLOptions">
- <property name="font">
- <font>
- <weight>75</weight>
- <bold>true</bold>
- </font>
- </property>
- <property name="text">
- <string>Command-line options</string>
- </property>
- </widget>
- </item>
- <item row="17" column="0">
- <widget class="QPushButton" name="showCLOptionsButton">
- <property name="toolTip">
- <string>Show the Bitcoin-Core help message to get a list with possible Bitcoin command-line options.</string>
- </property>
- <property name="text">
- <string>&amp;Show</string>
- </property>
- <property name="autoDefault">
- <bool>false</bool>
- </property>
- </widget>
- </item>
- <item row="18" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
diff --git a/src/qt/forms/sendcoinsdialog.ui b/src/qt/forms/sendcoinsdialog.ui
index db8271b016..95f3294adb 100644
--- a/src/qt/forms/sendcoinsdialog.ui
+++ b/src/qt/forms/sendcoinsdialog.ui
@@ -657,19 +657,25 @@
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
- <widget class="QPushButton" name="addButton">
+ <widget class="QPushButton" name="sendButton">
+ <property name="minimumSize">
+ <size>
+ <width>150</width>
+ <height>0</height>
+ </size>
+ </property>
<property name="toolTip">
- <string>Send to multiple recipients at once</string>
+ <string>Confirm the send action</string>
</property>
<property name="text">
- <string>Add &amp;Recipient</string>
+ <string>S&amp;end</string>
</property>
<property name="icon">
<iconset resource="../bitcoin.qrc">
- <normaloff>:/icons/add</normaloff>:/icons/add</iconset>
+ <normaloff>:/icons/send</normaloff>:/icons/send</iconset>
</property>
- <property name="autoDefault">
- <bool>false</bool>
+ <property name="default">
+ <bool>true</bool>
</property>
</widget>
</item>
@@ -700,6 +706,36 @@
</widget>
</item>
<item>
+ <widget class="QPushButton" name="addButton">
+ <property name="toolTip">
+ <string>Send to multiple recipients at once</string>
+ </property>
+ <property name="text">
+ <string>Add &amp;Recipient</string>
+ </property>
+ <property name="icon">
+ <iconset resource="../bitcoin.qrc">
+ <normaloff>:/icons/add</normaloff>:/icons/add</iconset>
+ </property>
+ <property name="autoDefault">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<property name="spacing">
<number>3</number>
@@ -726,42 +762,6 @@
</item>
</layout>
</item>
- <item>
- <spacer name="horizontalSpacer">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <widget class="QPushButton" name="sendButton">
- <property name="minimumSize">
- <size>
- <width>150</width>
- <height>0</height>
- </size>
- </property>
- <property name="toolTip">
- <string>Confirm the send action</string>
- </property>
- <property name="text">
- <string>S&amp;end</string>
- </property>
- <property name="icon">
- <iconset resource="../bitcoin.qrc">
- <normaloff>:/icons/send</normaloff>:/icons/send</iconset>
- </property>
- <property name="default">
- <bool>true</bool>
- </property>
- </widget>
- </item>
</layout>
</item>
</layout>
diff --git a/src/qt/forms/sendcoinsentry.ui b/src/qt/forms/sendcoinsentry.ui
index b6cec5baf0..e77de0d9b8 100644
--- a/src/qt/forms/sendcoinsentry.ui
+++ b/src/qt/forms/sendcoinsentry.ui
@@ -141,6 +141,26 @@
<item row="2" column="1">
<widget class="BitcoinAmountField" name="payAmount"/>
</item>
+ <item row="3" column="0">
+ <widget class="QLabel" name="messageLabel">
+ <property name="text">
+ <string>Message:</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1">
+ <widget class="QLabel" name="messageTextLabel">
+ <property name="toolTip">
+ <string>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</string>
+ </property>
+ <property name="textFormat">
+ <enum>Qt::PlainText</enum>
+ </property>
+ </widget>
+ </item>
</layout>
</widget>
<widget class="QFrame" name="SendCoins_InsecurePaymentRequest">
diff --git a/src/qt/forms/signverifymessagedialog.ui b/src/qt/forms/signverifymessagedialog.ui
index 04d614a1cd..aa271b4f2a 100644
--- a/src/qt/forms/signverifymessagedialog.ui
+++ b/src/qt/forms/signverifymessagedialog.ui
@@ -19,9 +19,6 @@
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QTabWidget" name="tabWidget">
- <property name="currentIndex">
- <number>0</number>
- </property>
<widget class="QWidget" name="tabSignMessage">
<attribute name="title">
<string>&amp;Sign Message</string>
@@ -50,9 +47,6 @@
<property name="toolTip">
<string>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</string>
</property>
- <property name="maxLength">
- <number>34</number>
- </property>
</widget>
</item>
<item>
@@ -263,9 +257,6 @@
<property name="toolTip">
<string>The address the message was signed with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</string>
</property>
- <property name="maxLength">
- <number>34</number>
- </property>
</widget>
</item>
<item>
diff --git a/src/qt/forms/transactiondescdialog.ui b/src/qt/forms/transactiondescdialog.ui
index b38dffcc12..5ae1e12856 100644
--- a/src/qt/forms/transactiondescdialog.ui
+++ b/src/qt/forms/transactiondescdialog.ui
@@ -45,12 +45,12 @@
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
- <x>248</x>
- <y>254</y>
+ <x>20</x>
+ <y>20</y>
</hint>
<hint type="destinationlabel">
- <x>157</x>
- <y>274</y>
+ <x>20</x>
+ <y>20</y>
</hint>
</hints>
</connection>
@@ -61,12 +61,12 @@
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
- <x>316</x>
- <y>260</y>
+ <x>20</x>
+ <y>20</y>
</hint>
<hint type="destinationlabel">
- <x>286</x>
- <y>274</y>
+ <x>20</x>
+ <y>20</y>
</hint>
</hints>
</connection>
diff --git a/src/qt/guiconstants.h b/src/qt/guiconstants.h
index d1a601706b..9f6588bc9e 100644
--- a/src/qt/guiconstants.h
+++ b/src/qt/guiconstants.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2013 The Bitcoin developers
+// Copyright (c) 2011-2014 The Bitcoin developers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp
index b87498402d..7e1831f037 100644
--- a/src/qt/guiutil.cpp
+++ b/src/qt/guiutil.cpp
@@ -6,6 +6,7 @@
#include "bitcoinaddressvalidator.h"
#include "bitcoinunits.h"
+#include "qvalidatedlineedit.h"
#include "walletmodel.h"
#include "core.h"
@@ -72,11 +73,16 @@ QFont bitcoinAddressFont()
return font;
}
-void setupAddressWidget(QLineEdit *widget, QWidget *parent)
+void setupAddressWidget(QValidatedLineEdit *widget, QWidget *parent)
{
- widget->setMaxLength(BitcoinAddressValidator::MaxAddressLength);
- widget->setValidator(new BitcoinAddressValidator(parent));
+ parent->setFocusProxy(widget);
+
widget->setFont(bitcoinAddressFont());
+#if QT_VERSION >= 0x040700
+ widget->setPlaceholderText(QObject::tr("Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)"));
+#endif
+ widget->setValidator(new BitcoinAddressEntryValidator(parent));
+ widget->setCheckValidator(new BitcoinAddressCheckValidator(parent));
}
void setupAmountWidget(QLineEdit *widget, QWidget *parent)
@@ -90,7 +96,7 @@ void setupAmountWidget(QLineEdit *widget, QWidget *parent)
bool parseBitcoinURI(const QUrl &uri, SendCoinsRecipient *out)
{
- // return if URI is not valid or is no bitcoin URI
+ // return if URI is not valid or is no bitcoin: URI
if(!uri.isValid() || uri.scheme() != QString("bitcoin"))
return false;
@@ -361,11 +367,11 @@ bool ToolTipToRichTextFilter::eventFilter(QObject *obj, QEvent *evt)
{
QWidget *widget = static_cast<QWidget*>(obj);
QString tooltip = widget->toolTip();
- if(tooltip.size() > size_threshold && !tooltip.startsWith("<qt/>") && !Qt::mightBeRichText(tooltip))
+ if(tooltip.size() > size_threshold && !tooltip.startsWith("<qt") && !Qt::mightBeRichText(tooltip))
{
- // Prefix <qt/> to make sure Qt detects this as rich text
+ // Envelop with <qt></qt> to make sure Qt detects this as rich text
// Escape the current message as HTML and replace \n by <br>
- tooltip = "<qt/>" + HtmlEscape(tooltip, true);
+ tooltip = "<qt>" + HtmlEscape(tooltip, true) + "</qt>";
widget->setToolTip(tooltip);
return true;
}
@@ -591,47 +597,6 @@ void restoreWindowGeometry(const QString& strSetting, const QSize& defaultSize,
parent->move(pos);
}
-HelpMessageBox::HelpMessageBox(QWidget *parent) :
- QMessageBox(parent)
-{
- header = tr("Bitcoin Core") + " " + tr("version") + " " +
- QString::fromStdString(FormatFullVersion()) + "\n\n" +
- tr("Usage:") + "\n" +
- " bitcoin-qt [" + tr("command-line options") + "] " + "\n";
-
- coreOptions = QString::fromStdString(HelpMessage(HMM_BITCOIN_QT));
-
- uiOptions = tr("UI options") + ":\n" +
- " -lang=<lang> " + tr("Set language, for example \"de_DE\" (default: system locale)") + "\n" +
- " -min " + tr("Start minimized") + "\n" +
- " -splash " + tr("Show splash screen on startup (default: 1)") + "\n" +
- " -choosedatadir " + tr("Choose data directory on startup (default: 0)") + "\n";
-
- setWindowTitle(tr("Bitcoin Core"));
- setTextFormat(Qt::PlainText);
- // setMinimumWidth is ignored for QMessageBox so put in non-breaking spaces to make it wider.
- setText(header + QString(QChar(0x2003)).repeated(50));
- setDetailedText(coreOptions + "\n" + uiOptions);
-}
-
-void HelpMessageBox::printToConsole()
-{
- // On other operating systems, the expected action is to print the message to the console.
- QString strUsage = header + "\n" + coreOptions + "\n" + uiOptions;
- fprintf(stdout, "%s", strUsage.toStdString().c_str());
-}
-
-void HelpMessageBox::showOrPrint()
-{
-#if defined(WIN32)
- // On Windows, show a message box, as there is no stderr/stdout in windowed applications
- exec();
-#else
- // On other operating systems, print help text to console
- printToConsole();
-#endif
-}
-
void setClipboard(const QString& str)
{
QApplication::clipboard()->setText(str, QClipboard::Clipboard);
diff --git a/src/qt/guiutil.h b/src/qt/guiutil.h
index 14d4ff17c1..52124ff20a 100644
--- a/src/qt/guiutil.h
+++ b/src/qt/guiutil.h
@@ -9,6 +9,7 @@
#include <QObject>
#include <QString>
+class QValidatedLineEdit;
class SendCoinsRecipient;
QT_BEGIN_NAMESPACE
@@ -32,7 +33,7 @@ namespace GUIUtil
QFont bitcoinAddressFont();
// Set up widgets for address and amounts
- void setupAddressWidget(QLineEdit *widget, QWidget *parent);
+ void setupAddressWidget(QValidatedLineEdit *widget, QWidget *parent);
void setupAmountWidget(QLineEdit *widget, QWidget *parent);
// Parse "bitcoin:" URI into recipient object, return true on successful parsing
@@ -123,26 +124,6 @@ namespace GUIUtil
/** Restore window size and position */
void restoreWindowGeometry(const QString& strSetting, const QSize &defaultSizeIn, QWidget *parent);
- /** Help message for Bitcoin-Qt, shown with --help. */
- class HelpMessageBox : public QMessageBox
- {
- Q_OBJECT
-
- public:
- HelpMessageBox(QWidget *parent = 0);
-
- /** Show message box or print help message to standard output, based on operating system. */
- void showOrPrint();
-
- /** Print help message to console */
- void printToConsole();
-
- private:
- QString header;
- QString coreOptions;
- QString uiOptions;
- };
-
} // namespace GUIUtil
#endif // GUIUTIL_H
diff --git a/src/qt/intro.cpp b/src/qt/intro.cpp
index 453bbdf374..fc1258827e 100644
--- a/src/qt/intro.cpp
+++ b/src/qt/intro.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2013 The Bitcoin developers
+// Copyright (c) 2011-2014 The Bitcoin developers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
diff --git a/src/qt/locale/bitcoin_ach.ts b/src/qt/locale/bitcoin_ach.ts
index 32cf9ea3b3..848ffc9d4c 100644
--- a/src/qt/locale/bitcoin_ach.ts
+++ b/src/qt/locale/bitcoin_ach.ts
@@ -3,12 +3,12 @@
<name>AboutDialog</name>
<message>
<location filename="../forms/aboutdialog.ui" line="+14"/>
- <source>About Bitcoin</source>
+ <source>About Bitcoin Core</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+39"/>
- <source>&lt;b&gt;Bitcoin&lt;/b&gt; version</source>
+ <source>&lt;b&gt;Bitcoin Core&lt;/b&gt; version</source>
<translation type="unfinished"/>
</message>
<message>
@@ -22,13 +22,13 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location filename="../aboutdialog.cpp" line="+14"/>
+ <location filename="../utilitydialog.cpp" line="+29"/>
<source>Copyright</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+0"/>
- <source>The Bitcoin developers</source>
+ <source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
</context>
@@ -65,7 +65,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location filename="../addressbookpage.cpp" line="+72"/>
+ <location filename="../addressbookpage.cpp" line="+74"/>
<source>&amp;Copy Address</source>
<translation type="unfinished"/>
</message>
@@ -135,7 +135,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+197"/>
+ <location line="+194"/>
<source>Export Address List</source>
<translation type="unfinished"/>
</message>
@@ -146,19 +146,19 @@ This product includes software developed by the OpenSSL Project for use in the O
</message>
<message>
<location line="+13"/>
- <source>Error exporting</source>
+ <source>Exporting Failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
+ <location line="+1"/>
+ <source>There was an error trying to save the address list to %1.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>AddressTableModel</name>
<message>
- <location filename="../addresstablemodel.cpp" line="+164"/>
+ <location filename="../addresstablemodel.cpp" line="+168"/>
<source>Label</source>
<translation type="unfinished"/>
</message>
@@ -196,7 +196,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="+34"/>
+ <location filename="../askpassphrasedialog.cpp" line="+40"/>
<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>
@@ -317,22 +317,27 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+250"/>
+ <location filename="../bitcoingui.cpp" line="+295"/>
<source>Sign &amp;message...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+254"/>
+ <location line="+335"/>
<source>Synchronizing with network...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-324"/>
+ <location line="-407"/>
<source>&amp;Overview</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="-137"/>
+ <source>Node</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+138"/>
<source>Show general overview of wallet</source>
<translation type="unfinished"/>
</message>
@@ -347,7 +352,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>E&amp;xit</source>
<translation type="unfinished"/>
</message>
@@ -393,7 +398,22 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+259"/>
+ <location line="+10"/>
+ <source>&amp;Sending addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Receiving addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open &amp;URI...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+325"/>
<source>Importing blocks from disk...</source>
<translation type="unfinished"/>
</message>
@@ -403,12 +423,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="-322"/>
+ <location line="-405"/>
<source>Send coins to a Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+47"/>
+ <location line="+49"/>
<source>Modify configuration options for Bitcoin</source>
<translation type="unfinished"/>
</message>
@@ -438,20 +458,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="-180"/>
- <location line="+6"/>
- <location line="+513"/>
+ <location line="+430"/>
<source>Bitcoin</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-519"/>
- <location line="+6"/>
+ <location line="-643"/>
<source>Wallet</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+109"/>
+ <location line="+146"/>
<source>&amp;Send</source>
<translation type="unfinished"/>
</message>
@@ -461,13 +478,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+28"/>
- <location line="+2"/>
- <source>&amp;About Bitcoin</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+14"/>
+ <location line="+46"/>
<location line="+2"/>
<source>&amp;Show / Hide</source>
<translation type="unfinished"/>
@@ -493,64 +504,80 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+35"/>
+ <location line="+48"/>
<source>&amp;File</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
+ <location line="+14"/>
<source>&amp;Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>&amp;Help</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+9"/>
+ <location line="+15"/>
<source>Tabs toolbar</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-235"/>
- <location line="+294"/>
+ <location line="-284"/>
+ <location line="+376"/>
<source>[testnet]</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-177"/>
+ <location line="-401"/>
+ <source>Bitcoin Core</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+163"/>
<source>Request payments (generates QR codes and bitcoin: URIs)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+63"/>
- <source>&amp;Used sending addresses...</source>
+ <location line="+29"/>
+ <location line="+2"/>
+ <source>&amp;About Bitcoin Core</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="+35"/>
<source>Show the list of used sending addresses and labels</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Used &amp;receiving addresses...</source>
+ <location line="+2"/>
+ <source>Show the list of used receiving addresses and labels</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open a bitcoin: URI or payment request</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Command-line options</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
- <source>Show the list of used receiving addresses and labels</source>
+ <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+106"/>
+ <location line="+159"/>
<location line="+5"/>
<source>Bitcoin client</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+120"/>
+ <location line="+142"/>
<source>%n active connection(s) to Bitcoin network</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -570,7 +597,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+20"/>
+ <location line="+23"/>
<source>%n hour(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -590,7 +617,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
+ <location line="+21"/>
<source>Last received block was generated %1 ago.</source>
<translation type="unfinished"/>
</message>
@@ -615,27 +642,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+77"/>
- <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="-152"/>
+ <location line="-85"/>
<source>Up to date</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Catching up...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+124"/>
- <source>Confirm transaction fee</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+130"/>
<source>Sent transaction</source>
<translation type="unfinished"/>
</message>
@@ -654,17 +671,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+34"/>
- <source>URI handling</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+0"/>
- <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="+45"/>
+ <location line="+69"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation type="unfinished"/>
</message>
@@ -674,7 +681,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+110"/>
+ <location filename="../bitcoin.cpp" line="+438"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation type="unfinished"/>
</message>
@@ -682,12 +689,304 @@ Address: %4
<context>
<name>ClientModel</name>
<message>
- <location filename="../clientmodel.cpp" line="+115"/>
+ <location filename="../clientmodel.cpp" line="+119"/>
<source>Network Alert</source>
<translation type="unfinished"/>
</message>
</context>
<context>
+ <name>CoinControlDialog</name>
+ <message>
+ <location filename="../forms/coincontroldialog.ui" line="+14"/>
+ <source>Coin Control Address Selection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>Quantity:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Bytes:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>Amount:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Priority:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Low Output:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>After Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Change:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+63"/>
+ <source>(un)select all</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Tree mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>List mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>Amount</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Date</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Confirmations</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Confirmed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../coincontroldialog.cpp" line="+42"/>
+ <source>Copy address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy label</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+26"/>
+ <source>Copy amount</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-25"/>
+ <source>Copy transaction ID</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Lock unspent</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Unlock unspent</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+22"/>
+ <source>Copy quantity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Copy fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy after fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy bytes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy low output</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy change</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+323"/>
+ <source>highest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>higher</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>high</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>medium-high</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>medium</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>low-medium</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>low</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>lower</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>lowest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>(%1 locked)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+140"/>
+ <source>Dust</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>yes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>no</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>This label turns red, if the transaction size is greater than 1000 bytes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+5"/>
+ <source>This means a fee of at least %1 per kB is required.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-4"/>
+ <source>Can vary +/- 1 byte per input.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Transactions with higher priority are more likely to get included into a block.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>This label turns red, if the priority is smaller than &quot;medium&quot;.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>This label turns red, if any recipient receives an amount smaller than %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+4"/>
+ <source>This means a fee of at least %1 is required.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-3"/>
+ <source>Amounts below 0.546 times the minimum relay fee are shown as dust.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>This label turns red, if the change is smaller than %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
+ <location line="+66"/>
+ <source>(no label)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-9"/>
+ <source>change from %1 (%2)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>(change)</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>EditAddressDialog</name>
<message>
<location filename="../forms/editaddressdialog.ui" line="+14"/>
@@ -715,7 +1014,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+21"/>
+ <location filename="../editaddressdialog.cpp" line="+28"/>
<source>New receiving address</source>
<translation type="unfinished"/>
</message>
@@ -758,7 +1057,7 @@ Address: %4
<context>
<name>FreespaceChecker</name>
<message>
- <location filename="../intro.cpp" line="+61"/>
+ <location filename="../intro.cpp" line="+65"/>
<source>A new data directory will be created.</source>
<translation type="unfinished"/>
</message>
@@ -784,15 +1083,19 @@ Address: %4
</message>
</context>
<context>
- <name>GUIUtil::HelpMessageBox</name>
+ <name>HelpMessageDialog</name>
<message>
- <location filename="../guiutil.cpp" line="+558"/>
- <location line="+13"/>
- <source>Bitcoin-Qt</source>
+ <location filename="../forms/helpmessagedialog.ui" line="+19"/>
+ <source>Bitcoin Core - Command-line options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-13"/>
+ <location filename="../utilitydialog.cpp" line="+38"/>
+ <source>Bitcoin Core</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
<source>version</source>
<translation type="unfinished"/>
</message>
@@ -841,17 +1144,17 @@ Address: %4
</message>
<message>
<location line="+9"/>
- <source>Welcome to Bitcoin-Qt.</source>
+ <source>Welcome to Bitcoin Core.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+26"/>
- <source>As this is the first time the program is launched, you can choose where Bitcoin-Qt will store its data.</source>
+ <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+10"/>
- <source>Bitcoin-Qt will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
+ <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -865,7 +1168,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../intro.cpp" line="+105"/>
+ <location filename="../intro.cpp" line="+85"/>
+ <source>Bitcoin</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error: Specified data directory &quot;%1&quot; can not be created.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+19"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
@@ -881,6 +1194,34 @@ Address: %4
</message>
</context>
<context>
+ <name>OpenURIDialog</name>
+ <message>
+ <location filename="../forms/openuridialog.ui" line="+14"/>
+ <source>Open URI</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Open payment request from URI or file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>URI:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Select payment request file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../openuridialog.cpp" line="+47"/>
+ <source>Select payment request file to open</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OptionsDialog</name>
<message>
<location filename="../forms/optionsdialog.ui" line="+14"/>
@@ -888,7 +1229,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+13"/>
<source>&amp;Main</source>
<translation type="unfinished"/>
</message>
@@ -913,57 +1254,87 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+35"/>
- <source>Reset all client options to default.</source>
+ <location line="+9"/>
+ <source>Size of &amp;database cache</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>&amp;Reset Options</source>
+ <location line="+13"/>
+ <source>Set database cache size in megabytes (default: 25)</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+13"/>
- <source>&amp;Network</source>
+ <source>MB</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>
+ <location line="+27"/>
+ <source>Number of script &amp;verification threads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Connect to the Bitcoin network through a SOCKS proxy.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
- <source>Map port using &amp;UPnP</source>
+ <source>&amp;Connect through SOCKS proxy (default proxy):</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>
+ <location line="+34"/>
+ <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+224"/>
+ <source>Active command-line options that override above options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
+ <source>Reset all client options to default.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
- <source>&amp;Connect through SOCKS proxy:</source>
+ <source>&amp;Reset Options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+9"/>
- <source>Proxy &amp;IP:</source>
+ <location line="-323"/>
+ <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="+19"/>
- <source>IP address of the proxy (e.g. 127.0.0.1)</source>
+ <source>Proxy &amp;IP:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="+32"/>
<source>&amp;Port:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+19"/>
+ <location line="+25"/>
<source>Port of the proxy (e.g. 9050)</source>
<translation type="unfinished"/>
</message>
@@ -1038,7 +1409,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+71"/>
+ <location line="+7"/>
+ <source>Whether to show coin control features or not.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Display coin &amp;control features (experts only)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+136"/>
<source>&amp;OK</source>
<translation type="unfinished"/>
</message>
@@ -1048,44 +1429,38 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>&amp;Apply</source>
+ <location filename="../optionsdialog.cpp" line="+67"/>
+ <source>default</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+58"/>
- <source>default</source>
+ <location line="+57"/>
+ <source>none</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+130"/>
+ <location line="+75"/>
<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>
+ <location line="+29"/>
+ <source>Client restart required to activate changes.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
- <location line="+9"/>
- <source>Warning</source>
+ <location line="-29"/>
+ <source>Client will be shutdown, do you want to proceed?</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-9"/>
- <location line="+9"/>
- <source>This setting will take effect after restarting Bitcoin.</source>
+ <location line="+33"/>
+ <source>This change would require a client restart.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+29"/>
+ <location line="+34"/>
<source>The supplied proxy address is invalid.</source>
<translation type="unfinished"/>
</message>
@@ -1099,22 +1474,22 @@ Address: %4
</message>
<message>
<location line="+50"/>
- <location line="+202"/>
+ <location line="+231"/>
<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="-131"/>
+ <location line="-155"/>
<source>Unconfirmed:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-78"/>
+ <location line="-83"/>
<source>Wallet</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+49"/>
+ <location line="+51"/>
<source>Confirmed:</source>
<translation type="unfinished"/>
</message>
@@ -1124,12 +1499,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+29"/>
+ <location line="+32"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+16"/>
<source>Immature:</source>
<translation type="unfinished"/>
</message>
@@ -1139,7 +1514,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+16"/>
<source>Total:</source>
<translation type="unfinished"/>
</message>
@@ -1149,12 +1524,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+53"/>
+ <location line="+71"/>
<source>&lt;b&gt;Recent transactions&lt;/b&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../overviewpage.cpp" line="+116"/>
+ <location filename="../overviewpage.cpp" line="+120"/>
<location line="+1"/>
<source>out of sync</source>
<translation type="unfinished"/>
@@ -1163,7 +1538,8 @@ Address: %4
<context>
<name>PaymentServer</name>
<message>
- <location filename="../paymentserver.cpp" line="+392"/>
+ <location filename="../paymentserver.cpp" line="+403"/>
+ <location line="+13"/>
<source>URI handling</source>
<translation type="unfinished"/>
</message>
@@ -1173,45 +1549,82 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+69"/>
+ <location line="+96"/>
<source>Requested payment amount of %1 is too small (considered dust).</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
- <location line="+37"/>
+ <location line="-221"/>
+ <location line="+212"/>
+ <location line="+13"/>
+ <location line="+95"/>
+ <location line="+18"/>
+ <location line="+16"/>
<source>Payment request error</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="-353"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Net manager warning</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+1"/>
- <source>Insecure requests to custom payment scripts unsupported</source>
+ <source>Your active proxy doesn&apos;t support SOCKS5, which is required for payment requests via proxy.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+38"/>
+ <location line="+52"/>
+ <source>Payment request fetch URL is invalid: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Payment request file handling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Payment request file can not be read or processed! This can be caused by an invalid payment request file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+73"/>
+ <source>Unverified payment requests to custom payment scripts are unsupported.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+59"/>
<source>Refund from %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
+ <location line="+43"/>
<source>Error communicating with %1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+24"/>
+ <source>Payment request can not be parsed or processed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
<source>Bad response from server %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+32"/>
+ <location line="+33"/>
<source>Payment acknowledged</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-58"/>
- <location line="+30"/>
- <location line="+17"/>
+ <location line="-11"/>
<source>Network request error</source>
<translation type="unfinished"/>
</message>
@@ -1219,32 +1632,26 @@ Address: %4
<context>
<name>QObject</name>
<message>
- <location filename="../bitcoin.cpp" line="+114"/>
- <location line="+5"/>
- <location filename="../intro.cpp" line="-32"/>
+ <location filename="../bitcoin.cpp" line="+71"/>
+ <location line="+11"/>
<source>Bitcoin</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-4"/>
+ <location line="+1"/>
<source>Error: Specified data directory &quot;%1&quot; does not exist.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="-12"/>
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../intro.cpp" line="+1"/>
- <source>Error: Specified data directory &quot;%1&quot; can not be created.</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>QRImageWidget</name>
<message>
- <location filename="../receiverequestdialog.cpp" line="+32"/>
+ <location filename="../receiverequestdialog.cpp" line="+36"/>
<source>&amp;Save Image...</source>
<translation type="unfinished"/>
</message>
@@ -1260,7 +1667,7 @@ Address: %4
</message>
<message>
<location line="+0"/>
- <source>PNG Images (*.png)</source>
+ <source>PNG Image (*.png)</source>
<translation type="unfinished"/>
</message>
</context>
@@ -1278,15 +1685,16 @@ Address: %4
<location line="+23"/>
<location line="+23"/>
<location line="+36"/>
- <location line="+53"/>
<location line="+23"/>
+ <location line="+36"/>
<location line="+23"/>
- <location filename="../rpcconsole.cpp" line="+352"/>
+ <location line="+23"/>
+ <location filename="../rpcconsole.cpp" line="+359"/>
<source>N/A</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-217"/>
+ <location line="-223"/>
<source>Client version</source>
<translation type="unfinished"/>
</message>
@@ -1296,7 +1704,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+68"/>
+ <location line="-10"/>
+ <source>Debug window</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+25"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+53"/>
<source>Using OpenSSL version</source>
<translation type="unfinished"/>
</message>
@@ -1312,16 +1730,16 @@ Address: %4
</message>
<message>
<location line="+7"/>
- <source>Number of connections</source>
+ <source>Name</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+23"/>
- <source>On testnet</source>
+ <source>Number of connections</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+23"/>
+ <location line="+29"/>
<source>Block chain</source>
<translation type="unfinished"/>
</message>
@@ -1346,21 +1764,6 @@ Address: %4
<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"/>
@@ -1391,22 +1794,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-541"/>
+ <location line="-521"/>
<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"/>
+ <location line="+206"/>
<source>Debug log file</source>
<translation type="unfinished"/>
</message>
@@ -1416,7 +1809,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+102"/>
+ <location line="+76"/>
<source>Clear console</source>
<translation type="unfinished"/>
</message>
@@ -1436,7 +1829,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+128"/>
+ <location line="+122"/>
<source>%1 B</source>
<translation type="unfinished"/>
</message>
@@ -1474,48 +1867,48 @@ Address: %4
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+22"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
<source>&amp;Amount:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
- <source>The amount to request</source>
+ <location line="-13"/>
+ <source>&amp;Label:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>&amp;Label:</source>
+ <location line="-34"/>
+ <source>&amp;Message:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>The label to associate with the receiving address</source>
+ <location line="-17"/>
+ <source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>&amp;Message:</source>
+ <location line="+3"/>
+ <source>R&amp;euse an existing receiving address (not recommended)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>The message to attach to payment request</source>
+ <location line="+27"/>
+ <source>An optional label to associate with the new receiving address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
- <source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
+ <location line="+7"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>R&amp;euse an existing receiving address (not recommended)</source>
+ <location line="+7"/>
+ <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>Use this form to request payments. All fields are optional.</source>
+ <location line="+39"/>
+ <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1533,6 +1926,31 @@ Address: %4
<source>&amp;Request payment</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+47"/>
+ <source>Requested payments</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Show the selected request (does the same as double clicking an entry)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Show</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Remove the selected entries from the list</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Remove</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
@@ -1553,16 +1971,11 @@ Address: %4
</message>
<message>
<location line="+7"/>
- <source>&amp;Copy Image</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+7"/>
<source>&amp;Save Image...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../receiverequestdialog.cpp" line="+58"/>
+ <location filename="../receiverequestdialog.cpp" line="+56"/>
<source>Request payment to %1</source>
<translation type="unfinished"/>
</message>
@@ -1608,16 +2021,119 @@ Address: %4
</message>
</context>
<context>
+ <name>RecentRequestsTableModel</name>
+ <message>
+ <location filename="../recentrequeststablemodel.cpp" line="+24"/>
+ <source>Date</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Label</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Amount</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+38"/>
+ <source>(no label)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>(no message)</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+140"/>
- <location line="+213"/>
+ <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location line="+80"/>
<source>Send Coins</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+50"/>
+ <location line="+76"/>
+ <source>Coin Control Features</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Inputs...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>automatically selected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Insufficient funds!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+89"/>
+ <source>Quantity:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+35"/>
+ <source>Bytes:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Amount:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Priority:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Low Output:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>After Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Change:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+44"/>
+ <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Custom change address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+115"/>
<source>Send to multiple recipients at once</source>
<translation type="unfinished"/>
</message>
@@ -1642,12 +2158,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>123.456 BTC</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+31"/>
+ <location line="+41"/>
<source>Confirm the send action</source>
<translation type="unfinished"/>
</message>
@@ -1657,69 +2168,135 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-154"/>
+ <location filename="../sendcoinsdialog.cpp" line="-228"/>
<source>Confirm send coins</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-90"/>
+ <location line="-74"/>
<location line="+5"/>
<location line="+5"/>
+ <location line="+4"/>
<source>%1 to %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+26"/>
+ <location line="-136"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Copy quantity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy after fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy bytes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy low output</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy change</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+170"/>
+ <source>Total Amount %1 (= %2)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>or</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+202"/>
<source>The recipient address is not valid, please recheck.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The amount to pay must be larger than 0.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The amount exceeds your balance.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The total exceeds your balance when the %1 transaction fee is included.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+3"/>
<source>Duplicate address found, can only send to each address once per send operation.</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="+3"/>
+ <source>Transaction creation failed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+4"/>
- <source>Error: Transaction creation failed!</source>
+ <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+15"/>
- <source>Are you sure you want to send?</source>
+ <location line="+112"/>
+ <source>Warning: Invalid Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+9"/>
- <source>added as transaction fee</source>
+ <location line="+21"/>
+ <source>(no label)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
- <source>Total Amount %1</source>
+ <location line="-11"/>
+ <source>Warning: Unknown change address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+20"/>
- <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>
+ <location line="-366"/>
+ <source>Are you sure you want to send?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>added as transaction fee</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+144"/>
+ <location line="+170"/>
<source>Payment request expired</source>
<translation type="unfinished"/>
</message>
@@ -1732,39 +2309,44 @@ Address: %4
<context>
<name>SendCoinsEntry</name>
<message>
- <location filename="../forms/sendcoinsentry.ui" line="+33"/>
- <location line="+585"/>
+ <location filename="../forms/sendcoinsentry.ui" line="+131"/>
+ <location line="+521"/>
+ <location line="+536"/>
<source>A&amp;mount:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-572"/>
- <location line="+585"/>
+ <location line="-1152"/>
<source>Pay &amp;To:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-551"/>
+ <location line="+18"/>
<source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../sendcoinsentry.cpp" line="+28"/>
+ <location filename="../sendcoinsentry.cpp" line="+30"/>
<source>Enter a label for this address to add it to your address book</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../forms/sendcoinsentry.ui" line="-18"/>
+ <location filename="../forms/sendcoinsentry.ui" line="+57"/>
<source>&amp;Label:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+28"/>
+ <location line="-50"/>
<source>Choose previously used address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
+ <location line="-40"/>
+ <source>This is a normal payment.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+50"/>
<source>Alt+A</source>
<translation type="unfinished"/>
</message>
@@ -1780,16 +2362,45 @@ Address: %4
</message>
<message>
<location line="+7"/>
- <source>Remove this recipient</source>
+ <location line="+524"/>
+ <location line="+536"/>
+ <source>Remove this entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="-1008"/>
+ <source>Message:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+958"/>
+ <source>This is a verified payment request.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-991"/>
<source>Enter a label for this address to add it to the list of used addresses</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+465"/>
+ <location line="+459"/>
+ <source>This is an unverified payment request.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+18"/>
+ <location line="+532"/>
+ <source>Pay To:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-498"/>
+ <location line="+536"/>
<source>Memo:</source>
<translation type="unfinished"/>
</message>
@@ -1800,6 +2411,19 @@ Address: %4
</message>
</context>
<context>
+ <name>ShutdownWindow</name>
+ <message>
+ <location filename="../utilitydialog.cpp" line="+48"/>
+ <source>Bitcoin Core is shutting down...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Do not shut down the computer until this window disappears.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>SignVerifyMessageDialog</name>
<message>
<location filename="../forms/signverifymessagedialog.ui" line="+14"/>
@@ -1807,7 +2431,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+10"/>
<source>&amp;Sign Message</source>
<translation type="unfinished"/>
</message>
@@ -1910,7 +2534,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+27"/>
+ <location filename="../signverifymessagedialog.cpp" line="+29"/>
<location line="+3"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation type="unfinished"/>
@@ -1926,7 +2550,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+85"/>
+ <location line="+84"/>
<location line="+81"/>
<source>The entered address is invalid.</source>
<translation type="unfinished"/>
@@ -1995,8 +2619,13 @@ Address: %4
<context>
<name>SplashScreen</name>
<message>
- <location filename="../splashscreen.cpp" line="+23"/>
- <source>The Bitcoin developers</source>
+ <location filename="../splashscreen.cpp" line="+28"/>
+ <source>Bitcoin Core</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
<message>
@@ -2008,7 +2637,7 @@ Address: %4
<context>
<name>TrafficGraphWidget</name>
<message>
- <location filename="../trafficgraphwidget.cpp" line="+75"/>
+ <location filename="../trafficgraphwidget.cpp" line="+79"/>
<source>KB/s</source>
<translation type="unfinished"/>
</message>
@@ -2016,7 +2645,7 @@ Address: %4
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="+22"/>
+ <location filename="../transactiondesc.cpp" line="+28"/>
<source>Open until %1</source>
<translation type="unfinished"/>
</message>
@@ -2089,12 +2718,12 @@ Address: %4
<location line="+12"/>
<location line="+45"/>
<location line="+17"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Credit</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="-120"/>
+ <location line="-125"/>
<source>matures in %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -2107,12 +2736,12 @@ Address: %4
<location line="+44"/>
<location line="+8"/>
<location line="+15"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Debit</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-57"/>
+ <location line="-62"/>
<source>Transaction fee</source>
<translation type="unfinished"/>
</message>
@@ -2123,11 +2752,12 @@ Address: %4
</message>
<message>
<location line="+6"/>
+ <location line="+9"/>
<source>Message</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="-7"/>
<source>Comment</source>
<translation type="unfinished"/>
</message>
@@ -2137,7 +2767,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+18"/>
<source>Merchant</source>
<translation type="unfinished"/>
</message>
@@ -2177,7 +2807,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-227"/>
+ <location line="-232"/>
<source>, has not been successfully broadcast yet</source>
<translation type="unfinished"/>
</message>
@@ -2208,7 +2838,7 @@ Address: %4
<context>
<name>TransactionTableModel</name>
<message>
- <location filename="../transactiontablemodel.cpp" line="+227"/>
+ <location filename="../transactiontablemodel.cpp" line="+234"/>
<source>Date</source>
<translation type="unfinished"/>
</message>
@@ -2227,8 +2857,13 @@ Address: %4
<source>Amount</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+59"/>
+ <source>Immature (%1 confirmations, will be available after %2)</source>
+ <translation type="unfinished"/>
+ </message>
<message numerus="yes">
- <location line="+57"/>
+ <location line="+16"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -2248,17 +2883,13 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
+ <location line="-22"/>
+ <location line="+25"/>
<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"/>
+ <location line="-22"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation type="unfinished"/>
</message>
@@ -2268,7 +2899,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+43"/>
+ <location line="+62"/>
<source>Received with</source>
<translation type="unfinished"/>
</message>
@@ -2326,7 +2957,7 @@ Address: %4
<context>
<name>TransactionView</name>
<message>
- <location filename="../transactionview.cpp" line="+52"/>
+ <location filename="../transactionview.cpp" line="+57"/>
<location line="+16"/>
<source>All</source>
<translation type="unfinished"/>
@@ -2387,12 +3018,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="+6"/>
<source>Enter address or label to search</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="+6"/>
<source>Min amount</source>
<translation type="unfinished"/>
</message>
@@ -2427,17 +3058,37 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+143"/>
- <source>Export Transaction Data</source>
+ <location line="+142"/>
+ <source>Export Transaction History</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="+19"/>
+ <source>Exporting Failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>There was an error trying to save the transaction history to %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Exporting Successful</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The transaction history was successfully saved to %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-22"/>
<source>Comma separated file (*.csv)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+8"/>
+ <location line="+9"/>
<source>Confirmed</source>
<translation type="unfinished"/>
</message>
@@ -2472,17 +3123,7 @@ Address: %4
<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"/>
+ <location line="+107"/>
<source>Range:</source>
<translation type="unfinished"/>
</message>
@@ -2493,9 +3134,17 @@ Address: %4
</message>
</context>
<context>
+ <name>WalletFrame</name>
+ <message>
+ <location filename="../walletframe.cpp" line="+26"/>
+ <source>No wallet has been loaded.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>WalletModel</name>
<message>
- <location filename="../walletmodel.cpp" line="+218"/>
+ <location filename="../walletmodel.cpp" line="+245"/>
<source>Send Coins</source>
<translation type="unfinished"/>
</message>
@@ -2503,7 +3152,7 @@ Address: %4
<context>
<name>WalletView</name>
<message>
- <location filename="../walletview.cpp" line="+46"/>
+ <location filename="../walletview.cpp" line="+43"/>
<source>&amp;Export</source>
<translation type="unfinished"/>
</message>
@@ -2513,65 +3162,60 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+183"/>
+ <location line="+181"/>
<source>Backup Wallet</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
+ <location line="+1"/>
<source>Wallet Data (*.dat)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
+ <location line="+6"/>
<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>
+ <source>There was an error trying to save the wallet data to %1.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+4"/>
- <source>Backup Successful</source>
+ <source>The wallet data was successfully saved to %1.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+0"/>
- <source>The wallet data was successfully saved to the new location.</source>
+ <source>Backup Successful</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+102"/>
- <source>Bitcoin version</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+107"/>
+ <location filename="../bitcoinstrings.cpp" line="+221"/>
<source>Usage:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-55"/>
+ <location line="-54"/>
<source>List commands</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-13"/>
+ <location line="-14"/>
<source>Get help for a command</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+25"/>
+ <location line="+26"/>
<source>Options:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+24"/>
+ <location line="+22"/>
<source>Specify configuration file (default: bitcoin.conf)</source>
<translation type="unfinished"/>
</message>
@@ -2591,7 +3235,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-28"/>
+ <location line="-26"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
<translation type="unfinished"/>
</message>
@@ -2601,7 +3245,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-49"/>
+ <location line="-51"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation type="unfinished"/>
</message>
@@ -2611,37 +3255,37 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-142"/>
+ <location line="-148"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-33"/>
+ <location line="-36"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+40"/>
+ <location line="+45"/>
<source>Accept command line and JSON-RPC commands</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<source>Run in the background as a daemon and accept commands</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+40"/>
+ <location line="+39"/>
<source>Use the test network</source>
<translation type="unfinished"/>
</message>
@@ -2651,7 +3295,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-87"/>
+ <location line="-95"/>
<source>%s, you must set a rpcpassword in the configuration file:
%s
It is recommended you use the following random password:
@@ -2692,6 +3336,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+4"/>
+ <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</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>
@@ -2706,17 +3355,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+11"/>
- <source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source>
+ <location line="+18"/>
+ <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="+6"/>
- <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
+ <location line="+5"/>
+ <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+3"/>
<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>
@@ -2746,17 +3395,27 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
+ <location line="+9"/>
+ <source>&lt;category&gt; can be:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
<source>Attempt to recover private keys from a corrupt wallet.dat</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
+ <source>Bitcoin Core Daemon</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Bitcoin RPC client version</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
<source>Block creation options:</source>
<translation type="unfinished"/>
</message>
@@ -2766,7 +3425,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
+ <source>Connect through SOCKS proxy</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect to JSON-RPC on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation type="unfinished"/>
</message>
@@ -2782,6 +3446,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+1"/>
+ <source>Do not load the wallet and disable wallet RPC calls</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Do you want to rebuild the block database now?</source>
<translation type="unfinished"/>
</message>
@@ -2876,7 +3545,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
+ <source>Fee per kB to add to transactions you send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Find peers using DNS lookup (default: 1 unless -connect)</source>
<translation type="unfinished"/>
</message>
@@ -2896,6 +3570,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
+ <location line="+1"/>
+ <source>If &lt;category&gt; is not supplied, output all debugging information.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+2"/>
<source>Incorrect or no genesis block found. Wrong datadir for network?</source>
<translation type="unfinished"/>
@@ -2911,17 +3590,37 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+8"/>
+ <location line="+5"/>
+ <source>Prepend debug output with timestamp (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>RPC client options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Rebuild block chain index from current blk000??.dat files</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+5"/>
+ <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Send command to Bitcoin server</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
+ <location line="+7"/>
+ <source>Set maximum block size in bytes (default: %d)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Set the number of threads to service RPC calls (default: 4)</source>
<translation type="unfinished"/>
</message>
@@ -2936,12 +3635,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+12"/>
+ <location line="+3"/>
+ <source>This is intended for regression testing tools and app development.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Usage (deprecated, use bitcoin-cli):</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+8"/>
+ <location line="+7"/>
<source>Verifying blocks...</source>
<translation type="unfinished"/>
</message>
@@ -2952,31 +3656,56 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+1"/>
+ <source>Wait for RPC server to start</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Wallet %s resides outside data directory %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+2"/>
+ <source>Wallet options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>You need to rebuild the database using -reindex to change -txindex</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-78"/>
+ <location line="-79"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-98"/>
+ <location line="-105"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+17"/>
+ <location line="+14"/>
+ <source>Output debugging information (default: 0, supplying &lt;category&gt; is optional)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+83"/>
+ <location line="+89"/>
<source>Information</source>
<translation type="unfinished"/>
</message>
@@ -3016,47 +3745,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<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"/>
+ <location line="+9"/>
<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"/>
+ <location line="+4"/>
<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"/>
+ <location line="+6"/>
<source>Set minimum block size in bytes (default: 0)</source>
<translation type="unfinished"/>
</message>
@@ -3081,7 +3780,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Transaction amount too small</source>
<translation type="unfinished"/>
</message>
@@ -3106,32 +3805,32 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<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="+5"/>
+ <location line="+7"/>
<source>Warning</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Warning: This version is obsolete, upgrade required!</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+2"/>
+ <source>version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>wallet.dat corrupt, salvage failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-54"/>
+ <location line="-58"/>
<source>Password for JSON-RPC connections</source>
<translation type="unfinished"/>
</message>
@@ -3141,27 +3840,27 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-126"/>
+ <location line="-132"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+155"/>
+ <location line="+161"/>
<source>Upgrade wallet to latest format</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-12"/>
+ <location line="-11"/>
<source>Rescan the block chain for missing wallet transactions</source>
<translation type="unfinished"/>
</message>
@@ -3171,7 +3870,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-29"/>
+ <location line="-30"/>
<source>Server certificate file (default: server.cert)</source>
<translation type="unfinished"/>
</message>
@@ -3186,27 +3885,22 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Unable to bind to %s on this computer (bind returned error %d, %s)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-95"/>
- <source>Connect through socks proxy</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="-11"/>
+ <location line="-107"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+58"/>
+ <location line="+60"/>
<source>Loading addresses...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-36"/>
+ <location line="-37"/>
<source>Error loading wallet.dat: Wallet corrupted</source>
<translation type="unfinished"/>
</message>
@@ -3226,12 +3920,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+30"/>
+ <location line="+31"/>
<source>Invalid -proxy address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+57"/>
+ <location line="+56"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3241,7 +3935,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3251,7 +3945,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+46"/>
+ <location line="+48"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3271,27 +3965,22 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-60"/>
+ <location line="-62"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-28"/>
+ <location line="-32"/>
<source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+69"/>
- <source>Fee per KB to add to transactions you send</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+20"/>
+ <location line="+95"/>
<source>Loading wallet...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-54"/>
+ <location line="-56"/>
<source>Cannot downgrade wallet</source>
<translation type="unfinished"/>
</message>
@@ -3301,7 +3990,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+66"/>
+ <location line="+67"/>
<source>Rescanning...</source>
<translation type="unfinished"/>
</message>
@@ -3321,7 +4010,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-33"/>
+ <location line="-35"/>
<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_af_ZA.ts b/src/qt/locale/bitcoin_af_ZA.ts
index 0c44a90bc2..ab6f88d377 100644
--- a/src/qt/locale/bitcoin_af_ZA.ts
+++ b/src/qt/locale/bitcoin_af_ZA.ts
@@ -22,13 +22,13 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location filename="../aboutdialog.cpp" line="+19"/>
+ <location filename="../utilitydialog.cpp" line="+29"/>
<source>Copyright</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+0"/>
- <source>The Bitcoin developers</source>
+ <source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
</context>
@@ -146,13 +146,13 @@ This product includes software developed by the OpenSSL Project for use in the O
</message>
<message>
<location line="+13"/>
- <source>Error exporting</source>
- <translation>Fout uitvoering</translation>
+ <source>Exporting Failed</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation>Kon nie na die %1 lêer skryf nie</translation>
+ <location line="+1"/>
+ <source>There was an error trying to save the address list to %1.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -317,22 +317,27 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+260"/>
+ <location filename="../bitcoingui.cpp" line="+295"/>
<source>Sign &amp;message...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+290"/>
+ <location line="+335"/>
<source>Synchronizing with network...</source>
<translation>Sinchroniseer met die netwerk ...</translation>
</message>
<message>
- <location line="-360"/>
+ <location line="-407"/>
<source>&amp;Overview</source>
<translation>&amp;Oorsig</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="-137"/>
+ <source>Node</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+138"/>
<source>Show general overview of wallet</source>
<translation>Wys algemene oorsig van die beursie</translation>
</message>
@@ -347,7 +352,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Besoek transaksie geskiedenis</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>E&amp;xit</source>
<translation>S&amp;luit af</translation>
</message>
@@ -393,7 +398,22 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+295"/>
+ <location line="+10"/>
+ <source>&amp;Sending addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Receiving addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open &amp;URI...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+325"/>
<source>Importing blocks from disk...</source>
<translation type="unfinished"/>
</message>
@@ -403,12 +423,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="-358"/>
+ <location line="-405"/>
<source>Send coins to a Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+47"/>
+ <location line="+49"/>
<source>Modify configuration options for Bitcoin</source>
<translation type="unfinished"/>
</message>
@@ -438,18 +458,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+375"/>
+ <location line="+430"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-563"/>
- <location line="+10"/>
+ <location line="-643"/>
<source>Wallet</source>
<translation>Beursie</translation>
</message>
<message>
- <location line="+113"/>
+ <location line="+146"/>
<source>&amp;Send</source>
<translation type="unfinished"/>
</message>
@@ -459,7 +478,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+44"/>
+ <location line="+46"/>
<location line="+2"/>
<source>&amp;Show / Hide</source>
<translation type="unfinished"/>
@@ -485,86 +504,80 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+39"/>
+ <location line="+48"/>
<source>&amp;File</source>
<translation>&amp;Lêer</translation>
</message>
<message>
- <location line="+11"/>
+ <location line="+14"/>
<source>&amp;Settings</source>
<translation>&amp;Instellings</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>&amp;Help</source>
<translation>&amp;Hulp</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+15"/>
<source>Tabs toolbar</source>
<translation>Blad nutsbalk</translation>
</message>
<message>
- <location line="-244"/>
- <location line="+321"/>
+ <location line="-284"/>
+ <location line="+376"/>
<source>[testnet]</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-331"/>
- <location line="+10"/>
+ <location line="-401"/>
<source>Bitcoin Core</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+121"/>
+ <location line="+163"/>
<source>Request payments (generates QR codes and bitcoin: URIs)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+27"/>
+ <location line="+29"/>
<location line="+2"/>
<source>&amp;About Bitcoin Core</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+34"/>
- <source>&amp;Used sending addresses...</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+35"/>
<source>Show the list of used sending addresses and labels</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Used &amp;receiving addresses...</source>
+ <location line="+2"/>
+ <source>Show the list of used receiving addresses and labels</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Show the list of used receiving addresses and labels</source>
+ <location line="+3"/>
+ <source>Open a bitcoin: URI or payment request</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+2"/>
- <source>Open URI...</source>
+ <source>&amp;Command-line options</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
- <source>Open a bitcoin: URI or payment request</source>
+ <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+126"/>
+ <location line="+159"/>
<location line="+5"/>
<source>Bitcoin client</source>
<translation>Bitcoin klient</translation>
</message>
<message numerus="yes">
- <location line="+133"/>
+ <location line="+142"/>
<source>%n active connection(s) to Bitcoin network</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -584,7 +597,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+20"/>
+ <location line="+23"/>
<source>%n hour(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -604,7 +617,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>%1 agter</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="+21"/>
<source>Last received block was generated %1 ago.</source>
<translation>Ontvangs van laaste blok is %1 terug.</translation>
</message>
@@ -629,27 +642,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Informasie</translation>
</message>
<message>
- <location line="+77"/>
- <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="-152"/>
+ <location line="-85"/>
<source>Up to date</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Catching up...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+124"/>
- <source>Confirm transaction fee</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+130"/>
<source>Sent transaction</source>
<translation type="unfinished"/>
</message>
@@ -668,7 +671,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+67"/>
+ <location line="+69"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation type="unfinished"/>
</message>
@@ -678,7 +681,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+116"/>
+ <location filename="../bitcoin.cpp" line="+438"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation type="unfinished"/>
</message>
@@ -900,7 +903,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+171"/>
+ <location line="+31"/>
+ <source>none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+140"/>
<source>Dust</source>
<translation type="unfinished"/>
</message>
@@ -937,7 +945,7 @@ Address: %4
</message>
<message>
<location line="+1"/>
- <source>This label turns red, if the priority is smaller than &quot;medium&quot;</source>
+ <source>This label turns red, if the priority is smaller than &quot;medium&quot;.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1006,7 +1014,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+25"/>
+ <location filename="../editaddressdialog.cpp" line="+28"/>
<source>New receiving address</source>
<translation>Nuwe ontvangende adres</translation>
</message>
@@ -1075,20 +1083,24 @@ Address: %4
</message>
</context>
<context>
- <name>GUIUtil::HelpMessageBox</name>
+ <name>HelpMessageDialog</name>
<message>
- <location filename="../guiutil.cpp" line="+597"/>
- <source>version</source>
+ <location filename="../forms/helpmessagedialog.ui" line="+19"/>
+ <source>Bitcoin Core - Command-line options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <location line="+13"/>
+ <location filename="../utilitydialog.cpp" line="+38"/>
<source>Bitcoin Core</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-11"/>
+ <location line="+0"/>
+ <source>version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Usage:</source>
<translation>Gebruik:</translation>
</message>
@@ -1217,7 +1229,7 @@ Address: %4
<translation>Opsies</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+13"/>
<source>&amp;Main</source>
<translation type="unfinished"/>
</message>
@@ -1242,57 +1254,87 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+35"/>
- <source>Reset all client options to default.</source>
+ <location line="+9"/>
+ <source>Size of &amp;database cache</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>&amp;Reset Options</source>
+ <location line="+13"/>
+ <source>Set database cache size in megabytes (default: 25)</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+13"/>
- <source>&amp;Network</source>
+ <source>MB</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>
+ <location line="+27"/>
+ <source>Number of script &amp;verification threads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Connect to the Bitcoin network through a SOCKS proxy.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
- <source>Map port using &amp;UPnP</source>
+ <source>&amp;Connect through SOCKS proxy (default proxy):</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>
+ <location line="+34"/>
+ <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+224"/>
+ <source>Active command-line options that override above options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
+ <source>Reset all client options to default.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
- <source>&amp;Connect through SOCKS proxy:</source>
+ <source>&amp;Reset Options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+9"/>
- <source>Proxy &amp;IP:</source>
+ <location line="-323"/>
+ <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="+19"/>
- <source>IP address of the proxy (e.g. 127.0.0.1)</source>
+ <source>Proxy &amp;IP:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="+32"/>
<source>&amp;Port:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+19"/>
+ <location line="+25"/>
<source>Port of the proxy (e.g. 9050)</source>
<translation type="unfinished"/>
</message>
@@ -1377,7 +1419,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+71"/>
+ <location line="+136"/>
<source>&amp;OK</source>
<translation type="unfinished"/>
</message>
@@ -1387,44 +1429,38 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>&amp;Apply</source>
+ <location filename="../optionsdialog.cpp" line="+67"/>
+ <source>default</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+63"/>
- <source>default</source>
+ <location line="+57"/>
+ <source>none</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+131"/>
+ <location line="+75"/>
<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>
+ <location line="+29"/>
+ <source>Client restart required to activate changes.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
- <location line="+9"/>
- <source>Warning</source>
+ <location line="-29"/>
+ <source>Client will be shutdown, do you want to proceed?</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-9"/>
- <location line="+9"/>
- <source>This setting will take effect after restarting Bitcoin.</source>
+ <location line="+33"/>
+ <source>This change would require a client restart.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+29"/>
+ <location line="+34"/>
<source>The supplied proxy address is invalid.</source>
<translation type="unfinished"/>
</message>
@@ -1438,22 +1474,22 @@ Address: %4
</message>
<message>
<location line="+50"/>
- <location line="+214"/>
+ <location line="+231"/>
<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="-140"/>
+ <location line="-155"/>
<source>Unconfirmed:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-81"/>
+ <location line="-83"/>
<source>Wallet</source>
<translation>Beursie</translation>
</message>
<message>
- <location line="+49"/>
+ <location line="+51"/>
<source>Confirmed:</source>
<translation type="unfinished"/>
</message>
@@ -1488,7 +1524,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+56"/>
+ <location line="+71"/>
<source>&lt;b&gt;Recent transactions&lt;/b&gt;</source>
<translation>&lt;b&gt;Onlangse transaksies&lt;/b&gt;</translation>
</message>
@@ -1502,7 +1538,8 @@ Address: %4
<context>
<name>PaymentServer</name>
<message>
- <location filename="../paymentserver.cpp" line="+397"/>
+ <location filename="../paymentserver.cpp" line="+403"/>
+ <location line="+13"/>
<source>URI handling</source>
<translation type="unfinished"/>
</message>
@@ -1512,24 +1549,52 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+91"/>
+ <location line="+96"/>
<source>Requested payment amount of %1 is too small (considered dust).</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-204"/>
- <location line="+195"/>
+ <location line="-221"/>
+ <location line="+212"/>
<location line="+13"/>
+ <location line="+95"/>
+ <location line="+18"/>
+ <location line="+16"/>
<source>Payment request error</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-207"/>
+ <location line="-353"/>
<source>Cannot start bitcoin: click-to-pay handler</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+195"/>
+ <location line="+58"/>
+ <source>Net manager warning</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Your active proxy doesn&apos;t support SOCKS5, which is required for payment requests via proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>Payment request fetch URL is invalid: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Payment request file handling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Payment request file can not be read or processed! This can be caused by an invalid payment request file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+73"/>
<source>Unverified payment requests to custom payment scripts are unsupported.</source>
<translation type="unfinished"/>
</message>
@@ -1539,24 +1604,27 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
+ <location line="+43"/>
<source>Error communicating with %1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+28"/>
+ <location line="+24"/>
+ <source>Payment request can not be parsed or processed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
<source>Bad response from server %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+32"/>
+ <location line="+33"/>
<source>Payment acknowledged</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-55"/>
- <location line="+27"/>
- <location line="+17"/>
+ <location line="-11"/>
<source>Network request error</source>
<translation type="unfinished"/>
</message>
@@ -1564,18 +1632,18 @@ Address: %4
<context>
<name>QObject</name>
<message>
- <location filename="../bitcoin.cpp" line="+119"/>
- <location line="+5"/>
+ <location filename="../bitcoin.cpp" line="+71"/>
+ <location line="+11"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-4"/>
+ <location line="+1"/>
<source>Error: Specified data directory &quot;%1&quot; does not exist.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="-12"/>
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation type="unfinished"/>
</message>
@@ -1617,15 +1685,16 @@ Address: %4
<location line="+23"/>
<location line="+23"/>
<location line="+36"/>
- <location line="+53"/>
+ <location line="+23"/>
+ <location line="+36"/>
<location line="+23"/>
<location line="+23"/>
- <location filename="../rpcconsole.cpp" line="+360"/>
+ <location filename="../rpcconsole.cpp" line="+359"/>
<source>N/A</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-217"/>
+ <location line="-223"/>
<source>Client version</source>
<translation type="unfinished"/>
</message>
@@ -1640,7 +1709,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+78"/>
+ <location line="+25"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+53"/>
<source>Using OpenSSL version</source>
<translation type="unfinished"/>
</message>
@@ -1656,16 +1730,16 @@ Address: %4
</message>
<message>
<location line="+7"/>
- <source>Number of connections</source>
+ <source>Name</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+23"/>
- <source>On testnet</source>
+ <source>Number of connections</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+23"/>
+ <location line="+29"/>
<source>Block chain</source>
<translation type="unfinished"/>
</message>
@@ -1690,16 +1764,6 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
- <source>Command-line options</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+10"/>
- <source>&amp;Show</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location line="+24"/>
<source>&amp;Console</source>
<translation type="unfinished"/>
@@ -1730,17 +1794,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-541"/>
+ <location line="-521"/>
<source>Build date</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-79"/>
- <source>Bitcoin Core</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+279"/>
+ <location line="+206"/>
<source>Debug log file</source>
<translation type="unfinished"/>
</message>
@@ -1750,11 +1809,6 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+26"/>
- <source>Show the Bitcoin-Core help message to get a list with possible Bitcoin command-line options.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location line="+76"/>
<source>Clear console</source>
<translation type="unfinished"/>
@@ -1775,7 +1829,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+128"/>
+ <location line="+122"/>
<source>%1 B</source>
<translation type="unfinished"/>
</message>
@@ -1818,12 +1872,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+19"/>
- <source>The amount to request</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="-32"/>
+ <location line="-13"/>
<source>&amp;Label:</source>
<translation type="unfinished"/>
</message>
@@ -1833,12 +1882,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+20"/>
- <source>The message to attach to payment request</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="-37"/>
+ <location line="-17"/>
<source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
@@ -1849,16 +1893,26 @@ Address: %4
</message>
<message>
<location line="+27"/>
- <source>The label to associate with the new receiving address</source>
+ <source>An optional label to associate with the new receiving address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
- <source>Use this form to request payments. All fields are optional.</source>
+ <location line="+7"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+56"/>
+ <location line="+7"/>
+ <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+39"/>
+ <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+17"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"/>
</message>
@@ -1874,11 +1928,11 @@ Address: %4
</message>
<message>
<location line="+47"/>
- <source>Previously requested payments</source>
+ <source>Requested payments</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+12"/>
+ <location line="+16"/>
<source>Show the selected request (does the same as double clicking an entry)</source>
<translation type="unfinished"/>
</message>
@@ -1969,7 +2023,7 @@ Address: %4
<context>
<name>RecentRequestsTableModel</name>
<message>
- <location filename="../recentrequeststablemodel.cpp" line="+14"/>
+ <location filename="../recentrequeststablemodel.cpp" line="+24"/>
<source>Date</source>
<translation>Datum</translation>
</message>
@@ -1989,7 +2043,7 @@ Address: %4
<translation>Bedrag</translation>
</message>
<message>
- <location line="+36"/>
+ <location line="+38"/>
<source>(no label)</source>
<translation>(geen etiket)</translation>
</message>
@@ -2004,7 +2058,7 @@ Address: %4
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
<location filename="../sendcoinsdialog.cpp" line="+381"/>
- <location line="+81"/>
+ <location line="+80"/>
<source>Send Coins</source>
<translation>Stuur Munstukke</translation>
</message>
@@ -2114,7 +2168,7 @@ Address: %4
<translation>S&amp;tuur</translation>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-229"/>
+ <location filename="../sendcoinsdialog.cpp" line="-228"/>
<source>Confirm send coins</source>
<translation type="unfinished"/>
</message>
@@ -2217,22 +2271,22 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+113"/>
+ <location line="+112"/>
<source>Warning: Invalid Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+21"/>
<source>(no label)</source>
<translation>(geen etiket)</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="-11"/>
<source>Warning: Unknown change address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-378"/>
+ <location line="-366"/>
<source>Are you sure you want to send?</source>
<translation type="unfinished"/>
</message>
@@ -2256,13 +2310,13 @@ Address: %4
<name>SendCoinsEntry</name>
<message>
<location filename="../forms/sendcoinsentry.ui" line="+131"/>
- <location line="+501"/>
+ <location line="+521"/>
<location line="+536"/>
<source>A&amp;mount:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-1132"/>
+ <location line="-1152"/>
<source>Pay &amp;To:</source>
<translation type="unfinished"/>
</message>
@@ -2308,23 +2362,33 @@ Address: %4
</message>
<message>
<location line="+7"/>
- <location line="+504"/>
+ <location line="+524"/>
<location line="+536"/>
<source>Remove this entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-40"/>
+ <location line="-1008"/>
+ <source>Message:</source>
+ <translation>Boodskap:</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+958"/>
<source>This is a verified payment request.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-971"/>
+ <location line="-991"/>
<source>Enter a label for this address to add it to the list of used addresses</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+439"/>
+ <location line="+459"/>
<source>This is an unverified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2347,6 +2411,19 @@ Address: %4
</message>
</context>
<context>
+ <name>ShutdownWindow</name>
+ <message>
+ <location filename="../utilitydialog.cpp" line="+48"/>
+ <source>Bitcoin Core is shutting down...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Do not shut down the computer until this window disappears.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>SignVerifyMessageDialog</name>
<message>
<location filename="../forms/signverifymessagedialog.ui" line="+14"/>
@@ -2354,7 +2431,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+10"/>
<source>&amp;Sign Message</source>
<translation>&amp;Teken boodskap</translation>
</message>
@@ -2542,7 +2619,7 @@ Address: %4
<context>
<name>SplashScreen</name>
<message>
- <location filename="../splashscreen.cpp" line="+26"/>
+ <location filename="../splashscreen.cpp" line="+28"/>
<source>Bitcoin Core</source>
<translation type="unfinished"/>
</message>
@@ -2641,12 +2718,12 @@ Address: %4
<location line="+12"/>
<location line="+45"/>
<location line="+17"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Credit</source>
<translation>Krediet</translation>
</message>
<message numerus="yes">
- <location line="-120"/>
+ <location line="-125"/>
<source>matures in %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -2659,12 +2736,12 @@ Address: %4
<location line="+44"/>
<location line="+8"/>
<location line="+15"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Debit</source>
<translation>Debiet</translation>
</message>
<message>
- <location line="-57"/>
+ <location line="-62"/>
<source>Transaction fee</source>
<translation>Transaksie fooi</translation>
</message>
@@ -2675,11 +2752,12 @@ Address: %4
</message>
<message>
<location line="+6"/>
+ <location line="+9"/>
<source>Message</source>
<translation>Boodskap</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="-7"/>
<source>Comment</source>
<translation type="unfinished"/>
</message>
@@ -2689,7 +2767,7 @@ Address: %4
<translation>Transaksie ID</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+18"/>
<source>Merchant</source>
<translation type="unfinished"/>
</message>
@@ -2729,7 +2807,7 @@ Address: %4
<translation>onwaar</translation>
</message>
<message>
- <location line="-227"/>
+ <location line="-232"/>
<source>, has not been successfully broadcast yet</source>
<translation type="unfinished"/>
</message>
@@ -2779,8 +2857,13 @@ Address: %4
<source>Amount</source>
<translation>Bedrag</translation>
</message>
+ <message>
+ <location line="+59"/>
+ <source>Immature (%1 confirmations, will be available after %2)</source>
+ <translation type="unfinished"/>
+ </message>
<message numerus="yes">
- <location line="+57"/>
+ <location line="+16"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -2800,17 +2883,13 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
+ <location line="-22"/>
+ <location line="+25"/>
<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"/>
+ <location line="-22"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation type="unfinished"/>
</message>
@@ -2820,7 +2899,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+43"/>
+ <location line="+62"/>
<source>Received with</source>
<translation>Ontvang met</translation>
</message>
@@ -3116,7 +3195,7 @@ Address: %4
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+217"/>
+ <location filename="../bitcoinstrings.cpp" line="+221"/>
<source>Usage:</source>
<translation>Gebruik:</translation>
</message>
@@ -3136,7 +3215,7 @@ Address: %4
<translation>Opsies:</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+22"/>
<source>Specify configuration file (default: bitcoin.conf)</source>
<translation type="unfinished"/>
</message>
@@ -3156,7 +3235,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-27"/>
+ <location line="-26"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
<translation>Luister vir konneksies op &lt;port&gt; (standaard: 8333 of testnet: 18333)</translation>
</message>
@@ -3166,7 +3245,7 @@ Address: %4
<translation>Onderhou op die meeste &lt;n&gt; konneksies na eweknieë (standaard: 125)</translation>
</message>
<message>
- <location line="-50"/>
+ <location line="-51"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation type="unfinished"/>
</message>
@@ -3176,22 +3255,22 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-147"/>
+ <location line="-148"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-33"/>
+ <location line="-36"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation type="unfinished"/>
</message>
@@ -3201,7 +3280,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<source>Run in the background as a daemon and accept commands</source>
<translation type="unfinished"/>
</message>
@@ -3211,12 +3290,12 @@ Address: %4
<translation>Gebruik die toets netwerk</translation>
</message>
<message>
- <location line="-117"/>
+ <location line="-118"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-92"/>
+ <location line="-95"/>
<source>%s, you must set a rpcpassword in the configuration file:
%s
It is recommended you use the following random password:
@@ -3257,6 +3336,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+4"/>
+ <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</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>
@@ -3362,6 +3446,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+1"/>
+ <source>Do not load the wallet and disable wallet RPC calls</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Do you want to rebuild the block database now?</source>
<translation type="unfinished"/>
</message>
@@ -3526,7 +3615,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+8"/>
+ <location line="+7"/>
<source>Set maximum block size in bytes (default: %d)</source>
<translation type="unfinished"/>
</message>
@@ -3546,7 +3635,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+12"/>
+ <location line="+3"/>
+ <source>This is intended for regression testing tools and app development.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Usage (deprecated, use bitcoin-cli):</source>
<translation type="unfinished"/>
</message>
@@ -3571,7 +3665,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
+ <location line="+2"/>
+ <source>Wallet options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source>
<translation type="unfinished"/>
</message>
@@ -3581,12 +3680,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-78"/>
+ <location line="-79"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-104"/>
+ <location line="-105"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
@@ -3606,7 +3705,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+88"/>
+ <location line="+89"/>
<source>Information</source>
<translation>Informasie</translation>
</message>
@@ -3656,11 +3755,6 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Send trace/debug info to debugger</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location line="+6"/>
<source>Set minimum block size in bytes (default: 0)</source>
<translation type="unfinished"/>
@@ -3686,7 +3780,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Sisteem fout:</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Transaction amount too small</source>
<translation type="unfinished"/>
</message>
@@ -3716,7 +3810,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Warning</source>
<translation type="unfinished"/>
</message>
@@ -3736,37 +3830,37 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-57"/>
+ <location line="-58"/>
<source>Password for JSON-RPC connections</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-69"/>
+ <location line="-70"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-131"/>
+ <location line="-132"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+160"/>
+ <location line="+161"/>
<source>Upgrade wallet to latest format</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-12"/>
+ <location line="-11"/>
<source>Rescan the block chain for missing wallet transactions</source>
<translation type="unfinished"/>
</message>
@@ -3776,7 +3870,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-29"/>
+ <location line="-30"/>
<source>Server certificate file (default: server.cert)</source>
<translation type="unfinished"/>
</message>
@@ -3791,17 +3885,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Hierdie help boodskap</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Unable to bind to %s on this computer (bind returned error %d, %s)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-106"/>
+ <location line="-107"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+59"/>
+ <location line="+60"/>
<source>Loading addresses...</source>
<translation>Laai adresse...</translation>
</message>
@@ -3841,7 +3935,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3851,7 +3945,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+47"/>
+ <location line="+48"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3871,7 +3965,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Laai blok indeks...</translation>
</message>
<message>
- <location line="-61"/>
+ <location line="-62"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation type="unfinished"/>
</message>
@@ -3881,12 +3975,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+94"/>
+ <location line="+95"/>
<source>Loading wallet...</source>
<translation>Laai beursie...</translation>
</message>
<message>
- <location line="-55"/>
+ <location line="-56"/>
<source>Cannot downgrade wallet</source>
<translation type="unfinished"/>
</message>
@@ -3896,7 +3990,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+66"/>
+ <location line="+67"/>
<source>Rescanning...</source>
<translation type="unfinished"/>
</message>
@@ -3916,7 +4010,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Fout</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-35"/>
<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_ar.ts b/src/qt/locale/bitcoin_ar.ts
index 5a6c7fc693..2cd74d6604 100644
--- a/src/qt/locale/bitcoin_ar.ts
+++ b/src/qt/locale/bitcoin_ar.ts
@@ -3,13 +3,13 @@
<name>AboutDialog</name>
<message>
<location filename="../forms/aboutdialog.ui" line="+14"/>
- <source>About Bitcoin</source>
- <translation>عن Bitcoin</translation>
+ <source>About Bitcoin Core</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+39"/>
- <source>&lt;b&gt;Bitcoin&lt;/b&gt; version</source>
- <translation>نسخة &lt;b&gt;Bitcoin&lt;/b&gt;</translation>
+ <source>&lt;b&gt;Bitcoin Core&lt;/b&gt; version</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+57"/>
@@ -22,13 +22,13 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location filename="../aboutdialog.cpp" line="+14"/>
+ <location filename="../utilitydialog.cpp" line="+29"/>
<source>Copyright</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+0"/>
- <source>The Bitcoin developers</source>
+ <source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
</context>
@@ -65,7 +65,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location filename="../addressbookpage.cpp" line="+72"/>
+ <location filename="../addressbookpage.cpp" line="+74"/>
<source>&amp;Copy Address</source>
<translation type="unfinished"/>
</message>
@@ -135,7 +135,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+197"/>
+ <location line="+194"/>
<source>Export Address List</source>
<translation type="unfinished"/>
</message>
@@ -146,19 +146,19 @@ This product includes software developed by the OpenSSL Project for use in the O
</message>
<message>
<location line="+13"/>
- <source>Error exporting</source>
- <translation>تقرير عن الخطأ</translation>
+ <source>Exporting Failed</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation>لم يستطع الكتابة على المل٠%1.</translation>
+ <location line="+1"/>
+ <source>There was an error trying to save the address list to %1.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<name>AddressTableModel</name>
<message>
- <location filename="../addresstablemodel.cpp" line="+164"/>
+ <location filename="../addresstablemodel.cpp" line="+168"/>
<source>Label</source>
<translation>وصÙ</translation>
</message>
@@ -193,52 +193,52 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+14"/>
<source>Repeat new passphrase</source>
- <translation type="unfinished"/>
+ <translation>ادخل الجملة السرية مرة أخرى</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="+34"/>
+ <location filename="../askpassphrasedialog.cpp" line="+40"/>
<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>أدخل عبارة مرور جديدة إلى المحÙظة. الرجاء استخدام عبارة مرور تتكون من10 حرو٠عشوائية على الاقل, أو أكثر من 7 كلمات </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"/>
@@ -265,7 +265,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"/>
@@ -278,35 +278,37 @@ 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"/>
@@ -317,49 +319,54 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+250"/>
+ <location filename="../bitcoingui.cpp" line="+295"/>
<source>Sign &amp;message...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+254"/>
+ <location line="+335"/>
<source>Synchronizing with network...</source>
- <translation type="unfinished"/>
+ <translation>مزامنة مع شبكة ...</translation>
</message>
<message>
- <location line="-324"/>
+ <location line="-407"/>
<source>&amp;Overview</source>
+ <translation>نظرة عامة</translation>
+ </message>
+ <message>
+ <location line="-137"/>
+ <source>Node</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="+138"/>
<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>المعاملات</translation>
</message>
<message>
<location line="+1"/>
<source>Browse transaction history</source>
- <translation type="unfinished"/>
+ <translation>تصÙØ­ التاريخ المعاملات</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<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="+7"/>
<source>Show information about Bitcoin</source>
- <translation type="unfinished"/>
+ <translation> إظهار المزيد معلومات حول Bitcoin</translation>
</message>
<message>
<location line="+3"/>
@@ -375,7 +382,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>خيارات ...</translation>
</message>
<message>
<location line="+9"/>
@@ -393,7 +400,22 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+259"/>
+ <location line="+10"/>
+ <source>&amp;Sending addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Receiving addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open &amp;URI...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+325"/>
<source>Importing blocks from disk...</source>
<translation type="unfinished"/>
</message>
@@ -403,12 +425,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="-322"/>
+ <location line="-405"/>
<source>Send coins to a Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+47"/>
+ <location line="+49"/>
<source>Modify configuration options for Bitcoin</source>
<translation type="unfinished"/>
</message>
@@ -420,7 +442,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="+6"/>
@@ -438,20 +460,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="-180"/>
- <location line="+6"/>
- <location line="+513"/>
+ <location line="+430"/>
<source>Bitcoin</source>
- <translation type="unfinished"/>
+ <translation>بت كوين</translation>
</message>
<message>
- <location line="-519"/>
- <location line="+6"/>
+ <location line="-643"/>
<source>Wallet</source>
- <translation type="unfinished"/>
+ <translation>محÙظة</translation>
</message>
<message>
- <location line="+109"/>
+ <location line="+146"/>
<source>&amp;Send</source>
<translation type="unfinished"/>
</message>
@@ -461,13 +480,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+28"/>
- <location line="+2"/>
- <source>&amp;About Bitcoin</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+14"/>
+ <location line="+46"/>
<location line="+2"/>
<source>&amp;Show / Hide</source>
<translation type="unfinished"/>
@@ -493,64 +506,80 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+35"/>
+ <location line="+48"/>
<source>&amp;File</source>
- <translation type="unfinished"/>
+ <translation>ملÙ</translation>
</message>
<message>
- <location line="+10"/>
+ <location line="+14"/>
<source>&amp;Settings</source>
- <translation type="unfinished"/>
+ <translation>إعدادات</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>&amp;Help</source>
- <translation type="unfinished"/>
+ <translation>مساعدة</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+15"/>
<source>Tabs toolbar</source>
- <translation type="unfinished"/>
+ <translation>شريط أدوات علامات التبويب</translation>
</message>
<message>
- <location line="-235"/>
- <location line="+294"/>
+ <location line="-284"/>
+ <location line="+376"/>
<source>[testnet]</source>
+ <translation>[testnet]</translation>
+ </message>
+ <message>
+ <location line="-401"/>
+ <source>Bitcoin Core</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-177"/>
+ <location line="+163"/>
<source>Request payments (generates QR codes and bitcoin: URIs)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+63"/>
- <source>&amp;Used sending addresses...</source>
+ <location line="+29"/>
+ <location line="+2"/>
+ <source>&amp;About Bitcoin Core</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="+35"/>
<source>Show the list of used sending addresses and labels</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Used &amp;receiving addresses...</source>
+ <location line="+2"/>
+ <source>Show the list of used receiving addresses and labels</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open a bitcoin: URI or payment request</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Command-line options</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
- <source>Show the list of used receiving addresses and labels</source>
+ <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+106"/>
+ <location line="+159"/>
<location line="+5"/>
<source>Bitcoin client</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+120"/>
+ <location line="+142"/>
<source>%n active connection(s) to Bitcoin network</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -570,7 +599,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+20"/>
+ <location line="+23"/>
<source>%n hour(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -590,7 +619,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
+ <location line="+21"/>
<source>Last received block was generated %1 ago.</source>
<translation type="unfinished"/>
</message>
@@ -615,34 +644,24 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+77"/>
- <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="-152"/>
+ <location line="-85"/>
<source>Up to date</source>
- <translation type="unfinished"/>
+ <translation>محين</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Catching up...</source>
- <translation type="unfinished"/>
+ <translation>اللحاق بالركب ...</translation>
</message>
<message>
- <location line="+124"/>
- <source>Confirm transaction fee</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+130"/>
<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"/>
@@ -654,36 +673,318 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
+ <location line="+69"/>
+ <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
+ <translation>المحÙظة مشÙرة Ùˆ Ù…Ùتوحة حاليا</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>المحÙظة مشÙرة Ùˆ مقÙلة حاليا</translation>
+ </message>
+ <message>
+ <location filename="../bitcoin.cpp" line="+438"/>
+ <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="+119"/>
+ <source>Network Alert</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>CoinControlDialog</name>
+ <message>
+ <location filename="../forms/coincontroldialog.ui" line="+14"/>
+ <source>Coin Control Address Selection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+34"/>
- <source>URI handling</source>
+ <source>Quantity:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
+ <location line="+29"/>
+ <source>Bytes:</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+45"/>
- <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
+ <source>Amount:</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>
+ <location line="+29"/>
+ <source>Priority:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+110"/>
- <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
+ <location line="+45"/>
+ <source>Fee:</source>
<translation type="unfinished"/>
</message>
-</context>
-<context>
- <name>ClientModel</name>
<message>
- <location filename="../clientmodel.cpp" line="+115"/>
- <source>Network Alert</source>
+ <location line="+32"/>
+ <source>Low Output:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>After Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Change:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+63"/>
+ <source>(un)select all</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Tree mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>List mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>Amount</source>
+ <translation>المبلغ</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Address</source>
+ <translation>عنوان</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Date</source>
+ <translation>التاريخ</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Confirmations</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Confirmed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../coincontroldialog.cpp" line="+42"/>
+ <source>Copy address</source>
+ <translation> انسخ عنوان</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy label</source>
+ <translation> انسخ التسمية</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+26"/>
+ <source>Copy amount</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-25"/>
+ <source>Copy transaction ID</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Lock unspent</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Unlock unspent</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+22"/>
+ <source>Copy quantity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Copy fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy after fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy bytes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy low output</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy change</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+323"/>
+ <source>highest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>higher</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>high</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>medium-high</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>medium</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>low-medium</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>low</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>lower</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>lowest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>(%1 locked)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+140"/>
+ <source>Dust</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>yes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>no</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>This label turns red, if the transaction size is greater than 1000 bytes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+5"/>
+ <source>This means a fee of at least %1 per kB is required.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-4"/>
+ <source>Can vary +/- 1 byte per input.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Transactions with higher priority are more likely to get included into a block.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>This label turns red, if the priority is smaller than &quot;medium&quot;.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>This label turns red, if any recipient receives an amount smaller than %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+4"/>
+ <source>This means a fee of at least %1 is required.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-3"/>
+ <source>Amounts below 0.546 times the minimum relay fee are shown as dust.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>This label turns red, if the change is smaller than %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
+ <location line="+66"/>
+ <source>(no label)</source>
+ <translation>(لا وصÙ)</translation>
+ </message>
+ <message>
+ <location line="-9"/>
+ <source>change from %1 (%2)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>(change)</source>
<translation type="unfinished"/>
</message>
</context>
@@ -692,7 +993,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"/>
@@ -715,29 +1016,30 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+21"/>
+ <location filename="../editaddressdialog.cpp" line="+28"/>
<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="+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"/>
@@ -747,18 +1049,18 @@ Address: %4
<message>
<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>FreespaceChecker</name>
<message>
- <location filename="../intro.cpp" line="+61"/>
+ <location filename="../intro.cpp" line="+65"/>
<source>A new data directory will be created.</source>
<translation type="unfinished"/>
</message>
@@ -784,19 +1086,23 @@ Address: %4
</message>
</context>
<context>
- <name>GUIUtil::HelpMessageBox</name>
+ <name>HelpMessageDialog</name>
<message>
- <location filename="../guiutil.cpp" line="+558"/>
- <location line="+13"/>
- <source>Bitcoin-Qt</source>
+ <location filename="../forms/helpmessagedialog.ui" line="+19"/>
+ <source>Bitcoin Core - Command-line options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-13"/>
- <source>version</source>
+ <location filename="../utilitydialog.cpp" line="+38"/>
+ <source>Bitcoin Core</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="+0"/>
+ <source>version</source>
+ <translation>النسخة</translation>
+ </message>
+ <message>
<location line="+2"/>
<source>Usage:</source>
<translation type="unfinished"/>
@@ -841,17 +1147,17 @@ Address: %4
</message>
<message>
<location line="+9"/>
- <source>Welcome to Bitcoin-Qt.</source>
+ <source>Welcome to Bitcoin Core.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+26"/>
- <source>As this is the first time the program is launched, you can choose where Bitcoin-Qt will store its data.</source>
+ <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+10"/>
- <source>Bitcoin-Qt will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
+ <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -865,7 +1171,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../intro.cpp" line="+105"/>
+ <location filename="../intro.cpp" line="+85"/>
+ <source>Bitcoin</source>
+ <translation>بت كوين</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error: Specified data directory &quot;%1&quot; can not be created.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+19"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
@@ -881,14 +1197,42 @@ Address: %4
</message>
</context>
<context>
+ <name>OpenURIDialog</name>
+ <message>
+ <location filename="../forms/openuridialog.ui" line="+14"/>
+ <source>Open URI</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Open payment request from URI or file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>URI:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Select payment request file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../openuridialog.cpp" line="+47"/>
+ <source>Select payment request file to open</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OptionsDialog</name>
<message>
<location filename="../forms/optionsdialog.ui" line="+14"/>
<source>Options</source>
- <translation type="unfinished"/>
+ <translation>خيارات ...</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+13"/>
<source>&amp;Main</source>
<translation type="unfinished"/>
</message>
@@ -913,57 +1257,87 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+35"/>
- <source>Reset all client options to default.</source>
+ <location line="+9"/>
+ <source>Size of &amp;database cache</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>&amp;Reset Options</source>
+ <location line="+13"/>
+ <source>Set database cache size in megabytes (default: 25)</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+13"/>
- <source>&amp;Network</source>
+ <source>MB</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>
+ <location line="+27"/>
+ <source>Number of script &amp;verification threads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Connect to the Bitcoin network through a SOCKS proxy.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
- <source>Map port using &amp;UPnP</source>
+ <source>&amp;Connect through SOCKS proxy (default proxy):</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>
+ <location line="+34"/>
+ <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+224"/>
+ <source>Active command-line options that override above options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
+ <source>Reset all client options to default.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
- <source>&amp;Connect through SOCKS proxy:</source>
+ <source>&amp;Reset Options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+9"/>
- <source>Proxy &amp;IP:</source>
+ <location line="-323"/>
+ <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="+19"/>
- <source>IP address of the proxy (e.g. 127.0.0.1)</source>
+ <source>Proxy &amp;IP:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="+32"/>
<source>&amp;Port:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+19"/>
+ <location line="+25"/>
<source>Port of the proxy (e.g. 9050)</source>
<translation type="unfinished"/>
</message>
@@ -1038,7 +1412,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+71"/>
+ <location line="+7"/>
+ <source>Whether to show coin control features or not.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Display coin &amp;control features (experts only)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+136"/>
<source>&amp;OK</source>
<translation type="unfinished"/>
</message>
@@ -1048,44 +1432,38 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>&amp;Apply</source>
+ <location filename="../optionsdialog.cpp" line="+67"/>
+ <source>default</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+58"/>
- <source>default</source>
+ <location line="+57"/>
+ <source>none</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+130"/>
+ <location line="+75"/>
<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>
+ <location line="+29"/>
+ <source>Client restart required to activate changes.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
- <location line="+9"/>
- <source>Warning</source>
+ <location line="-29"/>
+ <source>Client will be shutdown, do you want to proceed?</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-9"/>
- <location line="+9"/>
- <source>This setting will take effect after restarting Bitcoin.</source>
+ <location line="+33"/>
+ <source>This change would require a client restart.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+29"/>
+ <location line="+34"/>
<source>The supplied proxy address is invalid.</source>
<translation type="unfinished"/>
</message>
@@ -1095,26 +1473,26 @@ Address: %4
<message>
<location filename="../forms/overviewpage.ui" line="+14"/>
<source>Form</source>
- <translation type="unfinished"/>
+ <translation>نمودج</translation>
</message>
<message>
<location line="+50"/>
- <location line="+202"/>
+ <location line="+231"/>
<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="-131"/>
+ <location line="-155"/>
<source>Unconfirmed:</source>
- <translation type="unfinished"/>
+ <translation>غير مؤكدة:</translation>
</message>
<message>
- <location line="-78"/>
+ <location line="-83"/>
<source>Wallet</source>
- <translation type="unfinished"/>
+ <translation>محÙظة</translation>
</message>
<message>
- <location line="+49"/>
+ <location line="+51"/>
<source>Confirmed:</source>
<translation type="unfinished"/>
</message>
@@ -1124,12 +1502,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+29"/>
+ <location line="+32"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+16"/>
<source>Immature:</source>
<translation type="unfinished"/>
</message>
@@ -1139,7 +1517,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+16"/>
<source>Total:</source>
<translation type="unfinished"/>
</message>
@@ -1149,12 +1527,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+53"/>
+ <location line="+71"/>
<source>&lt;b&gt;Recent transactions&lt;/b&gt;</source>
- <translation type="unfinished"/>
+ <translation>اخر المعملات </translation>
</message>
<message>
- <location filename="../overviewpage.cpp" line="+116"/>
+ <location filename="../overviewpage.cpp" line="+120"/>
<location line="+1"/>
<source>out of sync</source>
<translation type="unfinished"/>
@@ -1163,7 +1541,8 @@ Address: %4
<context>
<name>PaymentServer</name>
<message>
- <location filename="../paymentserver.cpp" line="+392"/>
+ <location filename="../paymentserver.cpp" line="+403"/>
+ <location line="+13"/>
<source>URI handling</source>
<translation type="unfinished"/>
</message>
@@ -1173,45 +1552,82 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+69"/>
+ <location line="+96"/>
<source>Requested payment amount of %1 is too small (considered dust).</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
- <location line="+37"/>
+ <location line="-221"/>
+ <location line="+212"/>
+ <location line="+13"/>
+ <location line="+95"/>
+ <location line="+18"/>
+ <location line="+16"/>
<source>Payment request error</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="-353"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Net manager warning</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+1"/>
- <source>Insecure requests to custom payment scripts unsupported</source>
+ <source>Your active proxy doesn&apos;t support SOCKS5, which is required for payment requests via proxy.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+38"/>
+ <location line="+52"/>
+ <source>Payment request fetch URL is invalid: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Payment request file handling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Payment request file can not be read or processed! This can be caused by an invalid payment request file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+73"/>
+ <source>Unverified payment requests to custom payment scripts are unsupported.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+59"/>
<source>Refund from %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
+ <location line="+43"/>
<source>Error communicating with %1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+24"/>
+ <source>Payment request can not be parsed or processed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
<source>Bad response from server %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+32"/>
+ <location line="+33"/>
<source>Payment acknowledged</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-58"/>
- <location line="+30"/>
- <location line="+17"/>
+ <location line="-11"/>
<source>Network request error</source>
<translation type="unfinished"/>
</message>
@@ -1219,32 +1635,26 @@ Address: %4
<context>
<name>QObject</name>
<message>
- <location filename="../bitcoin.cpp" line="+114"/>
- <location line="+5"/>
- <location filename="../intro.cpp" line="-32"/>
+ <location filename="../bitcoin.cpp" line="+71"/>
+ <location line="+11"/>
<source>Bitcoin</source>
- <translation type="unfinished"/>
+ <translation>بت كوين</translation>
</message>
<message>
- <location line="-4"/>
+ <location line="+1"/>
<source>Error: Specified data directory &quot;%1&quot; does not exist.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="-12"/>
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../intro.cpp" line="+1"/>
- <source>Error: Specified data directory &quot;%1&quot; can not be created.</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>QRImageWidget</name>
<message>
- <location filename="../receiverequestdialog.cpp" line="+32"/>
+ <location filename="../receiverequestdialog.cpp" line="+36"/>
<source>&amp;Save Image...</source>
<translation type="unfinished"/>
</message>
@@ -1260,7 +1670,7 @@ Address: %4
</message>
<message>
<location line="+0"/>
- <source>PNG Images (*.png)</source>
+ <source>PNG Image (*.png)</source>
<translation type="unfinished"/>
</message>
</context>
@@ -1278,15 +1688,16 @@ Address: %4
<location line="+23"/>
<location line="+23"/>
<location line="+36"/>
- <location line="+53"/>
<location line="+23"/>
+ <location line="+36"/>
<location line="+23"/>
- <location filename="../rpcconsole.cpp" line="+352"/>
+ <location line="+23"/>
+ <location filename="../rpcconsole.cpp" line="+359"/>
<source>N/A</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-217"/>
+ <location line="-223"/>
<source>Client version</source>
<translation type="unfinished"/>
</message>
@@ -1296,7 +1707,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+68"/>
+ <location line="-10"/>
+ <source>Debug window</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+25"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+53"/>
<source>Using OpenSSL version</source>
<translation type="unfinished"/>
</message>
@@ -1312,16 +1733,16 @@ Address: %4
</message>
<message>
<location line="+7"/>
- <source>Number of connections</source>
+ <source>Name</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+23"/>
- <source>On testnet</source>
+ <source>Number of connections</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+23"/>
+ <location line="+29"/>
<source>Block chain</source>
<translation type="unfinished"/>
</message>
@@ -1346,21 +1767,6 @@ Address: %4
<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"/>
@@ -1391,22 +1797,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-541"/>
+ <location line="-521"/>
<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"/>
+ <location line="+206"/>
<source>Debug log file</source>
<translation type="unfinished"/>
</message>
@@ -1416,7 +1812,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+102"/>
+ <location line="+76"/>
<source>Clear console</source>
<translation type="unfinished"/>
</message>
@@ -1436,7 +1832,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+128"/>
+ <location line="+122"/>
<source>%1 B</source>
<translation type="unfinished"/>
</message>
@@ -1474,48 +1870,48 @@ Address: %4
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+22"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
<source>&amp;Amount:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
- <source>The amount to request</source>
+ <location line="-13"/>
+ <source>&amp;Label:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>&amp;Label:</source>
+ <location line="-34"/>
+ <source>&amp;Message:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>The label to associate with the receiving address</source>
+ <location line="-17"/>
+ <source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>&amp;Message:</source>
+ <location line="+3"/>
+ <source>R&amp;euse an existing receiving address (not recommended)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>The message to attach to payment request</source>
+ <location line="+27"/>
+ <source>An optional label to associate with the new receiving address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
- <source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
+ <location line="+7"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>R&amp;euse an existing receiving address (not recommended)</source>
+ <location line="+7"/>
+ <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>Use this form to request payments. All fields are optional.</source>
+ <location line="+39"/>
+ <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1533,6 +1929,31 @@ Address: %4
<source>&amp;Request payment</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+47"/>
+ <source>Requested payments</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Show the selected request (does the same as double clicking an entry)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Show</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Remove the selected entries from the list</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Remove</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
@@ -1553,16 +1974,11 @@ Address: %4
</message>
<message>
<location line="+7"/>
- <source>&amp;Copy Image</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+7"/>
<source>&amp;Save Image...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../receiverequestdialog.cpp" line="+58"/>
+ <location filename="../receiverequestdialog.cpp" line="+56"/>
<source>Request payment to %1</source>
<translation type="unfinished"/>
</message>
@@ -1584,7 +2000,7 @@ Address: %4
<message>
<location line="+2"/>
<source>Amount</source>
- <translation type="unfinished"/>
+ <translation>المبلغ</translation>
</message>
<message>
<location line="+2"/>
@@ -1608,21 +2024,124 @@ Address: %4
</message>
</context>
<context>
+ <name>RecentRequestsTableModel</name>
+ <message>
+ <location filename="../recentrequeststablemodel.cpp" line="+24"/>
+ <source>Date</source>
+ <translation>التاريخ</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Label</source>
+ <translation>وصÙ</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Amount</source>
+ <translation>المبلغ</translation>
+ </message>
+ <message>
+ <location line="+38"/>
+ <source>(no label)</source>
+ <translation>(لا وصÙ)</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>(no message)</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+140"/>
- <location line="+213"/>
+ <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location line="+80"/>
<source>Send Coins</source>
+ <translation>إرسال Coins</translation>
+ </message>
+ <message>
+ <location line="+76"/>
+ <source>Coin Control Features</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+50"/>
- <source>Send to multiple recipients at once</source>
+ <location line="+20"/>
+ <source>Inputs...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>automatically selected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Insufficient funds!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+89"/>
+ <source>Quantity:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+35"/>
+ <source>Bytes:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Amount:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Priority:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Low Output:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>After Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Change:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+44"/>
+ <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
+ <source>Custom change address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+115"/>
+ <source>Send to multiple recipients at once</source>
+ <translation>إرسال إلى عدة مستلمين ÙÙŠ وقت واحد</translation>
+ </message>
+ <message>
+ <location line="+3"/>
<source>Add &amp;Recipient</source>
<translation type="unfinished"/>
</message>
@@ -1639,17 +2158,12 @@ Address: %4
<message>
<location line="+22"/>
<source>Balance:</source>
- <translation type="unfinished"/>
+ <translation>الرصيد:</translation>
</message>
<message>
- <location line="+10"/>
- <source>123.456 BTC</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+31"/>
+ <location line="+41"/>
<source>Confirm the send action</source>
- <translation type="unfinished"/>
+ <translation>تأكيد الإرسال</translation>
</message>
<message>
<location line="+3"/>
@@ -1657,69 +2171,135 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-154"/>
+ <location filename="../sendcoinsdialog.cpp" line="-228"/>
<source>Confirm send coins</source>
- <translation type="unfinished"/>
+ <translation>تأكيد الإرسال Coins</translation>
</message>
<message>
- <location line="-90"/>
+ <location line="-74"/>
<location line="+5"/>
<location line="+5"/>
+ <location line="+4"/>
<source>%1 to %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+26"/>
+ <location line="-136"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation>إدخال عنوانBitcoin (مثال :1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Copy quantity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy after fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy bytes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy low output</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy change</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+170"/>
+ <source>Total Amount %1 (= %2)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>or</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+202"/>
<source>The recipient address is not valid, please recheck.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The amount to pay must be larger than 0.</source>
- <translation type="unfinished"/>
+ <translation>المبلغ المدÙوع يجب ان يكون اكبر من 0</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The amount exceeds your balance.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The total exceeds your balance when the %1 transaction fee is included.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+3"/>
<source>Duplicate address found, can only send to each address once per send operation.</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="+3"/>
+ <source>Transaction creation failed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+4"/>
- <source>Error: Transaction creation failed!</source>
+ <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+15"/>
- <source>Are you sure you want to send?</source>
+ <location line="+112"/>
+ <source>Warning: Invalid Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+9"/>
- <source>added as transaction fee</source>
+ <location line="+21"/>
+ <source>(no label)</source>
+ <translation>(لا وصÙ)</translation>
+ </message>
+ <message>
+ <location line="-11"/>
+ <source>Warning: Unknown change address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
- <source>Total Amount %1</source>
+ <location line="-366"/>
+ <source>Are you sure you want to send?</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+20"/>
- <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>
+ <location line="+9"/>
+ <source>added as transaction fee</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+144"/>
+ <location line="+170"/>
<source>Payment request expired</source>
<translation type="unfinished"/>
</message>
@@ -1732,70 +2312,117 @@ Address: %4
<context>
<name>SendCoinsEntry</name>
<message>
- <location filename="../forms/sendcoinsentry.ui" line="+33"/>
- <location line="+585"/>
+ <location filename="../forms/sendcoinsentry.ui" line="+131"/>
+ <location line="+521"/>
+ <location line="+536"/>
<source>A&amp;mount:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-572"/>
- <location line="+585"/>
+ <location line="-1152"/>
<source>Pay &amp;To:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-551"/>
+ <location line="+18"/>
<source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../sendcoinsentry.cpp" line="+28"/>
+ <location filename="../sendcoinsentry.cpp" line="+30"/>
<source>Enter a label for this address to add it to your address book</source>
- <translation type="unfinished"/>
+ <translation>إدخال تسمية لهذا العنوان لإضاÙته إلى دÙتر العناوين الخاص بك</translation>
</message>
<message>
- <location filename="../forms/sendcoinsentry.ui" line="-18"/>
+ <location filename="../forms/sendcoinsentry.ui" line="+57"/>
<source>&amp;Label:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+28"/>
+ <location line="-50"/>
<source>Choose previously used address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>Alt+A</source>
+ <location line="-40"/>
+ <source>This is a normal payment.</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="+50"/>
+ <source>Alt+A</source>
+ <translation>Alt+A</translation>
+ </message>
+ <message>
<location line="+7"/>
<source>Paste address from clipboard</source>
- <translation type="unfinished"/>
+ <translation>انسخ العنوان من لوحة المÙاتيح</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>
+ <location line="+524"/>
+ <location line="+536"/>
+ <source>Remove this entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="-1008"/>
+ <source>Message:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+958"/>
+ <source>This is a verified payment request.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-991"/>
<source>Enter a label for this address to add it to the list of used addresses</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+465"/>
+ <location line="+459"/>
+ <source>This is an unverified payment request.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+18"/>
+ <location line="+532"/>
+ <source>Pay To:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-498"/>
+ <location line="+536"/>
<source>Memo:</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../sendcoinsentry.cpp" line="+1"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation>إدخال عنوانBitcoin (مثال :1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ </message>
+</context>
+<context>
+ <name>ShutdownWindow</name>
+ <message>
+ <location filename="../utilitydialog.cpp" line="+48"/>
+ <source>Bitcoin Core is shutting down...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Do not shut down the computer until this window disappears.</source>
<translation type="unfinished"/>
</message>
</context>
@@ -1807,7 +2434,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+10"/>
<source>&amp;Sign Message</source>
<translation type="unfinished"/>
</message>
@@ -1831,17 +2458,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>انسخ العنوان من لوحة المÙاتيح</translation>
</message>
<message>
<location line="+10"/>
<source>Alt+P</source>
- <translation type="unfinished"/>
+ <translation>Alt+P</translation>
</message>
<message>
<location line="+12"/>
@@ -1910,10 +2537,10 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+27"/>
+ <location filename="../signverifymessagedialog.cpp" line="+29"/>
<location line="+3"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation type="unfinished"/>
+ <translation>إدخال عنوانBitcoin (مثال :1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
<location line="-2"/>
@@ -1923,13 +2550,13 @@ Address: %4
<message>
<location line="+3"/>
<source>Enter Bitcoin signature</source>
- <translation type="unfinished"/>
+ <translation>ضع توقيع الخاص بالبت كوين</translation>
</message>
<message>
- <location line="+85"/>
+ <location line="+84"/>
<location line="+81"/>
<source>The entered address is invalid.</source>
- <translation type="unfinished"/>
+ <translation>العنوان المدخل غير صالح</translation>
</message>
<message>
<location line="-81"/>
@@ -1937,13 +2564,13 @@ Address: %4
<location line="+73"/>
<location line="+8"/>
<source>Please check the address and try again.</source>
- <translation type="unfinished"/>
+ <translation>الرجاء التأكد من العنوان والمحاولة مرة اخرى</translation>
</message>
<message>
<location line="-81"/>
<location line="+81"/>
<source>The entered address does not refer to a key.</source>
- <translation type="unfinished"/>
+ <translation>العنوان المدخل لا يشير الى Ù…Ùتاح</translation>
</message>
<message>
<location line="-73"/>
@@ -1953,17 +2580,17 @@ Address: %4
<message>
<location line="+8"/>
<source>Private key for the entered address is not available.</source>
- <translation type="unfinished"/>
+ <translation>المÙتاح الخاص للعنوان المدخل غير موجود.</translation>
</message>
<message>
<location line="+12"/>
<source>Message signing failed.</source>
- <translation type="unfinished"/>
+ <translation>Ùشل توقيع الرسالة.</translation>
</message>
<message>
<location line="+5"/>
<source>Message signed.</source>
- <translation type="unfinished"/>
+ <translation>الرسالة موقعة.</translation>
</message>
<message>
<location line="+59"/>
@@ -1984,31 +2611,36 @@ 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>SplashScreen</name>
<message>
- <location filename="../splashscreen.cpp" line="+23"/>
- <source>The Bitcoin developers</source>
+ <location filename="../splashscreen.cpp" line="+28"/>
+ <source>Bitcoin Core</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
<source>[testnet]</source>
- <translation type="unfinished"/>
+ <translation>[testnet]</translation>
</message>
</context>
<context>
<name>TrafficGraphWidget</name>
<message>
- <location filename="../trafficgraphwidget.cpp" line="+75"/>
+ <location filename="../trafficgraphwidget.cpp" line="+79"/>
<source>KB/s</source>
<translation type="unfinished"/>
</message>
@@ -2016,29 +2648,29 @@ Address: %4
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="+22"/>
+ <location filename="../transactiondesc.cpp" line="+28"/>
<source>Open until %1</source>
- <translation type="unfinished"/>
+ <translation>Ù…Ùتوح حتى 1Ùª</translation>
</message>
<message>
<location line="+6"/>
<source>%1/offline</source>
- <translation type="unfinished"/>
+ <translation>1% غير متواجد</translation>
</message>
<message>
<location line="+2"/>
<source>%1/unconfirmed</source>
- <translation type="unfinished"/>
+ <translation>غير مؤكدة/1%</translation>
</message>
<message>
<location line="+2"/>
<source>%1 confirmations</source>
- <translation type="unfinished"/>
+ <translation>تأكيد %1</translation>
</message>
<message>
<location line="+18"/>
<source>Status</source>
- <translation type="unfinished"/>
+ <translation>الحالة.</translation>
</message>
<message numerus="yes">
<location line="+7"/>
@@ -2048,36 +2680,36 @@ Address: %4
<message>
<location line="+4"/>
<source>Date</source>
- <translation type="unfinished"/>
+ <translation>التاريخ</translation>
</message>
<message>
<location line="+7"/>
<source>Source</source>
- <translation type="unfinished"/>
+ <translation>المصدر</translation>
</message>
<message>
<location line="+0"/>
<source>Generated</source>
- <translation type="unfinished"/>
+ <translation>تم اصداره.</translation>
</message>
<message>
<location line="+5"/>
<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"/>
<location line="+2"/>
<source>own address</source>
- <translation type="unfinished"/>
+ <translation>عنوانه</translation>
</message>
<message>
<location line="-2"/>
@@ -2089,32 +2721,32 @@ Address: %4
<location line="+12"/>
<location line="+45"/>
<location line="+17"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Credit</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="-120"/>
+ <location line="-125"/>
<source>matures in %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
<location line="+2"/>
<source>not accepted</source>
- <translation type="unfinished"/>
+ <translation>غير مقبولة</translation>
</message>
<message>
<location line="+44"/>
<location line="+8"/>
<location line="+15"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Debit</source>
- <translation type="unfinished"/>
+ <translation>دين</translation>
</message>
<message>
- <location line="-57"/>
+ <location line="-62"/>
<source>Transaction fee</source>
- <translation type="unfinished"/>
+ <translation>رسوم التحويل</translation>
</message>
<message>
<location line="+16"/>
@@ -2123,21 +2755,22 @@ Address: %4
</message>
<message>
<location line="+6"/>
+ <location line="+9"/>
<source>Message</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="-7"/>
<source>Comment</source>
- <translation type="unfinished"/>
+ <translation>تعليق</translation>
</message>
<message>
<location line="+2"/>
<source>Transaction ID</source>
- <translation type="unfinished"/>
+ <translation>رقم المعاملة</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+18"/>
<source>Merchant</source>
<translation type="unfinished"/>
</message>
@@ -2154,7 +2787,7 @@ Address: %4
<message>
<location line="+8"/>
<source>Transaction</source>
- <translation type="unfinished"/>
+ <translation>معاملة</translation>
</message>
<message>
<location line="+3"/>
@@ -2164,22 +2797,22 @@ Address: %4
<message>
<location line="+23"/>
<source>Amount</source>
- <translation type="unfinished"/>
+ <translation>المبلغ</translation>
</message>
<message>
<location line="+1"/>
<source>true</source>
- <translation type="unfinished"/>
+ <translation>صحيح</translation>
</message>
<message>
<location line="+0"/>
<source>false</source>
- <translation type="unfinished"/>
+ <translation>خاطئ</translation>
</message>
<message>
- <location line="-227"/>
+ <location line="-232"/>
<source>, has not been successfully broadcast yet</source>
- <translation type="unfinished"/>
+ <translation>لم يتم حتى الآن البث بنجاح</translation>
</message>
<message numerus="yes">
<location line="-35"/>
@@ -2189,7 +2822,7 @@ Address: %4
<message>
<location line="+70"/>
<source>unknown</source>
- <translation type="unfinished"/>
+ <translation>غير معروÙ</translation>
</message>
</context>
<context>
@@ -2197,25 +2830,25 @@ Address: %4
<message>
<location filename="../forms/transactiondescdialog.ui" line="+14"/>
<source>Transaction details</source>
- <translation type="unfinished"/>
+ <translation>تÙاصيل المعاملة</translation>
</message>
<message>
<location line="+6"/>
<source>This pane shows a detailed description of the transaction</source>
- <translation type="unfinished"/>
+ <translation>يبين هذا الجزء وصÙا Ù…Ùصلا لهده المعاملة</translation>
</message>
</context>
<context>
<name>TransactionTableModel</name>
<message>
- <location filename="../transactiontablemodel.cpp" line="+227"/>
+ <location filename="../transactiontablemodel.cpp" line="+234"/>
<source>Date</source>
- <translation type="unfinished"/>
+ <translation>التاريخ</translation>
</message>
<message>
<location line="+0"/>
<source>Type</source>
- <translation type="unfinished"/>
+ <translation>النوع</translation>
</message>
<message>
<location line="+0"/>
@@ -2225,52 +2858,53 @@ Address: %4
<message>
<location line="+0"/>
<source>Amount</source>
+ <translation>المبلغ</translation>
+ </message>
+ <message>
+ <location line="+59"/>
+ <source>Immature (%1 confirmations, will be available after %2)</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+57"/>
+ <location line="+16"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
<location line="+3"/>
<source>Open until %1</source>
- <translation type="unfinished"/>
+ <translation>Ù…Ùتوح حتى 1Ùª</translation>
</message>
<message>
<location line="+3"/>
<source>Offline (%1 confirmations)</source>
- <translation type="unfinished"/>
+ <translation>غير متصل (1٪ تأكيدات)</translation>
</message>
<message>
<location line="+3"/>
<source>Unconfirmed (%1 of %2 confirmations)</source>
- <translation type="unfinished"/>
+ <translation>غير مؤكدة (٪ 1 من٪ 2 تأكيدات)</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="-22"/>
+ <location line="+25"/>
<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><numerusform></numerusform><numerusform></numerusform></translation>
+ <translation>تأكيد الإرسال Coins</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="-22"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
- <translation type="unfinished"/>
+ <translation>لم يتم تلقى هذه الكتلة (Block) من قبل أي العقد الأخرى وربما لن تكون مقبولة!</translation>
</message>
<message>
<location line="+3"/>
<source>Generated but not accepted</source>
- <translation type="unfinished"/>
+ <translation>ولدت ولكن لم تقبل</translation>
</message>
<message>
- <location line="+43"/>
+ <location line="+62"/>
<source>Received with</source>
- <translation type="unfinished"/>
+ <translation>استقبل مع</translation>
</message>
<message>
<location line="+2"/>
@@ -2280,131 +2914,131 @@ Address: %4
<message>
<location line="+3"/>
<source>Sent to</source>
- <translation type="unfinished"/>
+ <translation>أرسل إلى</translation>
</message>
<message>
<location line="+2"/>
<source>Payment to yourself</source>
- <translation type="unfinished"/>
+ <translation>دÙع لنÙسك</translation>
</message>
<message>
<location line="+2"/>
<source>Mined</source>
- <translation type="unfinished"/>
+ <translation>Mined</translation>
</message>
<message>
<location line="+38"/>
<source>(n/a)</source>
- <translation type="unfinished"/>
+ <translation>غير متوÙر</translation>
</message>
<message>
<location line="+199"/>
<source>Transaction status. Hover over this field to show number of confirmations.</source>
- <translation type="unfinished"/>
+ <translation>حالة المعاملة. تحوم حول هذا الحقل لعرض عدد التأكيدات.</translation>
</message>
<message>
<location line="+2"/>
<source>Date and time that the transaction was received.</source>
- <translation type="unfinished"/>
+ <translation>التاريخ والوقت الذي تم Ùيه تلقي المعاملة.</translation>
</message>
<message>
<location line="+2"/>
<source>Type of transaction.</source>
- <translation type="unfinished"/>
+ <translation>نوع المعاملات</translation>
</message>
<message>
<location line="+2"/>
<source>Destination address of transaction.</source>
- <translation type="unfinished"/>
+ <translation>عنوان وجهة المعاملة</translation>
</message>
<message>
<location line="+2"/>
<source>Amount removed from or added to balance.</source>
- <translation type="unfinished"/>
+ <translation>المبلغ الذي أزيل أو أضي٠الى الرصيد</translation>
</message>
</context>
<context>
<name>TransactionView</name>
<message>
- <location filename="../transactionview.cpp" line="+52"/>
+ <location filename="../transactionview.cpp" line="+57"/>
<location line="+16"/>
<source>All</source>
- <translation type="unfinished"/>
+ <translation>الكل</translation>
</message>
<message>
<location line="-15"/>
<source>Today</source>
- <translation type="unfinished"/>
+ <translation>اليوم</translation>
</message>
<message>
<location line="+1"/>
<source>This week</source>
- <translation type="unfinished"/>
+ <translation>هدا الاسبوع</translation>
</message>
<message>
<location line="+1"/>
<source>This month</source>
- <translation type="unfinished"/>
+ <translation>هدا الشهر</translation>
</message>
<message>
<location line="+1"/>
<source>Last month</source>
- <translation type="unfinished"/>
+ <translation>الشهر الماضي</translation>
</message>
<message>
<location line="+1"/>
<source>This year</source>
- <translation type="unfinished"/>
+ <translation>هدا العام</translation>
</message>
<message>
<location line="+1"/>
<source>Range...</source>
- <translation type="unfinished"/>
+ <translation>v</translation>
</message>
<message>
<location line="+11"/>
<source>Received with</source>
- <translation type="unfinished"/>
+ <translation>استقبل مع</translation>
</message>
<message>
<location line="+2"/>
<source>Sent to</source>
- <translation type="unfinished"/>
+ <translation>أرسل إلى</translation>
</message>
<message>
<location line="+2"/>
<source>To yourself</source>
- <translation type="unfinished"/>
+ <translation>إليك</translation>
</message>
<message>
<location line="+1"/>
<source>Mined</source>
- <translation type="unfinished"/>
+ <translation>Mined</translation>
</message>
<message>
<location line="+1"/>
<source>Other</source>
- <translation type="unfinished"/>
+ <translation>اخرى</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+6"/>
<source>Enter address or label to search</source>
- <translation type="unfinished"/>
+ <translation>ادخل عنوان أووص٠للبحث</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+6"/>
<source>Min amount</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+34"/>
<source>Copy address</source>
- <translation type="unfinished"/>
+ <translation> انسخ عنوان</translation>
</message>
<message>
<location line="+1"/>
<source>Copy label</source>
- <translation type="unfinished"/>
+ <translation> انسخ التسمية</translation>
</message>
<message>
<location line="+1"/>
@@ -2419,7 +3053,7 @@ Address: %4
<message>
<location line="+1"/>
<source>Edit label</source>
- <translation type="unfinished"/>
+ <translation>عدل الوصÙ</translation>
</message>
<message>
<location line="+1"/>
@@ -2427,29 +3061,49 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+143"/>
- <source>Export Transaction Data</source>
+ <location line="+142"/>
+ <source>Export Transaction History</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="+19"/>
+ <source>Exporting Failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>There was an error trying to save the transaction history to %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Exporting Successful</source>
+ <translation>نجح الاستخراج</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The transaction history was successfully saved to %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-22"/>
<source>Comma separated file (*.csv)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+8"/>
+ <location line="+9"/>
<source>Confirmed</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
<source>Date</source>
- <translation type="unfinished"/>
+ <translation>التاريخ</translation>
</message>
<message>
<location line="+1"/>
<source>Type</source>
- <translation type="unfinished"/>
+ <translation>النوع</translation>
</message>
<message>
<location line="+1"/>
@@ -2464,7 +3118,7 @@ Address: %4
<message>
<location line="+1"/>
<source>Amount</source>
- <translation type="unfinished"/>
+ <translation>المبلغ</translation>
</message>
<message>
<location line="+1"/>
@@ -2472,17 +3126,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
- <source>Error exporting</source>
- <translation>تقرير عن الخطأ</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation>لم يستطع الكتابة على المل٠%1.</translation>
- </message>
- <message>
- <location line="+100"/>
+ <location line="+107"/>
<source>Range:</source>
<translation type="unfinished"/>
</message>
@@ -2493,17 +3137,25 @@ Address: %4
</message>
</context>
<context>
+ <name>WalletFrame</name>
+ <message>
+ <location filename="../walletframe.cpp" line="+26"/>
+ <source>No wallet has been loaded.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>WalletModel</name>
<message>
- <location filename="../walletmodel.cpp" line="+218"/>
+ <location filename="../walletmodel.cpp" line="+245"/>
<source>Send Coins</source>
- <translation type="unfinished"/>
+ <translation>إرسال Coins</translation>
</message>
</context>
<context>
<name>WalletView</name>
<message>
- <location filename="../walletview.cpp" line="+46"/>
+ <location filename="../walletview.cpp" line="+43"/>
<source>&amp;Export</source>
<translation type="unfinished"/>
</message>
@@ -2513,65 +3165,60 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+183"/>
+ <location line="+181"/>
<source>Backup Wallet</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
+ <location line="+1"/>
<source>Wallet Data (*.dat)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
+ <location line="+6"/>
<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>
+ <source>There was an error trying to save the wallet data to %1.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+4"/>
- <source>Backup Successful</source>
+ <source>The wallet data was successfully saved to %1.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+0"/>
- <source>The wallet data was successfully saved to the new location.</source>
+ <source>Backup Successful</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+102"/>
- <source>Bitcoin version</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+107"/>
+ <location filename="../bitcoinstrings.cpp" line="+221"/>
<source>Usage:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-55"/>
+ <location line="-54"/>
<source>List commands</source>
- <translation type="unfinished"/>
+ <translation>اعرض الأوامر</translation>
</message>
<message>
- <location line="-13"/>
+ <location line="-14"/>
<source>Get help for a command</source>
- <translation type="unfinished"/>
+ <translation>مساعدة ÙÙŠ كتابة الاوامر</translation>
</message>
<message>
- <location line="+25"/>
+ <location line="+26"/>
<source>Options:</source>
- <translation type="unfinished"/>
+ <translation>خيارات: </translation>
</message>
<message>
- <location line="+24"/>
+ <location line="+22"/>
<source>Specify configuration file (default: bitcoin.conf)</source>
<translation type="unfinished"/>
</message>
@@ -2583,7 +3230,7 @@ Address: %4
<message>
<location line="-1"/>
<source>Specify data directory</source>
- <translation type="unfinished"/>
+ <translation>حدد موقع مجلد المعلومات او data directory</translation>
</message>
<message>
<location line="-9"/>
@@ -2591,7 +3238,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-28"/>
+ <location line="-26"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
<translation type="unfinished"/>
</message>
@@ -2601,7 +3248,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-49"/>
+ <location line="-51"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation type="unfinished"/>
</message>
@@ -2611,37 +3258,37 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-142"/>
+ <location line="-148"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-33"/>
+ <location line="-36"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+40"/>
+ <location line="+45"/>
<source>Accept command line and JSON-RPC commands</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<source>Run in the background as a daemon and accept commands</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+40"/>
+ <location line="+39"/>
<source>Use the test network</source>
<translation type="unfinished"/>
</message>
@@ -2651,7 +3298,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-87"/>
+ <location line="-95"/>
<source>%s, you must set a rpcpassword in the configuration file:
%s
It is recommended you use the following random password:
@@ -2692,6 +3339,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+4"/>
+ <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</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>
@@ -2706,17 +3358,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+11"/>
- <source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source>
+ <location line="+18"/>
+ <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="+6"/>
- <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
+ <location line="+5"/>
+ <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+3"/>
<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>
@@ -2746,17 +3398,27 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
+ <location line="+9"/>
+ <source>&lt;category&gt; can be:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
<source>Attempt to recover private keys from a corrupt wallet.dat</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
+ <source>Bitcoin Core Daemon</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Bitcoin RPC client version</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
<source>Block creation options:</source>
<translation type="unfinished"/>
</message>
@@ -2766,7 +3428,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
+ <source>Connect through SOCKS proxy</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect to JSON-RPC on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation type="unfinished"/>
</message>
@@ -2782,6 +3449,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+1"/>
+ <source>Do not load the wallet and disable wallet RPC calls</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Do you want to rebuild the block database now?</source>
<translation type="unfinished"/>
</message>
@@ -2876,7 +3548,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
+ <source>Fee per kB to add to transactions you send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Find peers using DNS lookup (default: 1 unless -connect)</source>
<translation type="unfinished"/>
</message>
@@ -2896,6 +3573,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
+ <location line="+1"/>
+ <source>If &lt;category&gt; is not supplied, output all debugging information.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+2"/>
<source>Incorrect or no genesis block found. Wrong datadir for network?</source>
<translation type="unfinished"/>
@@ -2911,17 +3593,37 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+8"/>
+ <location line="+5"/>
+ <source>Prepend debug output with timestamp (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>RPC client options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Rebuild block chain index from current blk000??.dat files</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+5"/>
+ <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Send command to Bitcoin server</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
+ <location line="+7"/>
+ <source>Set maximum block size in bytes (default: %d)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Set the number of threads to service RPC calls (default: 4)</source>
<translation type="unfinished"/>
</message>
@@ -2936,12 +3638,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+12"/>
+ <location line="+3"/>
+ <source>This is intended for regression testing tools and app development.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Usage (deprecated, use bitcoin-cli):</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+8"/>
+ <location line="+7"/>
<source>Verifying blocks...</source>
<translation type="unfinished"/>
</message>
@@ -2952,31 +3659,56 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+1"/>
+ <source>Wait for RPC server to start</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Wallet %s resides outside data directory %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+2"/>
+ <source>Wallet options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>You need to rebuild the database using -reindex to change -txindex</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-78"/>
+ <location line="-79"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-98"/>
+ <location line="-105"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+17"/>
+ <location line="+14"/>
+ <source>Output debugging information (default: 0, supplying &lt;category&gt; is optional)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+83"/>
+ <location line="+89"/>
<source>Information</source>
<translation type="unfinished"/>
</message>
@@ -3016,47 +3748,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<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"/>
+ <location line="+9"/>
<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"/>
+ <location line="+4"/>
<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"/>
+ <location line="+6"/>
<source>Set minimum block size in bytes (default: 0)</source>
<translation type="unfinished"/>
</message>
@@ -3081,7 +3783,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Transaction amount too small</source>
<translation type="unfinished"/>
</message>
@@ -3106,32 +3808,32 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<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="+5"/>
+ <location line="+7"/>
<source>Warning</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Warning: This version is obsolete, upgrade required!</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+2"/>
+ <source>version</source>
+ <translation>النسخة</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>wallet.dat corrupt, salvage failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-54"/>
+ <location line="-58"/>
<source>Password for JSON-RPC connections</source>
<translation type="unfinished"/>
</message>
@@ -3141,27 +3843,27 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-126"/>
+ <location line="-132"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+155"/>
+ <location line="+161"/>
<source>Upgrade wallet to latest format</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-12"/>
+ <location line="-11"/>
<source>Rescan the block chain for missing wallet transactions</source>
<translation type="unfinished"/>
</message>
@@ -3171,7 +3873,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-29"/>
+ <location line="-30"/>
<source>Server certificate file (default: server.cert)</source>
<translation type="unfinished"/>
</message>
@@ -3186,27 +3888,22 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Unable to bind to %s on this computer (bind returned error %d, %s)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-95"/>
- <source>Connect through socks proxy</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="-11"/>
+ <location line="-107"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+58"/>
+ <location line="+60"/>
<source>Loading addresses...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-36"/>
+ <location line="-37"/>
<source>Error loading wallet.dat: Wallet corrupted</source>
<translation type="unfinished"/>
</message>
@@ -3226,12 +3923,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+30"/>
+ <location line="+31"/>
<source>Invalid -proxy address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+57"/>
+ <location line="+56"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3241,7 +3938,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3251,7 +3948,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+46"/>
+ <location line="+48"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3271,27 +3968,22 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-60"/>
+ <location line="-62"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-28"/>
+ <location line="-32"/>
<source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+69"/>
- <source>Fee per KB to add to transactions you send</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+20"/>
+ <location line="+95"/>
<source>Loading wallet...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-54"/>
+ <location line="-56"/>
<source>Cannot downgrade wallet</source>
<translation type="unfinished"/>
</message>
@@ -3301,7 +3993,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+66"/>
+ <location line="+67"/>
<source>Rescanning...</source>
<translation type="unfinished"/>
</message>
@@ -3321,7 +4013,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-33"/>
+ <location line="-35"/>
<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_be_BY.ts b/src/qt/locale/bitcoin_be_BY.ts
index b1b9f7f4b5..5fbb794719 100644
--- a/src/qt/locale/bitcoin_be_BY.ts
+++ b/src/qt/locale/bitcoin_be_BY.ts
@@ -22,13 +22,13 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location filename="../aboutdialog.cpp" line="+19"/>
+ <location filename="../utilitydialog.cpp" line="+29"/>
<source>Copyright</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+0"/>
- <source>The Bitcoin developers</source>
+ <source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
</context>
@@ -146,13 +146,13 @@ This product includes software developed by the OpenSSL Project for use in the O
</message>
<message>
<location line="+13"/>
- <source>Error exporting</source>
- <translation>Памылка ÑкÑпартаваннÑ</translation>
+ <source>Exporting Failed</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation>Ðемагчыма запіÑаць у файл %1</translation>
+ <location line="+1"/>
+ <source>There was an error trying to save the address list to %1.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -317,22 +317,27 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+260"/>
+ <location filename="../bitcoingui.cpp" line="+295"/>
<source>Sign &amp;message...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+290"/>
+ <location line="+335"/>
<source>Synchronizing with network...</source>
<translation>Ð¡Ñ–Ð½Ñ…Ñ€Ð°Ð½Ñ–Ð·Ð°Ñ†Ñ‹Ñ Ð· Ñецівам...</translation>
</message>
<message>
- <location line="-360"/>
+ <location line="-407"/>
<source>&amp;Overview</source>
<translation>ÐглÑд</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="-137"/>
+ <source>Node</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+138"/>
<source>Show general overview of wallet</source>
<translation>Паказвае Ð°Ð³ÑƒÐ»ÑŒÐ½Ñ‹Ñ Ð·Ð²ÐµÑткі аб гаманцы</translation>
</message>
@@ -347,7 +352,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>ПраглÑдзець гіÑторыю транзакцый</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>E&amp;xit</source>
<translation>ВыйÑці</translation>
</message>
@@ -393,7 +398,22 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+295"/>
+ <location line="+10"/>
+ <source>&amp;Sending addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Receiving addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open &amp;URI...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+325"/>
<source>Importing blocks from disk...</source>
<translation type="unfinished"/>
</message>
@@ -403,12 +423,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="-358"/>
+ <location line="-405"/>
<source>Send coins to a Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+47"/>
+ <location line="+49"/>
<source>Modify configuration options for Bitcoin</source>
<translation type="unfinished"/>
</message>
@@ -438,18 +458,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+375"/>
+ <location line="+430"/>
<source>Bitcoin</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-563"/>
- <location line="+10"/>
+ <location line="-643"/>
<source>Wallet</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+113"/>
+ <location line="+146"/>
<source>&amp;Send</source>
<translation>ДаÑлаць</translation>
</message>
@@ -459,7 +478,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Ðтрымаць</translation>
</message>
<message>
- <location line="+44"/>
+ <location line="+46"/>
<location line="+2"/>
<source>&amp;Show / Hide</source>
<translation type="unfinished"/>
@@ -485,86 +504,80 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+39"/>
+ <location line="+48"/>
<source>&amp;File</source>
<translation>Ф&amp;айл</translation>
</message>
<message>
- <location line="+11"/>
+ <location line="+14"/>
<source>&amp;Settings</source>
<translation>Ðаладкі</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>&amp;Help</source>
<translation>Дапамога</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+15"/>
<source>Tabs toolbar</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-244"/>
- <location line="+321"/>
+ <location line="-284"/>
+ <location line="+376"/>
<source>[testnet]</source>
<translation>[testnet]</translation>
</message>
<message>
- <location line="-331"/>
- <location line="+10"/>
+ <location line="-401"/>
<source>Bitcoin Core</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+121"/>
+ <location line="+163"/>
<source>Request payments (generates QR codes and bitcoin: URIs)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+27"/>
+ <location line="+29"/>
<location line="+2"/>
<source>&amp;About Bitcoin Core</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+34"/>
- <source>&amp;Used sending addresses...</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+35"/>
<source>Show the list of used sending addresses and labels</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Used &amp;receiving addresses...</source>
+ <location line="+2"/>
+ <source>Show the list of used receiving addresses and labels</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Show the list of used receiving addresses and labels</source>
+ <location line="+3"/>
+ <source>Open a bitcoin: URI or payment request</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+2"/>
- <source>Open URI...</source>
+ <source>&amp;Command-line options</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
- <source>Open a bitcoin: URI or payment request</source>
+ <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+126"/>
+ <location line="+159"/>
<location line="+5"/>
<source>Bitcoin client</source>
<translation>Bitcoin кліент</translation>
</message>
<message numerus="yes">
- <location line="+133"/>
+ <location line="+142"/>
<source>%n active connection(s) to Bitcoin network</source>
<translation><numerusform>%n актыўнае злучÑнне з Bitcoin-Ñецівам</numerusform><numerusform>%n актыўных злучÑннÑÑž з Bitcoin-Ñецівам</numerusform></translation>
</message>
@@ -584,7 +597,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+20"/>
+ <location line="+23"/>
<source>%n hour(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -604,7 +617,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
+ <location line="+21"/>
<source>Last received block was generated %1 ago.</source>
<translation type="unfinished"/>
</message>
@@ -629,27 +642,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+77"/>
- <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="-152"/>
+ <location line="-85"/>
<source>Up to date</source>
<translation>Сінхранізавана</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Catching up...</source>
<translation>ÐаганÑем...</translation>
</message>
<message>
- <location line="+124"/>
- <source>Confirm transaction fee</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+130"/>
<source>Sent transaction</source>
<translation>ДаÑÐ»Ð°Ð½Ñ‹Ñ Ñ‚Ñ€Ð°Ð½Ð·Ð°ÐºÑ†Ñ‹Ñ–</translation>
</message>
@@ -672,7 +675,7 @@ Address: %4
</translation>
</message>
<message>
- <location line="+67"/>
+ <location line="+69"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation>Гаманец &lt;b&gt;зашыфраваны&lt;/b&gt; і зараз &lt;b&gt;разблакаваны&lt;/b&gt;</translation>
</message>
@@ -682,7 +685,7 @@ Address: %4
<translation>Гаманец &lt;b&gt;зашыфраваны&lt;/b&gt; і зараз &lt;b&gt;заблакаваны&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+116"/>
+ <location filename="../bitcoin.cpp" line="+438"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation type="unfinished"/>
</message>
@@ -904,7 +907,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+171"/>
+ <location line="+31"/>
+ <source>none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+140"/>
<source>Dust</source>
<translation type="unfinished"/>
</message>
@@ -941,7 +949,7 @@ Address: %4
</message>
<message>
<location line="+1"/>
- <source>This label turns red, if the priority is smaller than &quot;medium&quot;</source>
+ <source>This label turns red, if the priority is smaller than &quot;medium&quot;.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1010,7 +1018,7 @@ Address: %4
<translation>ÐдраÑ</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+25"/>
+ <location filename="../editaddressdialog.cpp" line="+28"/>
<source>New receiving address</source>
<translation>Ðовы Ð°Ð´Ñ€Ð°Ñ Ð´Ð»Ñ Ð°Ñ‚Ñ€Ñ‹Ð¼Ð°Ð½Ð½Ñ</translation>
</message>
@@ -1079,20 +1087,24 @@ Address: %4
</message>
</context>
<context>
- <name>GUIUtil::HelpMessageBox</name>
+ <name>HelpMessageDialog</name>
<message>
- <location filename="../guiutil.cpp" line="+597"/>
- <source>version</source>
+ <location filename="../forms/helpmessagedialog.ui" line="+19"/>
+ <source>Bitcoin Core - Command-line options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <location line="+13"/>
+ <location filename="../utilitydialog.cpp" line="+38"/>
<source>Bitcoin Core</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-11"/>
+ <location line="+0"/>
+ <source>version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Usage:</source>
<translation>Ужыванне:</translation>
</message>
@@ -1221,7 +1233,7 @@ Address: %4
<translation>Опцыі</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+13"/>
<source>&amp;Main</source>
<translation type="unfinished"/>
</message>
@@ -1246,57 +1258,87 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+35"/>
- <source>Reset all client options to default.</source>
+ <location line="+9"/>
+ <source>Size of &amp;database cache</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>&amp;Reset Options</source>
+ <location line="+13"/>
+ <source>Set database cache size in megabytes (default: 25)</source>
+ <translation>Пазначыць памер кÑшу базы звеÑтак у мегабайтах (тыпова: 25)</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>MB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Number of script &amp;verification threads</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+13"/>
- <source>&amp;Network</source>
+ <source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</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>
+ <location line="+58"/>
+ <source>Connect to the Bitcoin network through a SOCKS proxy.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
- <source>Map port using &amp;UPnP</source>
+ <source>&amp;Connect through SOCKS proxy (default proxy):</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>
+ <location line="+34"/>
+ <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+224"/>
+ <source>Active command-line options that override above options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
+ <source>Reset all client options to default.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
- <source>&amp;Connect through SOCKS proxy:</source>
+ <source>&amp;Reset Options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+9"/>
- <source>Proxy &amp;IP:</source>
+ <location line="-323"/>
+ <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="+19"/>
- <source>IP address of the proxy (e.g. 127.0.0.1)</source>
+ <source>Proxy &amp;IP:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="+32"/>
<source>&amp;Port:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+19"/>
+ <location line="+25"/>
<source>Port of the proxy (e.g. 9050)</source>
<translation type="unfinished"/>
</message>
@@ -1381,7 +1423,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+71"/>
+ <location line="+136"/>
<source>&amp;OK</source>
<translation type="unfinished"/>
</message>
@@ -1391,44 +1433,38 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>&amp;Apply</source>
+ <location filename="../optionsdialog.cpp" line="+67"/>
+ <source>default</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+63"/>
- <source>default</source>
+ <location line="+57"/>
+ <source>none</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+131"/>
+ <location line="+75"/>
<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>
+ <location line="+29"/>
+ <source>Client restart required to activate changes.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
- <location line="+9"/>
- <source>Warning</source>
+ <location line="-29"/>
+ <source>Client will be shutdown, do you want to proceed?</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-9"/>
- <location line="+9"/>
- <source>This setting will take effect after restarting Bitcoin.</source>
+ <location line="+33"/>
+ <source>This change would require a client restart.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+29"/>
+ <location line="+34"/>
<source>The supplied proxy address is invalid.</source>
<translation type="unfinished"/>
</message>
@@ -1442,22 +1478,22 @@ Address: %4
</message>
<message>
<location line="+50"/>
- <location line="+214"/>
+ <location line="+231"/>
<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="-140"/>
+ <location line="-155"/>
<source>Unconfirmed:</source>
<translation>Ðепацверджана:</translation>
</message>
<message>
- <location line="-81"/>
+ <location line="-83"/>
<source>Wallet</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+49"/>
+ <location line="+51"/>
<source>Confirmed:</source>
<translation type="unfinished"/>
</message>
@@ -1492,7 +1528,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+56"/>
+ <location line="+71"/>
<source>&lt;b&gt;Recent transactions&lt;/b&gt;</source>
<translation>&lt;b&gt;ÐÑÐ´Ð°ÑžÐ½Ñ–Ñ Ñ‚Ñ€Ð°Ð½Ð·Ð°Ñ†Ñ†Ñ‹Ñ–&lt;/b&gt;</translation>
</message>
@@ -1506,7 +1542,8 @@ Address: %4
<context>
<name>PaymentServer</name>
<message>
- <location filename="../paymentserver.cpp" line="+397"/>
+ <location filename="../paymentserver.cpp" line="+403"/>
+ <location line="+13"/>
<source>URI handling</source>
<translation type="unfinished"/>
</message>
@@ -1516,24 +1553,52 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+91"/>
+ <location line="+96"/>
<source>Requested payment amount of %1 is too small (considered dust).</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-204"/>
- <location line="+195"/>
+ <location line="-221"/>
+ <location line="+212"/>
<location line="+13"/>
+ <location line="+95"/>
+ <location line="+18"/>
+ <location line="+16"/>
<source>Payment request error</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-207"/>
+ <location line="-353"/>
<source>Cannot start bitcoin: click-to-pay handler</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+195"/>
+ <location line="+58"/>
+ <source>Net manager warning</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Your active proxy doesn&apos;t support SOCKS5, which is required for payment requests via proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>Payment request fetch URL is invalid: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Payment request file handling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Payment request file can not be read or processed! This can be caused by an invalid payment request file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+73"/>
<source>Unverified payment requests to custom payment scripts are unsupported.</source>
<translation type="unfinished"/>
</message>
@@ -1543,24 +1608,27 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
+ <location line="+43"/>
<source>Error communicating with %1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+28"/>
+ <location line="+24"/>
+ <source>Payment request can not be parsed or processed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
<source>Bad response from server %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+32"/>
+ <location line="+33"/>
<source>Payment acknowledged</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-55"/>
- <location line="+27"/>
- <location line="+17"/>
+ <location line="-11"/>
<source>Network request error</source>
<translation type="unfinished"/>
</message>
@@ -1568,18 +1636,18 @@ Address: %4
<context>
<name>QObject</name>
<message>
- <location filename="../bitcoin.cpp" line="+119"/>
- <location line="+5"/>
+ <location filename="../bitcoin.cpp" line="+71"/>
+ <location line="+11"/>
<source>Bitcoin</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-4"/>
+ <location line="+1"/>
<source>Error: Specified data directory &quot;%1&quot; does not exist.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="-12"/>
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation type="unfinished"/>
</message>
@@ -1621,15 +1689,16 @@ Address: %4
<location line="+23"/>
<location line="+23"/>
<location line="+36"/>
- <location line="+53"/>
+ <location line="+23"/>
+ <location line="+36"/>
<location line="+23"/>
<location line="+23"/>
- <location filename="../rpcconsole.cpp" line="+360"/>
+ <location filename="../rpcconsole.cpp" line="+359"/>
<source>N/A</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-217"/>
+ <location line="-223"/>
<source>Client version</source>
<translation type="unfinished"/>
</message>
@@ -1644,7 +1713,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+78"/>
+ <location line="+25"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+53"/>
<source>Using OpenSSL version</source>
<translation type="unfinished"/>
</message>
@@ -1660,16 +1734,16 @@ Address: %4
</message>
<message>
<location line="+7"/>
- <source>Number of connections</source>
+ <source>Name</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+23"/>
- <source>On testnet</source>
+ <source>Number of connections</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+23"/>
+ <location line="+29"/>
<source>Block chain</source>
<translation type="unfinished"/>
</message>
@@ -1694,16 +1768,6 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
- <source>Command-line options</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+10"/>
- <source>&amp;Show</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location line="+24"/>
<source>&amp;Console</source>
<translation type="unfinished"/>
@@ -1734,17 +1798,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-541"/>
+ <location line="-521"/>
<source>Build date</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-79"/>
- <source>Bitcoin Core</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+279"/>
+ <location line="+206"/>
<source>Debug log file</source>
<translation type="unfinished"/>
</message>
@@ -1754,11 +1813,6 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+26"/>
- <source>Show the Bitcoin-Core help message to get a list with possible Bitcoin command-line options.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location line="+76"/>
<source>Clear console</source>
<translation type="unfinished"/>
@@ -1779,7 +1833,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+128"/>
+ <location line="+122"/>
<source>%1 B</source>
<translation type="unfinished"/>
</message>
@@ -1822,12 +1876,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+19"/>
- <source>The amount to request</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="-32"/>
+ <location line="-13"/>
<source>&amp;Label:</source>
<translation>Пазнака:</translation>
</message>
@@ -1837,12 +1886,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+20"/>
- <source>The message to attach to payment request</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="-37"/>
+ <location line="-17"/>
<source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
@@ -1853,16 +1897,26 @@ Address: %4
</message>
<message>
<location line="+27"/>
- <source>The label to associate with the new receiving address</source>
+ <source>An optional label to associate with the new receiving address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
- <source>Use this form to request payments. All fields are optional.</source>
+ <location line="+7"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+56"/>
+ <location line="+7"/>
+ <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+39"/>
+ <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+17"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"/>
</message>
@@ -1878,11 +1932,11 @@ Address: %4
</message>
<message>
<location line="+47"/>
- <source>Previously requested payments</source>
+ <source>Requested payments</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+12"/>
+ <location line="+16"/>
<source>Show the selected request (does the same as double clicking an entry)</source>
<translation type="unfinished"/>
</message>
@@ -1973,7 +2027,7 @@ Address: %4
<context>
<name>RecentRequestsTableModel</name>
<message>
- <location filename="../recentrequeststablemodel.cpp" line="+14"/>
+ <location filename="../recentrequeststablemodel.cpp" line="+24"/>
<source>Date</source>
<translation>Дата</translation>
</message>
@@ -1993,7 +2047,7 @@ Address: %4
<translation>КолькаÑць</translation>
</message>
<message>
- <location line="+36"/>
+ <location line="+38"/>
<source>(no label)</source>
<translation>непазначаны</translation>
</message>
@@ -2008,7 +2062,7 @@ Address: %4
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
<location filename="../sendcoinsdialog.cpp" line="+381"/>
- <location line="+81"/>
+ <location line="+80"/>
<source>Send Coins</source>
<translation>ДаÑлаць Манеты</translation>
</message>
@@ -2118,7 +2172,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-229"/>
+ <location filename="../sendcoinsdialog.cpp" line="-228"/>
<source>Confirm send coins</source>
<translation>Пацвердзіць даÑыланне манет</translation>
</message>
@@ -2221,22 +2275,22 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+113"/>
+ <location line="+112"/>
<source>Warning: Invalid Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+21"/>
<source>(no label)</source>
<translation>непазначаны</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="-11"/>
<source>Warning: Unknown change address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-378"/>
+ <location line="-366"/>
<source>Are you sure you want to send?</source>
<translation type="unfinished"/>
</message>
@@ -2260,13 +2314,13 @@ Address: %4
<name>SendCoinsEntry</name>
<message>
<location filename="../forms/sendcoinsentry.ui" line="+131"/>
- <location line="+501"/>
+ <location line="+521"/>
<location line="+536"/>
<source>A&amp;mount:</source>
<translation>КолькаÑць:</translation>
</message>
<message>
- <location line="-1132"/>
+ <location line="-1152"/>
<source>Pay &amp;To:</source>
<translation>Заплаціць да:</translation>
</message>
@@ -2312,23 +2366,33 @@ Address: %4
</message>
<message>
<location line="+7"/>
- <location line="+504"/>
+ <location line="+524"/>
<location line="+536"/>
<source>Remove this entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-40"/>
+ <location line="-1008"/>
+ <source>Message:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+958"/>
<source>This is a verified payment request.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-971"/>
+ <location line="-991"/>
<source>Enter a label for this address to add it to the list of used addresses</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+439"/>
+ <location line="+459"/>
<source>This is an unverified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2351,6 +2415,19 @@ Address: %4
</message>
</context>
<context>
+ <name>ShutdownWindow</name>
+ <message>
+ <location filename="../utilitydialog.cpp" line="+48"/>
+ <source>Bitcoin Core is shutting down...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Do not shut down the computer until this window disappears.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>SignVerifyMessageDialog</name>
<message>
<location filename="../forms/signverifymessagedialog.ui" line="+14"/>
@@ -2358,7 +2435,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+10"/>
<source>&amp;Sign Message</source>
<translation type="unfinished"/>
</message>
@@ -2546,7 +2623,7 @@ Address: %4
<context>
<name>SplashScreen</name>
<message>
- <location filename="../splashscreen.cpp" line="+26"/>
+ <location filename="../splashscreen.cpp" line="+28"/>
<source>Bitcoin Core</source>
<translation type="unfinished"/>
</message>
@@ -2645,12 +2722,12 @@ Address: %4
<location line="+12"/>
<location line="+45"/>
<location line="+17"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Credit</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="-120"/>
+ <location line="-125"/>
<source>matures in %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -2663,12 +2740,12 @@ Address: %4
<location line="+44"/>
<location line="+8"/>
<location line="+15"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Debit</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-57"/>
+ <location line="-62"/>
<source>Transaction fee</source>
<translation type="unfinished"/>
</message>
@@ -2679,11 +2756,12 @@ Address: %4
</message>
<message>
<location line="+6"/>
+ <location line="+9"/>
<source>Message</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="-7"/>
<source>Comment</source>
<translation type="unfinished"/>
</message>
@@ -2693,7 +2771,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+18"/>
<source>Merchant</source>
<translation type="unfinished"/>
</message>
@@ -2733,7 +2811,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-227"/>
+ <location line="-232"/>
<source>, has not been successfully broadcast yet</source>
<translation>, пакуль не было паÑпÑхова транÑлÑвана</translation>
</message>
@@ -2783,8 +2861,13 @@ Address: %4
<source>Amount</source>
<translation>КолькаÑць</translation>
</message>
+ <message>
+ <location line="+59"/>
+ <source>Immature (%1 confirmations, will be available after %2)</source>
+ <translation type="unfinished"/>
+ </message>
<message numerus="yes">
- <location line="+57"/>
+ <location line="+16"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -2804,17 +2887,13 @@ Address: %4
<translation>Ðепацверджана (%1 з %2 пацверджаннÑÑž)</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="-22"/>
+ <location line="+25"/>
<source>Confirmed (%1 confirmations)</source>
<translation>Пацверджана (%1 пацверджаннÑÑž)</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></translation>
- </message>
<message>
- <location line="+5"/>
+ <location line="-22"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation>ГÑÑ‚Ñ‹ блок не быў прынÑÑ‚Ñ‹ іншымі вузламі Ñ– магчыма не будзе ўхвалены!</translation>
</message>
@@ -2824,7 +2903,7 @@ Address: %4
<translation>Згенеравана, але не прынÑта</translation>
</message>
<message>
- <location line="+43"/>
+ <location line="+62"/>
<source>Received with</source>
<translation>ПрынÑта з</translation>
</message>
@@ -3120,7 +3199,7 @@ Address: %4
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+217"/>
+ <location filename="../bitcoinstrings.cpp" line="+221"/>
<source>Usage:</source>
<translation>Ужыванне:</translation>
</message>
@@ -3140,7 +3219,7 @@ Address: %4
<translation>Опцыі:</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+22"/>
<source>Specify configuration file (default: bitcoin.conf)</source>
<translation>Вызначыць канфігурацыйны файл (зыходна: bitcoin.conf)</translation>
</message>
@@ -3160,7 +3239,7 @@ Address: %4
<translation>Пазначыць памер кÑшу базы звеÑтак у мегабайтах (тыпова: 25)</translation>
</message>
<message>
- <location line="-27"/>
+ <location line="-26"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
<translation>Слухаць злучÑнні на &lt;port&gt; (зыходна: 8333 ці testnet: 18333)</translation>
</message>
@@ -3170,7 +3249,7 @@ Address: %4
<translation>Трымаць не больш за &lt;n&gt; злучÑннÑÑž на аÑобу (зыходна: 125)</translation>
</message>
<message>
- <location line="-50"/>
+ <location line="-51"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation type="unfinished"/>
</message>
@@ -3180,22 +3259,22 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation>Парог Ð´Ð»Ñ Ð°Ð´Ð»ÑƒÑ‡ÑÐ½Ð½Ñ Ð·Ð»Ð°ÑžÐ¼Ñ‹Ñных карыÑтальнікаў (тыпова: 100)</translation>
</message>
<message>
- <location line="-147"/>
+ <location line="-148"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation>КолькаÑць Ñекунд Ð´Ð»Ñ ÑžÑÑ‚Ñ€Ñ‹Ð¼Ð°Ð½Ð½Ñ Ð°Ñобаў да перадалучÑÐ½Ð½Ñ (заходна: 86400)</translation>
</message>
<message>
- <location line="-33"/>
+ <location line="-36"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation type="unfinished"/>
</message>
@@ -3205,7 +3284,7 @@ Address: %4
<translation>Прымаць камандны радок і JSON-RPC каманды</translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>ЗапуÑціць у фоне Ñк дÑман Ñ– прымаць каманды</translation>
</message>
@@ -3215,12 +3294,12 @@ Address: %4
<translation>Ужываць Ñ‚ÑÑтавае Ñеціва</translation>
</message>
<message>
- <location line="-117"/>
+ <location line="-118"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-92"/>
+ <location line="-95"/>
<source>%s, you must set a rpcpassword in the configuration file:
%s
It is recommended you use the following random password:
@@ -3261,6 +3340,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+4"/>
+ <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</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>
@@ -3366,6 +3450,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+1"/>
+ <source>Do not load the wallet and disable wallet RPC calls</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Do you want to rebuild the block database now?</source>
<translation type="unfinished"/>
</message>
@@ -3530,7 +3619,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+8"/>
+ <location line="+7"/>
<source>Set maximum block size in bytes (default: %d)</source>
<translation type="unfinished"/>
</message>
@@ -3550,7 +3639,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+12"/>
+ <location line="+3"/>
+ <source>This is intended for regression testing tools and app development.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Usage (deprecated, use bitcoin-cli):</source>
<translation type="unfinished"/>
</message>
@@ -3575,7 +3669,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
+ <location line="+2"/>
+ <source>Wallet options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source>
<translation type="unfinished"/>
</message>
@@ -3585,12 +3684,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-78"/>
+ <location line="-79"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-104"/>
+ <location line="-105"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
@@ -3610,7 +3709,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+88"/>
+ <location line="+89"/>
<source>Information</source>
<translation type="unfinished"/>
</message>
@@ -3660,11 +3759,6 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Слаць trace/debug звеÑткі Ñž канÑоль замеÑÑ‚ файла debug.log</translation>
</message>
<message>
- <location line="+1"/>
- <source>Send trace/debug info to debugger</source>
- <translation>Слаць trace/debug звеÑткі Ñž адладчык</translation>
- </message>
- <message>
<location line="+6"/>
<source>Set minimum block size in bytes (default: 0)</source>
<translation type="unfinished"/>
@@ -3690,7 +3784,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Transaction amount too small</source>
<translation type="unfinished"/>
</message>
@@ -3720,7 +3814,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Ð†Ð¼Ñ ÐºÐ°Ñ€Ñ‹Ñтальника Ð´Ð»Ñ JSON-RPC злучÑннÑÑž</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Warning</source>
<translation type="unfinished"/>
</message>
@@ -3740,37 +3834,37 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-57"/>
+ <location line="-58"/>
<source>Password for JSON-RPC connections</source>
<translation>Пароль Ð´Ð»Ñ JSON-RPC злучÑннÑÑž</translation>
</message>
<message>
- <location line="-69"/>
+ <location line="-70"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation>Дазволіць JSON-RPC злучÑнні з пÑўнага IP адраÑу</translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<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="-131"/>
+ <location line="-132"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation>Выканаць каманду калі лепшы блок зменіцца (%s замÑнÑецца на Ñ…Ñш блока)</translation>
</message>
<message>
- <location line="+160"/>
+ <location line="+161"/>
<source>Upgrade wallet to latest format</source>
<translation>Ðбнавіць гаманец на новы фармат</translation>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation>УÑтанавіць памер фонда ключоў у &lt;n&gt; (тыпова: 100)</translation>
</message>
<message>
- <location line="-12"/>
+ <location line="-11"/>
<source>Rescan the block chain for missing wallet transactions</source>
<translation>ПераÑканаваць ланцуг блокаў Ð´Ð·ÐµÐ»Ñ Ð¿Ð¾ÑˆÑƒÐºÑƒ адÑутных транзакцый</translation>
</message>
@@ -3780,7 +3874,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Ужываць OpenSSL (https) Ð´Ð»Ñ JSON-RPC злучÑннÑÑž</translation>
</message>
<message>
- <location line="-29"/>
+ <location line="-30"/>
<source>Server certificate file (default: server.cert)</source>
<translation>Файл-Ñертыфікат Ñервера (зыходна: server.cert)</translation>
</message>
@@ -3795,17 +3889,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Unable to bind to %s on this computer (bind returned error %d, %s)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-106"/>
+ <location line="-107"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+59"/>
+ <location line="+60"/>
<source>Loading addresses...</source>
<translation>Загружаем адраÑÑ‹...</translation>
</message>
@@ -3845,7 +3939,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3855,7 +3949,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+47"/>
+ <location line="+48"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3875,7 +3969,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Загружаем індÑÐºÑ Ð±Ð»Ð¾ÐºÐ°Ñž...</translation>
</message>
<message>
- <location line="-61"/>
+ <location line="-62"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation type="unfinished"/>
</message>
@@ -3885,12 +3979,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+94"/>
+ <location line="+95"/>
<source>Loading wallet...</source>
<translation>Загружаем гаманец...</translation>
</message>
<message>
- <location line="-55"/>
+ <location line="-56"/>
<source>Cannot downgrade wallet</source>
<translation type="unfinished"/>
</message>
@@ -3900,7 +3994,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+66"/>
+ <location line="+67"/>
<source>Rescanning...</source>
<translation>ПераÑканаванне...</translation>
</message>
@@ -3920,7 +4014,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Памылка</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-35"/>
<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_bg.ts b/src/qt/locale/bitcoin_bg.ts
index 1da05bd9d6..c8a403346d 100644
--- a/src/qt/locale/bitcoin_bg.ts
+++ b/src/qt/locale/bitcoin_bg.ts
@@ -3,13 +3,13 @@
<name>AboutDialog</name>
<message>
<location filename="../forms/aboutdialog.ui" line="+14"/>
- <source>About Bitcoin</source>
- <translation>За Биткоин</translation>
+ <source>About Bitcoin Core</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+39"/>
- <source>&lt;b&gt;Bitcoin&lt;/b&gt; version</source>
- <translation>&lt;b&gt;Биткоин&lt;/b&gt; верÑиÑ</translation>
+ <source>&lt;b&gt;Bitcoin Core&lt;/b&gt; version</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+57"/>
@@ -27,13 +27,13 @@ This product includes software developed by the OpenSSL Project for use in the O
Използван е Ñофтуер, разработен от OpenSSL Project за употреба в OpenSSL Toolkit (http://www.openssl.org/), криптографÑки Ñофтуер разработен от Eric Young (eay@cryptsoft.com) и UPnP Ñофтуер разработен от Thomas Bernard.</translation>
</message>
<message>
- <location filename="../aboutdialog.cpp" line="+14"/>
+ <location filename="../utilitydialog.cpp" line="+29"/>
<source>Copyright</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+0"/>
- <source>The Bitcoin developers</source>
+ <source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
</context>
@@ -70,7 +70,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location filename="../addressbookpage.cpp" line="+72"/>
+ <location filename="../addressbookpage.cpp" line="+74"/>
<source>&amp;Copy Address</source>
<translation>&amp;Копирай</translation>
</message>
@@ -140,7 +140,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>&amp;Редактирай</translation>
</message>
<message>
- <location line="+197"/>
+ <location line="+194"/>
<source>Export Address List</source>
<translation type="unfinished"/>
</message>
@@ -151,19 +151,19 @@ This product includes software developed by the OpenSSL Project for use in the O
</message>
<message>
<location line="+13"/>
- <source>Error exporting</source>
- <translation>Грешка при запиÑа</translation>
+ <source>Exporting Failed</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation>ÐеуÑпешен Ð·Ð°Ð¿Ð¸Ñ Ð² %1.</translation>
+ <location line="+1"/>
+ <source>There was an error trying to save the address list to %1.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<name>AddressTableModel</name>
<message>
- <location filename="../addresstablemodel.cpp" line="+164"/>
+ <location filename="../addresstablemodel.cpp" line="+168"/>
<source>Label</source>
<translation>Име</translation>
</message>
@@ -201,7 +201,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Още веднъж</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="+34"/>
+ <location filename="../askpassphrasedialog.cpp" line="+40"/>
<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>
</message>
@@ -322,22 +322,27 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+250"/>
+ <location filename="../bitcoingui.cpp" line="+295"/>
<source>Sign &amp;message...</source>
<translation>ПодпиÑване на &amp;Ñъобщение...</translation>
</message>
<message>
- <location line="+254"/>
+ <location line="+335"/>
<source>Synchronizing with network...</source>
<translation>Синхронизиране Ñ Ð¼Ñ€ÐµÐ¶Ð°Ñ‚Ð°...</translation>
</message>
<message>
- <location line="-324"/>
+ <location line="-407"/>
<source>&amp;Overview</source>
<translation>&amp;БаланÑ</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="-137"/>
+ <source>Node</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+138"/>
<source>Show general overview of wallet</source>
<translation>Обобщена Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° портфейла</translation>
</message>
@@ -352,7 +357,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>ИÑÑ‚Ð¾Ñ€Ð¸Ñ Ð½Ð° транзакциите</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>E&amp;xit</source>
<translation>Из&amp;ход</translation>
</message>
@@ -398,7 +403,22 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>&amp;СмÑна на паролата...</translation>
</message>
<message>
- <location line="+259"/>
+ <location line="+10"/>
+ <source>&amp;Sending addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Receiving addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open &amp;URI...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+325"/>
<source>Importing blocks from disk...</source>
<translation type="unfinished"/>
</message>
@@ -408,12 +428,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="-322"/>
+ <location line="-405"/>
<source>Send coins to a Bitcoin address</source>
<translation>Изпращане към Биткоин адреÑ</translation>
</message>
<message>
- <location line="+47"/>
+ <location line="+49"/>
<source>Modify configuration options for Bitcoin</source>
<translation type="unfinished"/>
</message>
@@ -443,20 +463,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>&amp;Проверка на Ñъобщение...</translation>
</message>
<message>
- <location line="-180"/>
- <location line="+6"/>
- <location line="+513"/>
+ <location line="+430"/>
<source>Bitcoin</source>
<translation>Биткоин</translation>
</message>
<message>
- <location line="-519"/>
- <location line="+6"/>
+ <location line="-643"/>
<source>Wallet</source>
<translation>Портфейл</translation>
</message>
<message>
- <location line="+109"/>
+ <location line="+146"/>
<source>&amp;Send</source>
<translation type="unfinished"/>
</message>
@@ -466,13 +483,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+28"/>
- <location line="+2"/>
- <source>&amp;About Bitcoin</source>
- <translation>&amp;За Биткоин</translation>
- </message>
- <message>
- <location line="+14"/>
+ <location line="+46"/>
<location line="+2"/>
<source>&amp;Show / Hide</source>
<translation type="unfinished"/>
@@ -498,64 +509,80 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+35"/>
+ <location line="+48"/>
<source>&amp;File</source>
<translation>&amp;Файл</translation>
</message>
<message>
- <location line="+10"/>
+ <location line="+14"/>
<source>&amp;Settings</source>
<translation>&amp;ÐаÑтройки</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>&amp;Help</source>
<translation>&amp;Помощ</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+15"/>
<source>Tabs toolbar</source>
<translation>Раздели</translation>
</message>
<message>
- <location line="-235"/>
- <location line="+294"/>
+ <location line="-284"/>
+ <location line="+376"/>
<source>[testnet]</source>
<translation>[testnet]</translation>
</message>
<message>
- <location line="-177"/>
+ <location line="-401"/>
+ <source>Bitcoin Core</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+163"/>
<source>Request payments (generates QR codes and bitcoin: URIs)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+63"/>
- <source>&amp;Used sending addresses...</source>
+ <location line="+29"/>
+ <location line="+2"/>
+ <source>&amp;About Bitcoin Core</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="+35"/>
<source>Show the list of used sending addresses and labels</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Used &amp;receiving addresses...</source>
+ <location line="+2"/>
+ <source>Show the list of used receiving addresses and labels</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open a bitcoin: URI or payment request</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Command-line options</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
- <source>Show the list of used receiving addresses and labels</source>
+ <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+106"/>
+ <location line="+159"/>
<location line="+5"/>
<source>Bitcoin client</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+120"/>
+ <location line="+142"/>
<source>%n active connection(s) to Bitcoin network</source>
<translation><numerusform>%n връзка към Биткоин мрежата</numerusform><numerusform>%n връзки към Биткоин мрежата</numerusform></translation>
</message>
@@ -575,7 +602,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+20"/>
+ <location line="+23"/>
<source>%n hour(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -595,7 +622,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
+ <location line="+21"/>
<source>Last received block was generated %1 ago.</source>
<translation type="unfinished"/>
</message>
@@ -620,27 +647,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+77"/>
- <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="-152"/>
+ <location line="-85"/>
<source>Up to date</source>
<translation>Синхронизиран</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Catching up...</source>
<translation>Зарежда блокове...</translation>
</message>
<message>
- <location line="+124"/>
- <source>Confirm transaction fee</source>
- <translation>Потвърждение за такÑа</translation>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+130"/>
<source>Sent transaction</source>
<translation>ИзходÑща транзакциÑ</translation>
</message>
@@ -659,17 +676,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+34"/>
- <source>URI handling</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+0"/>
- <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="+45"/>
+ <location line="+69"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation>Портфейлът е &lt;b&gt;криптиран&lt;/b&gt; и &lt;b&gt;отключен&lt;/b&gt;</translation>
</message>
@@ -679,7 +686,7 @@ Address: %4
<translation>Портфейлът е &lt;b&gt;криптиран&lt;/b&gt; и &lt;b&gt;заключен&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+110"/>
+ <location filename="../bitcoin.cpp" line="+438"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation type="unfinished"/>
</message>
@@ -687,12 +694,304 @@ Address: %4
<context>
<name>ClientModel</name>
<message>
- <location filename="../clientmodel.cpp" line="+115"/>
+ <location filename="../clientmodel.cpp" line="+119"/>
<source>Network Alert</source>
<translation type="unfinished"/>
</message>
</context>
<context>
+ <name>CoinControlDialog</name>
+ <message>
+ <location filename="../forms/coincontroldialog.ui" line="+14"/>
+ <source>Coin Control Address Selection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>Quantity:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Bytes:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>Amount:</source>
+ <translation>Сума:</translation>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Priority:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Low Output:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>After Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Change:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+63"/>
+ <source>(un)select all</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Tree mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>List mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>Amount</source>
+ <translation>Сума</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Address</source>
+ <translation>ÐдреÑ</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Date</source>
+ <translation>Дата</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Confirmations</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Confirmed</source>
+ <translation>Потвърдени</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../coincontroldialog.cpp" line="+42"/>
+ <source>Copy address</source>
+ <translation>Копирай адреÑ</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy label</source>
+ <translation>Копирай име</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+26"/>
+ <source>Copy amount</source>
+ <translation>Копирай Ñума</translation>
+ </message>
+ <message>
+ <location line="-25"/>
+ <source>Copy transaction ID</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Lock unspent</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Unlock unspent</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+22"/>
+ <source>Copy quantity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Copy fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy after fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy bytes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy low output</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy change</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+323"/>
+ <source>highest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>higher</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>high</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>medium-high</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>medium</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>low-medium</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>low</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>lower</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>lowest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>(%1 locked)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+140"/>
+ <source>Dust</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>yes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>no</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>This label turns red, if the transaction size is greater than 1000 bytes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+5"/>
+ <source>This means a fee of at least %1 per kB is required.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-4"/>
+ <source>Can vary +/- 1 byte per input.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Transactions with higher priority are more likely to get included into a block.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>This label turns red, if the priority is smaller than &quot;medium&quot;.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>This label turns red, if any recipient receives an amount smaller than %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+4"/>
+ <source>This means a fee of at least %1 is required.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-3"/>
+ <source>Amounts below 0.546 times the minimum relay fee are shown as dust.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>This label turns red, if the change is smaller than %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
+ <location line="+66"/>
+ <source>(no label)</source>
+ <translation>(без име)</translation>
+ </message>
+ <message>
+ <location line="-9"/>
+ <source>change from %1 (%2)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>(change)</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>EditAddressDialog</name>
<message>
<location filename="../forms/editaddressdialog.ui" line="+14"/>
@@ -720,7 +1019,7 @@ Address: %4
<translation>&amp;ÐдреÑ</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+21"/>
+ <location filename="../editaddressdialog.cpp" line="+28"/>
<source>New receiving address</source>
<translation>Ðов Ð°Ð´Ñ€ÐµÑ Ð·Ð° получаване</translation>
</message>
@@ -763,7 +1062,7 @@ Address: %4
<context>
<name>FreespaceChecker</name>
<message>
- <location filename="../intro.cpp" line="+61"/>
+ <location filename="../intro.cpp" line="+65"/>
<source>A new data directory will be created.</source>
<translation type="unfinished"/>
</message>
@@ -789,22 +1088,26 @@ Address: %4
</message>
</context>
<context>
- <name>GUIUtil::HelpMessageBox</name>
+ <name>HelpMessageDialog</name>
<message>
- <location filename="../guiutil.cpp" line="+558"/>
- <location line="+13"/>
- <source>Bitcoin-Qt</source>
+ <location filename="../forms/helpmessagedialog.ui" line="+19"/>
+ <source>Bitcoin Core - Command-line options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-13"/>
+ <location filename="../utilitydialog.cpp" line="+38"/>
+ <source>Bitcoin Core</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
<source>version</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+2"/>
<source>Usage:</source>
- <translation type="unfinished"/>
+ <translation>Използване:</translation>
</message>
<message>
<location line="+1"/>
@@ -846,17 +1149,17 @@ Address: %4
</message>
<message>
<location line="+9"/>
- <source>Welcome to Bitcoin-Qt.</source>
+ <source>Welcome to Bitcoin Core.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+26"/>
- <source>As this is the first time the program is launched, you can choose where Bitcoin-Qt will store its data.</source>
+ <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+10"/>
- <source>Bitcoin-Qt will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
+ <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -870,7 +1173,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../intro.cpp" line="+105"/>
+ <location filename="../intro.cpp" line="+85"/>
+ <source>Bitcoin</source>
+ <translation>Биткоин</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error: Specified data directory &quot;%1&quot; can not be created.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+19"/>
<source>Error</source>
<translation>Грешка</translation>
</message>
@@ -886,6 +1199,34 @@ Address: %4
</message>
</context>
<context>
+ <name>OpenURIDialog</name>
+ <message>
+ <location filename="../forms/openuridialog.ui" line="+14"/>
+ <source>Open URI</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Open payment request from URI or file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>URI:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Select payment request file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../openuridialog.cpp" line="+47"/>
+ <source>Select payment request file to open</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OptionsDialog</name>
<message>
<location filename="../forms/optionsdialog.ui" line="+14"/>
@@ -893,7 +1234,7 @@ Address: %4
<translation>Опции</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+13"/>
<source>&amp;Main</source>
<translation>&amp;ОÑновни</translation>
</message>
@@ -918,7 +1259,52 @@ Address: %4
<translation>&amp;ПуÑкане на Биткоин при вход в ÑиÑтемата</translation>
</message>
<message>
- <location line="+35"/>
+ <location line="+9"/>
+ <source>Size of &amp;database cache</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set database cache size in megabytes (default: 25)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>MB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Number of script &amp;verification threads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Connect to the Bitcoin network through a SOCKS proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Connect through SOCKS proxy (default proxy):</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+224"/>
+ <source>Active command-line options that override above options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
<source>Reset all client options to default.</source>
<translation type="unfinished"/>
</message>
@@ -928,7 +1314,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="-323"/>
<source>&amp;Network</source>
<translation>&amp;Мрежа</translation>
</message>
@@ -943,32 +1329,17 @@ Address: %4
<translation>ОтварÑне на входÑÑ‰Ð¸Ñ Ð¿Ð¾Ñ€Ñ‚ чрез &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 type="unfinished"/>
- </message>
- <message>
- <location line="+9"/>
+ <location line="+19"/>
<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>IP Ð°Ð´Ñ€ÐµÑ Ð½Ð° прокÑи Ñървъра (например 127.0.0.1)</translation>
- </message>
- <message>
- <location line="+7"/>
+ <location line="+32"/>
<source>&amp;Port:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+19"/>
+ <location line="+25"/>
<source>Port of the proxy (e.g. 9050)</source>
<translation type="unfinished"/>
</message>
@@ -1043,7 +1414,17 @@ Address: %4
<translation>Показвай и адреÑите в ÑпиÑъка Ñ Ñ‚Ñ€Ð°Ð½Ð·Ð°ÐºÑ†Ð¸Ð¸</translation>
</message>
<message>
- <location line="+71"/>
+ <location line="+7"/>
+ <source>Whether to show coin control features or not.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Display coin &amp;control features (experts only)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+136"/>
<source>&amp;OK</source>
<translation type="unfinished"/>
</message>
@@ -1053,44 +1434,38 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>&amp;Apply</source>
+ <location filename="../optionsdialog.cpp" line="+67"/>
+ <source>default</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+58"/>
- <source>default</source>
+ <location line="+57"/>
+ <source>none</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+130"/>
+ <location line="+75"/>
<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>
+ <location line="+29"/>
+ <source>Client restart required to activate changes.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
- <location line="+9"/>
- <source>Warning</source>
+ <location line="-29"/>
+ <source>Client will be shutdown, do you want to proceed?</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-9"/>
- <location line="+9"/>
- <source>This setting will take effect after restarting Bitcoin.</source>
+ <location line="+33"/>
+ <source>This change would require a client restart.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+29"/>
+ <location line="+34"/>
<source>The supplied proxy address is invalid.</source>
<translation>ПрокÑи адреÑÑŠÑ‚ е невалиден.</translation>
</message>
@@ -1104,22 +1479,22 @@ Address: %4
</message>
<message>
<location line="+50"/>
- <location line="+202"/>
+ <location line="+231"/>
<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="-131"/>
+ <location line="-155"/>
<source>Unconfirmed:</source>
<translation>Ðепотвърдени:</translation>
</message>
<message>
- <location line="-78"/>
+ <location line="-83"/>
<source>Wallet</source>
<translation>Портфейл</translation>
</message>
<message>
- <location line="+49"/>
+ <location line="+51"/>
<source>Confirmed:</source>
<translation type="unfinished"/>
</message>
@@ -1129,12 +1504,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+29"/>
+ <location line="+32"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+16"/>
<source>Immature:</source>
<translation type="unfinished"/>
</message>
@@ -1144,7 +1519,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+16"/>
<source>Total:</source>
<translation type="unfinished"/>
</message>
@@ -1154,12 +1529,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+53"/>
+ <location line="+71"/>
<source>&lt;b&gt;Recent transactions&lt;/b&gt;</source>
<translation>&lt;b&gt;ПоÑледни транзакции&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../overviewpage.cpp" line="+116"/>
+ <location filename="../overviewpage.cpp" line="+120"/>
<location line="+1"/>
<source>out of sync</source>
<translation>неÑинхронизиран</translation>
@@ -1168,7 +1543,8 @@ Address: %4
<context>
<name>PaymentServer</name>
<message>
- <location filename="../paymentserver.cpp" line="+392"/>
+ <location filename="../paymentserver.cpp" line="+403"/>
+ <location line="+13"/>
<source>URI handling</source>
<translation type="unfinished"/>
</message>
@@ -1178,45 +1554,82 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+69"/>
+ <location line="+96"/>
<source>Requested payment amount of %1 is too small (considered dust).</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
- <location line="+37"/>
+ <location line="-221"/>
+ <location line="+212"/>
+ <location line="+13"/>
+ <location line="+95"/>
+ <location line="+18"/>
+ <location line="+16"/>
<source>Payment request error</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="-353"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Net manager warning</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+1"/>
- <source>Insecure requests to custom payment scripts unsupported</source>
+ <source>Your active proxy doesn&apos;t support SOCKS5, which is required for payment requests via proxy.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+38"/>
+ <location line="+52"/>
+ <source>Payment request fetch URL is invalid: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Payment request file handling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Payment request file can not be read or processed! This can be caused by an invalid payment request file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+73"/>
+ <source>Unverified payment requests to custom payment scripts are unsupported.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+59"/>
<source>Refund from %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
+ <location line="+43"/>
<source>Error communicating with %1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+24"/>
+ <source>Payment request can not be parsed or processed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
<source>Bad response from server %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+32"/>
+ <location line="+33"/>
<source>Payment acknowledged</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-58"/>
- <location line="+30"/>
- <location line="+17"/>
+ <location line="-11"/>
<source>Network request error</source>
<translation type="unfinished"/>
</message>
@@ -1224,32 +1637,26 @@ Address: %4
<context>
<name>QObject</name>
<message>
- <location filename="../bitcoin.cpp" line="+114"/>
- <location line="+5"/>
- <location filename="../intro.cpp" line="-32"/>
+ <location filename="../bitcoin.cpp" line="+71"/>
+ <location line="+11"/>
<source>Bitcoin</source>
<translation>Биткоин</translation>
</message>
<message>
- <location line="-4"/>
+ <location line="+1"/>
<source>Error: Specified data directory &quot;%1&quot; does not exist.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="-12"/>
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../intro.cpp" line="+1"/>
- <source>Error: Specified data directory &quot;%1&quot; can not be created.</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>QRImageWidget</name>
<message>
- <location filename="../receiverequestdialog.cpp" line="+32"/>
+ <location filename="../receiverequestdialog.cpp" line="+36"/>
<source>&amp;Save Image...</source>
<translation type="unfinished"/>
</message>
@@ -1265,7 +1672,7 @@ Address: %4
</message>
<message>
<location line="+0"/>
- <source>PNG Images (*.png)</source>
+ <source>PNG Image (*.png)</source>
<translation type="unfinished"/>
</message>
</context>
@@ -1283,15 +1690,16 @@ Address: %4
<location line="+23"/>
<location line="+23"/>
<location line="+36"/>
- <location line="+53"/>
+ <location line="+23"/>
+ <location line="+36"/>
<location line="+23"/>
<location line="+23"/>
- <location filename="../rpcconsole.cpp" line="+352"/>
+ <location filename="../rpcconsole.cpp" line="+359"/>
<source>N/A</source>
<translation>N/A</translation>
</message>
<message>
- <location line="-217"/>
+ <location line="-223"/>
<source>Client version</source>
<translation type="unfinished"/>
</message>
@@ -1301,7 +1709,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+68"/>
+ <location line="-10"/>
+ <source>Debug window</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+25"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+53"/>
<source>Using OpenSSL version</source>
<translation type="unfinished"/>
</message>
@@ -1317,16 +1735,16 @@ Address: %4
</message>
<message>
<location line="+7"/>
- <source>Number of connections</source>
+ <source>Name</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+23"/>
- <source>On testnet</source>
+ <source>Number of connections</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+23"/>
+ <location line="+29"/>
<source>Block chain</source>
<translation type="unfinished"/>
</message>
@@ -1351,21 +1769,6 @@ Address: %4
<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"/>
@@ -1396,22 +1799,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-541"/>
+ <location line="-521"/>
<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"/>
+ <location line="+206"/>
<source>Debug log file</source>
<translation type="unfinished"/>
</message>
@@ -1421,7 +1814,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+102"/>
+ <location line="+76"/>
<source>Clear console</source>
<translation>ИзчиÑти конзолата</translation>
</message>
@@ -1441,7 +1834,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+128"/>
+ <location line="+122"/>
<source>%1 B</source>
<translation type="unfinished"/>
</message>
@@ -1479,48 +1872,48 @@ Address: %4
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+22"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
<source>&amp;Amount:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
- <source>The amount to request</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+7"/>
+ <location line="-13"/>
<source>&amp;Label:</source>
<translation>&amp;Име:</translation>
</message>
<message>
- <location line="+10"/>
- <source>The label to associate with the receiving address</source>
+ <location line="-34"/>
+ <source>&amp;Message:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>&amp;Message:</source>
+ <location line="-17"/>
+ <source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>The message to attach to payment request</source>
+ <location line="+3"/>
+ <source>R&amp;euse an existing receiving address (not recommended)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
- <source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
+ <location line="+27"/>
+ <source>An optional label to associate with the new receiving address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>R&amp;euse an existing receiving address (not recommended)</source>
+ <location line="+7"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+7"/>
- <source>Use this form to request payments. All fields are optional.</source>
+ <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+39"/>
+ <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1538,6 +1931,31 @@ Address: %4
<source>&amp;Request payment</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+47"/>
+ <source>Requested payments</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Show the selected request (does the same as double clicking an entry)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Show</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Remove the selected entries from the list</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Remove</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
@@ -1558,16 +1976,11 @@ Address: %4
</message>
<message>
<location line="+7"/>
- <source>&amp;Copy Image</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+7"/>
<source>&amp;Save Image...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../receiverequestdialog.cpp" line="+58"/>
+ <location filename="../receiverequestdialog.cpp" line="+56"/>
<source>Request payment to %1</source>
<translation type="unfinished"/>
</message>
@@ -1613,16 +2026,119 @@ Address: %4
</message>
</context>
<context>
+ <name>RecentRequestsTableModel</name>
+ <message>
+ <location filename="../recentrequeststablemodel.cpp" line="+24"/>
+ <source>Date</source>
+ <translation>Дата</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Label</source>
+ <translation>Име</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Message</source>
+ <translation>Съобщение</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Amount</source>
+ <translation>Сума</translation>
+ </message>
+ <message>
+ <location line="+38"/>
+ <source>(no label)</source>
+ <translation>(без име)</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>(no message)</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+140"/>
- <location line="+213"/>
+ <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location line="+80"/>
<source>Send Coins</source>
<translation>Изпращане</translation>
</message>
<message>
- <location line="+50"/>
+ <location line="+76"/>
+ <source>Coin Control Features</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Inputs...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>automatically selected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Insufficient funds!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+89"/>
+ <source>Quantity:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+35"/>
+ <source>Bytes:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Amount:</source>
+ <translation>Сума:</translation>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Priority:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Low Output:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>After Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Change:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+44"/>
+ <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Custom change address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+115"/>
<source>Send to multiple recipients at once</source>
<translation>Изпращане към повече от един получател</translation>
</message>
@@ -1647,12 +2163,7 @@ Address: %4
<translation>БаланÑ:</translation>
</message>
<message>
- <location line="+10"/>
- <source>123.456 BTC</source>
- <translation>123.456 BTC</translation>
- </message>
- <message>
- <location line="+31"/>
+ <location line="+41"/>
<source>Confirm the send action</source>
<translation>Потвърдете изпращането</translation>
</message>
@@ -1662,69 +2173,135 @@ Address: %4
<translation>И&amp;зпрати</translation>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-154"/>
+ <location filename="../sendcoinsdialog.cpp" line="-228"/>
<source>Confirm send coins</source>
<translation>Потвърждаване</translation>
</message>
<message>
- <location line="-90"/>
+ <location line="-74"/>
<location line="+5"/>
<location line="+5"/>
+ <location line="+4"/>
<source>%1 to %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+26"/>
+ <location line="-136"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation>Въведете Биткоин Ð°Ð´Ñ€ÐµÑ (например 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Copy quantity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation>Копирай Ñума</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy after fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy bytes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy low output</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy change</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+170"/>
+ <source>Total Amount %1 (= %2)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>or</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+202"/>
<source>The recipient address is not valid, please recheck.</source>
<translation>Ðевалиден Ð°Ð´Ñ€ÐµÑ Ð½Ð° получателÑ.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The amount to pay must be larger than 0.</source>
<translation>Сумата Ñ‚Ñ€Ñбва да е по-голÑма от 0.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The amount exceeds your balance.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The total exceeds your balance when the %1 transaction fee is included.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+3"/>
<source>Duplicate address found, can only send to each address once per send operation.</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="+3"/>
+ <source>Transaction creation failed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+4"/>
- <source>Error: Transaction creation failed!</source>
+ <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+15"/>
- <source>Are you sure you want to send?</source>
+ <location line="+112"/>
+ <source>Warning: Invalid Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+9"/>
- <source>added as transaction fee</source>
+ <location line="+21"/>
+ <source>(no label)</source>
+ <translation>(без име)</translation>
+ </message>
+ <message>
+ <location line="-11"/>
+ <source>Warning: Unknown change address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
- <source>Total Amount %1</source>
+ <location line="-366"/>
+ <source>Are you sure you want to send?</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+20"/>
- <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>
+ <location line="+9"/>
+ <source>added as transaction fee</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+144"/>
+ <location line="+170"/>
<source>Payment request expired</source>
<translation type="unfinished"/>
</message>
@@ -1737,39 +2314,44 @@ Address: %4
<context>
<name>SendCoinsEntry</name>
<message>
- <location filename="../forms/sendcoinsentry.ui" line="+33"/>
- <location line="+585"/>
+ <location filename="../forms/sendcoinsentry.ui" line="+131"/>
+ <location line="+521"/>
+ <location line="+536"/>
<source>A&amp;mount:</source>
<translation>С&amp;ума:</translation>
</message>
<message>
- <location line="-572"/>
- <location line="+585"/>
+ <location line="-1152"/>
<source>Pay &amp;To:</source>
<translation>Плати &amp;Ðа:</translation>
</message>
<message>
- <location line="-551"/>
+ <location line="+18"/>
<source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../sendcoinsentry.cpp" line="+28"/>
+ <location filename="../sendcoinsentry.cpp" line="+30"/>
<source>Enter a label for this address to add it to your address book</source>
<translation>Въведете име за този адреÑ, за да го добавите в ÑпиÑъка Ñ Ð°Ð´Ñ€ÐµÑи</translation>
</message>
<message>
- <location filename="../forms/sendcoinsentry.ui" line="-18"/>
+ <location filename="../forms/sendcoinsentry.ui" line="+57"/>
<source>&amp;Label:</source>
<translation>&amp;Име:</translation>
</message>
<message>
- <location line="+28"/>
+ <location line="-50"/>
<source>Choose previously used address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
+ <location line="-40"/>
+ <source>This is a normal payment.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+50"/>
<source>Alt+A</source>
<translation>Alt+A</translation>
</message>
@@ -1785,16 +2367,45 @@ Address: %4
</message>
<message>
<location line="+7"/>
- <source>Remove this recipient</source>
- <translation>Махни този получател</translation>
+ <location line="+524"/>
+ <location line="+536"/>
+ <source>Remove this entry</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="-1008"/>
+ <source>Message:</source>
+ <translation>Съобщение:</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+958"/>
+ <source>This is a verified payment request.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-991"/>
<source>Enter a label for this address to add it to the list of used addresses</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+465"/>
+ <location line="+459"/>
+ <source>This is an unverified payment request.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+18"/>
+ <location line="+532"/>
+ <source>Pay To:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-498"/>
+ <location line="+536"/>
<source>Memo:</source>
<translation type="unfinished"/>
</message>
@@ -1805,6 +2416,19 @@ Address: %4
</message>
</context>
<context>
+ <name>ShutdownWindow</name>
+ <message>
+ <location filename="../utilitydialog.cpp" line="+48"/>
+ <source>Bitcoin Core is shutting down...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Do not shut down the computer until this window disappears.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>SignVerifyMessageDialog</name>
<message>
<location filename="../forms/signverifymessagedialog.ui" line="+14"/>
@@ -1812,7 +2436,7 @@ Address: %4
<translation>Подпиши / Провери Ñъобщение</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+10"/>
<source>&amp;Sign Message</source>
<translation>&amp;Подпиши</translation>
</message>
@@ -1915,7 +2539,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+27"/>
+ <location filename="../signverifymessagedialog.cpp" line="+29"/>
<location line="+3"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>Въведете Биткоин Ð°Ð´Ñ€ÐµÑ (например 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
@@ -1931,7 +2555,7 @@ Address: %4
<translation>Биткоин подпиÑ</translation>
</message>
<message>
- <location line="+85"/>
+ <location line="+84"/>
<location line="+81"/>
<source>The entered address is invalid.</source>
<translation>ВъведениÑÑ‚ Ð°Ð´Ñ€ÐµÑ Ðµ невалиден.</translation>
@@ -2000,8 +2624,13 @@ Address: %4
<context>
<name>SplashScreen</name>
<message>
- <location filename="../splashscreen.cpp" line="+23"/>
- <source>The Bitcoin developers</source>
+ <location filename="../splashscreen.cpp" line="+28"/>
+ <source>Bitcoin Core</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
<message>
@@ -2013,7 +2642,7 @@ Address: %4
<context>
<name>TrafficGraphWidget</name>
<message>
- <location filename="../trafficgraphwidget.cpp" line="+75"/>
+ <location filename="../trafficgraphwidget.cpp" line="+79"/>
<source>KB/s</source>
<translation type="unfinished"/>
</message>
@@ -2021,7 +2650,7 @@ Address: %4
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="+22"/>
+ <location filename="../transactiondesc.cpp" line="+28"/>
<source>Open until %1</source>
<translation>Подлежи на промÑна до %1</translation>
</message>
@@ -2094,12 +2723,12 @@ Address: %4
<location line="+12"/>
<location line="+45"/>
<location line="+17"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Credit</source>
<translation>Кредит</translation>
</message>
<message numerus="yes">
- <location line="-120"/>
+ <location line="-125"/>
<source>matures in %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -2112,12 +2741,12 @@ Address: %4
<location line="+44"/>
<location line="+8"/>
<location line="+15"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Debit</source>
<translation>Дебит</translation>
</message>
<message>
- <location line="-57"/>
+ <location line="-62"/>
<source>Transaction fee</source>
<translation>ТакÑа</translation>
</message>
@@ -2128,11 +2757,12 @@ Address: %4
</message>
<message>
<location line="+6"/>
+ <location line="+9"/>
<source>Message</source>
<translation>Съобщение</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="-7"/>
<source>Comment</source>
<translation>Коментар</translation>
</message>
@@ -2142,7 +2772,7 @@ Address: %4
<translation>ID</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+18"/>
<source>Merchant</source>
<translation type="unfinished"/>
</message>
@@ -2182,7 +2812,7 @@ Address: %4
<translation>false</translation>
</message>
<message>
- <location line="-227"/>
+ <location line="-232"/>
<source>, has not been successfully broadcast yet</source>
<translation>, вÑе още не е изпратено</translation>
</message>
@@ -2213,7 +2843,7 @@ Address: %4
<context>
<name>TransactionTableModel</name>
<message>
- <location filename="../transactiontablemodel.cpp" line="+227"/>
+ <location filename="../transactiontablemodel.cpp" line="+234"/>
<source>Date</source>
<translation>Дата</translation>
</message>
@@ -2232,8 +2862,13 @@ Address: %4
<source>Amount</source>
<translation>Сума</translation>
</message>
+ <message>
+ <location line="+59"/>
+ <source>Immature (%1 confirmations, will be available after %2)</source>
+ <translation type="unfinished"/>
+ </message>
<message numerus="yes">
- <location line="+57"/>
+ <location line="+16"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -2253,17 +2888,13 @@ Address: %4
<translation>Ðепотвърдени (%1 от %2 потвърждениÑ)</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="-22"/>
+ <location line="+25"/>
<source>Confirmed (%1 confirmations)</source>
<translation>Потвърдени (%1 потвърждениÑ)</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></translation>
- </message>
<message>
- <location line="+5"/>
+ <location line="-22"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation>Блокът не е получен от оÑтаналите учаÑтници и най-вероÑтно нÑма да бъде одобрен.</translation>
</message>
@@ -2273,7 +2904,7 @@ Address: %4
<translation>Генерирана, но отхвърлена от мрежата</translation>
</message>
<message>
- <location line="+43"/>
+ <location line="+62"/>
<source>Received with</source>
<translation>Получени Ñ</translation>
</message>
@@ -2331,7 +2962,7 @@ Address: %4
<context>
<name>TransactionView</name>
<message>
- <location filename="../transactionview.cpp" line="+52"/>
+ <location filename="../transactionview.cpp" line="+57"/>
<location line="+16"/>
<source>All</source>
<translation>Ð’Ñички</translation>
@@ -2392,12 +3023,12 @@ Address: %4
<translation>Други</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+6"/>
<source>Enter address or label to search</source>
<translation>ТърÑене по Ð°Ð´Ñ€ÐµÑ Ð¸Ð»Ð¸ име</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+6"/>
<source>Min amount</source>
<translation>Минимална Ñума</translation>
</message>
@@ -2432,17 +3063,37 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+143"/>
- <source>Export Transaction Data</source>
+ <location line="+142"/>
+ <source>Export Transaction History</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="+19"/>
+ <source>Exporting Failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>There was an error trying to save the transaction history to %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Exporting Successful</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The transaction history was successfully saved to %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-22"/>
<source>Comma separated file (*.csv)</source>
<translation>CSV файл (*.csv)</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+9"/>
<source>Confirmed</source>
<translation>Потвърдени</translation>
</message>
@@ -2474,20 +3125,10 @@ Address: %4
<message>
<location line="+1"/>
<source>ID</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+4"/>
- <source>Error exporting</source>
- <translation>Грешка при запиÑа</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation>ÐеуÑпешен Ð·Ð°Ð¿Ð¸Ñ Ð² %1.</translation>
+ <translation>ИД</translation>
</message>
<message>
- <location line="+100"/>
+ <location line="+107"/>
<source>Range:</source>
<translation>От:</translation>
</message>
@@ -2498,9 +3139,17 @@ Address: %4
</message>
</context>
<context>
+ <name>WalletFrame</name>
+ <message>
+ <location filename="../walletframe.cpp" line="+26"/>
+ <source>No wallet has been loaded.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>WalletModel</name>
<message>
- <location filename="../walletmodel.cpp" line="+218"/>
+ <location filename="../walletmodel.cpp" line="+245"/>
<source>Send Coins</source>
<translation>Изпращане</translation>
</message>
@@ -2508,7 +3157,7 @@ Address: %4
<context>
<name>WalletView</name>
<message>
- <location filename="../walletview.cpp" line="+46"/>
+ <location filename="../walletview.cpp" line="+43"/>
<source>&amp;Export</source>
<translation type="unfinished"/>
</message>
@@ -2518,65 +3167,60 @@ Address: %4
<translation>Запишете данните от Ñ‚ÐµÐºÑƒÑ‰Ð¸Ñ Ñ€Ð°Ð·Ð´ÐµÐ» във файл</translation>
</message>
<message>
- <location line="+183"/>
+ <location line="+181"/>
<source>Backup Wallet</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
+ <location line="+1"/>
<source>Wallet Data (*.dat)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
+ <location line="+6"/>
<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>
+ <source>There was an error trying to save the wallet data to %1.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+4"/>
- <source>Backup Successful</source>
+ <source>The wallet data was successfully saved to %1.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+0"/>
- <source>The wallet data was successfully saved to the new location.</source>
+ <source>Backup Successful</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+102"/>
- <source>Bitcoin version</source>
- <translation>Биткоин верÑиÑ</translation>
- </message>
- <message>
- <location line="+107"/>
+ <location filename="../bitcoinstrings.cpp" line="+221"/>
<source>Usage:</source>
- <translation type="unfinished"/>
+ <translation>Използване:</translation>
</message>
<message>
- <location line="-55"/>
+ <location line="-54"/>
<source>List commands</source>
<translation>ВпиÑване на команди</translation>
</message>
<message>
- <location line="-13"/>
+ <location line="-14"/>
<source>Get help for a command</source>
<translation>Получете помощ за команда</translation>
</message>
<message>
- <location line="+25"/>
+ <location line="+26"/>
<source>Options:</source>
<translation>Опции:</translation>
</message>
<message>
- <location line="+24"/>
+ <location line="+22"/>
<source>Specify configuration file (default: bitcoin.conf)</source>
<translation type="unfinished"/>
</message>
@@ -2596,7 +3240,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-28"/>
+ <location line="-26"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
<translation type="unfinished"/>
</message>
@@ -2606,7 +3250,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-49"/>
+ <location line="-51"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation type="unfinished"/>
</message>
@@ -2616,37 +3260,37 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation>Праг на прекъÑване на връзката при непорÑдъчно държащи Ñе пиъри (по подразбиране:100)</translation>
</message>
<message>
- <location line="-142"/>
+ <location line="-148"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation>Брой Ñекунди до възтановÑване на връзката за зле държащите Ñе пиъри (по подразбиране:86400)</translation>
</message>
<message>
- <location line="-33"/>
+ <location line="-36"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+40"/>
+ <location line="+45"/>
<source>Accept command line and JSON-RPC commands</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<source>Run in the background as a daemon and accept commands</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+40"/>
+ <location line="+39"/>
<source>Use the test network</source>
<translation>Използвайте теÑтовата мрежа</translation>
</message>
@@ -2656,7 +3300,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-87"/>
+ <location line="-95"/>
<source>%s, you must set a rpcpassword in the configuration file:
%s
It is recommended you use the following random password:
@@ -2697,6 +3341,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+4"/>
+ <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</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>
@@ -2711,17 +3360,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+11"/>
- <source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source>
+ <location line="+18"/>
+ <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="+6"/>
- <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
+ <location line="+5"/>
+ <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+3"/>
<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>
@@ -2751,17 +3400,27 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
+ <location line="+9"/>
+ <source>&lt;category&gt; can be:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
<source>Attempt to recover private keys from a corrupt wallet.dat</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
+ <source>Bitcoin Core Daemon</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Bitcoin RPC client version</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
<source>Block creation options:</source>
<translation type="unfinished"/>
</message>
@@ -2771,7 +3430,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
+ <source>Connect through SOCKS proxy</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect to JSON-RPC on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation type="unfinished"/>
</message>
@@ -2787,6 +3451,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+1"/>
+ <source>Do not load the wallet and disable wallet RPC calls</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Do you want to rebuild the block database now?</source>
<translation type="unfinished"/>
</message>
@@ -2881,7 +3550,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
+ <source>Fee per kB to add to transactions you send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Find peers using DNS lookup (default: 1 unless -connect)</source>
<translation type="unfinished"/>
</message>
@@ -2901,6 +3575,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
+ <location line="+1"/>
+ <source>If &lt;category&gt; is not supplied, output all debugging information.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+2"/>
<source>Incorrect or no genesis block found. Wrong datadir for network?</source>
<translation type="unfinished"/>
@@ -2916,17 +3595,37 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+8"/>
+ <location line="+5"/>
+ <source>Prepend debug output with timestamp (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>RPC client options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Rebuild block chain index from current blk000??.dat files</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+5"/>
+ <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Send command to Bitcoin server</source>
+ <translation>Изпращане на команда до Биткойн Ñървъра</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Set maximum block size in bytes (default: %d)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
+ <location line="+2"/>
<source>Set the number of threads to service RPC calls (default: 4)</source>
<translation type="unfinished"/>
</message>
@@ -2938,15 +3637,20 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<message>
<location line="+2"/>
<source>Start Bitcoin server</source>
+ <translation>Включи Биткойн Ñървър</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>This is intended for regression testing tools and app development.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+12"/>
+ <location line="+10"/>
<source>Usage (deprecated, use bitcoin-cli):</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+8"/>
+ <location line="+7"/>
<source>Verifying blocks...</source>
<translation type="unfinished"/>
</message>
@@ -2957,31 +3661,56 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+1"/>
+ <source>Wait for RPC server to start</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Wallet %s resides outside data directory %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+2"/>
+ <source>Wallet options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>You need to rebuild the database using -reindex to change -txindex</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-78"/>
+ <location line="-79"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-98"/>
+ <location line="-105"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+17"/>
+ <location line="+14"/>
+ <source>Output debugging information (default: 0, supplying &lt;category&gt; is optional)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+83"/>
+ <location line="+89"/>
<source>Information</source>
<translation type="unfinished"/>
</message>
@@ -3021,47 +3750,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<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"/>
+ <location line="+9"/>
<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"/>
+ <location line="+4"/>
<source>Send trace/debug info to console instead of debug.log file</source>
<translation>Изпрати локализиращата или дебъг информациÑта към конзолата, вмеÑто файлът debug.log</translation>
</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"/>
+ <location line="+6"/>
<source>Set minimum block size in bytes (default: 0)</source>
<translation type="unfinished"/>
</message>
@@ -3086,7 +3785,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Transaction amount too small</source>
<translation type="unfinished"/>
</message>
@@ -3111,32 +3810,32 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<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 връзките</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+7"/>
<source>Warning</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Warning: This version is obsolete, upgrade required!</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+2"/>
+ <source>version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>wallet.dat corrupt, salvage failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-54"/>
+ <location line="-58"/>
<source>Password for JSON-RPC connections</source>
<translation>Парола за JSON-RPC връзките</translation>
</message>
@@ -3146,27 +3845,27 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Разреши JSON-RPC връзките от отучнен IP адреÑ</translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<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="-126"/>
+ <location line="-132"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+155"/>
+ <location line="+161"/>
<source>Upgrade wallet to latest format</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-12"/>
+ <location line="-11"/>
<source>Rescan the block chain for missing wallet transactions</source>
<translation>Повторно Ñканиране на блок-връзка за липÑващи портефейлни транзакции</translation>
</message>
@@ -3176,7 +3875,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Използвайте OpenSSL (https) за JSON-RPC връзките</translation>
</message>
<message>
- <location line="-29"/>
+ <location line="-30"/>
<source>Server certificate file (default: server.cert)</source>
<translation>Сертификатен файл на Ñървъра (По подразбиране:server.cert)</translation>
</message>
@@ -3191,27 +3890,22 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Това помощно Ñъобщение</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Unable to bind to %s on this computer (bind returned error %d, %s)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-95"/>
- <source>Connect through socks proxy</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="-11"/>
+ <location line="-107"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+58"/>
+ <location line="+60"/>
<source>Loading addresses...</source>
<translation>Зареждане на адреÑите...</translation>
</message>
<message>
- <location line="-36"/>
+ <location line="-37"/>
<source>Error loading wallet.dat: Wallet corrupted</source>
<translation type="unfinished"/>
</message>
@@ -3231,12 +3925,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+30"/>
+ <location line="+31"/>
<source>Invalid -proxy address: &apos;%s&apos;</source>
<translation>Ðевалиден -proxy address: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+57"/>
+ <location line="+56"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3246,7 +3940,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3256,7 +3950,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+46"/>
+ <location line="+48"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3276,27 +3970,22 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Зареждане на блок индекÑа...</translation>
</message>
<message>
- <location line="-60"/>
+ <location line="-62"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-28"/>
+ <location line="-32"/>
<source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+69"/>
- <source>Fee per KB to add to transactions you send</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+20"/>
+ <location line="+95"/>
<source>Loading wallet...</source>
<translation>Зареждане на портфейла...</translation>
</message>
<message>
- <location line="-54"/>
+ <location line="-56"/>
<source>Cannot downgrade wallet</source>
<translation type="unfinished"/>
</message>
@@ -3306,7 +3995,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+66"/>
+ <location line="+67"/>
<source>Rescanning...</source>
<translation>Преразглеждане на поÑледовтелноÑтта от блокове...</translation>
</message>
@@ -3326,7 +4015,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Грешка</translation>
</message>
<message>
- <location line="-33"/>
+ <location line="-35"/>
<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
index 6b849e23ea..768d874fc5 100644
--- a/src/qt/locale/bitcoin_bs.ts
+++ b/src/qt/locale/bitcoin_bs.ts
@@ -22,13 +22,13 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location filename="../aboutdialog.cpp" line="+19"/>
+ <location filename="../utilitydialog.cpp" line="+29"/>
<source>Copyright</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+0"/>
- <source>The Bitcoin developers</source>
+ <source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
</context>
@@ -146,12 +146,12 @@ This product includes software developed by the OpenSSL Project for use in the O
</message>
<message>
<location line="+13"/>
- <source>Error exporting</source>
+ <source>Exporting Failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
+ <location line="+1"/>
+ <source>There was an error trying to save the address list to %1.</source>
<translation type="unfinished"/>
</message>
</context>
@@ -317,22 +317,27 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+260"/>
+ <location filename="../bitcoingui.cpp" line="+295"/>
<source>Sign &amp;message...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+290"/>
+ <location line="+335"/>
<source>Synchronizing with network...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-360"/>
+ <location line="-407"/>
<source>&amp;Overview</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="-137"/>
+ <source>Node</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+138"/>
<source>Show general overview of wallet</source>
<translation type="unfinished"/>
</message>
@@ -347,7 +352,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>E&amp;xit</source>
<translation type="unfinished"/>
</message>
@@ -393,7 +398,22 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+295"/>
+ <location line="+10"/>
+ <source>&amp;Sending addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Receiving addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open &amp;URI...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+325"/>
<source>Importing blocks from disk...</source>
<translation type="unfinished"/>
</message>
@@ -403,12 +423,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="-358"/>
+ <location line="-405"/>
<source>Send coins to a Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+47"/>
+ <location line="+49"/>
<source>Modify configuration options for Bitcoin</source>
<translation type="unfinished"/>
</message>
@@ -438,18 +458,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+375"/>
+ <location line="+430"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-563"/>
- <location line="+10"/>
+ <location line="-643"/>
<source>Wallet</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+113"/>
+ <location line="+146"/>
<source>&amp;Send</source>
<translation type="unfinished"/>
</message>
@@ -459,7 +478,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+44"/>
+ <location line="+46"/>
<location line="+2"/>
<source>&amp;Show / Hide</source>
<translation type="unfinished"/>
@@ -485,86 +504,80 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+39"/>
+ <location line="+48"/>
<source>&amp;File</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+11"/>
+ <location line="+14"/>
<source>&amp;Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>&amp;Help</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+9"/>
+ <location line="+15"/>
<source>Tabs toolbar</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-244"/>
- <location line="+321"/>
+ <location line="-284"/>
+ <location line="+376"/>
<source>[testnet]</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-331"/>
- <location line="+10"/>
+ <location line="-401"/>
<source>Bitcoin Core</source>
<translation>Bitcoin Jezrga</translation>
</message>
<message>
- <location line="+121"/>
+ <location line="+163"/>
<source>Request payments (generates QR codes and bitcoin: URIs)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+27"/>
+ <location line="+29"/>
<location line="+2"/>
<source>&amp;About Bitcoin Core</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+34"/>
- <source>&amp;Used sending addresses...</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+35"/>
<source>Show the list of used sending addresses and labels</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Used &amp;receiving addresses...</source>
+ <location line="+2"/>
+ <source>Show the list of used receiving addresses and labels</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Show the list of used receiving addresses and labels</source>
+ <location line="+3"/>
+ <source>Open a bitcoin: URI or payment request</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+2"/>
- <source>Open URI...</source>
+ <source>&amp;Command-line options</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
- <source>Open a bitcoin: URI or payment request</source>
+ <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+126"/>
+ <location line="+159"/>
<location line="+5"/>
<source>Bitcoin client</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+133"/>
+ <location line="+142"/>
<source>%n active connection(s) to Bitcoin network</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -584,7 +597,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+20"/>
+ <location line="+23"/>
<source>%n hour(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -604,7 +617,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
+ <location line="+21"/>
<source>Last received block was generated %1 ago.</source>
<translation type="unfinished"/>
</message>
@@ -629,27 +642,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+77"/>
- <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="-152"/>
+ <location line="-85"/>
<source>Up to date</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Catching up...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+124"/>
- <source>Confirm transaction fee</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+130"/>
<source>Sent transaction</source>
<translation type="unfinished"/>
</message>
@@ -668,7 +671,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+67"/>
+ <location line="+69"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation type="unfinished"/>
</message>
@@ -678,7 +681,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+116"/>
+ <location filename="../bitcoin.cpp" line="+438"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation type="unfinished"/>
</message>
@@ -900,7 +903,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+171"/>
+ <location line="+31"/>
+ <source>none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+140"/>
<source>Dust</source>
<translation type="unfinished"/>
</message>
@@ -937,7 +945,7 @@ Address: %4
</message>
<message>
<location line="+1"/>
- <source>This label turns red, if the priority is smaller than &quot;medium&quot;</source>
+ <source>This label turns red, if the priority is smaller than &quot;medium&quot;.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1006,7 +1014,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+25"/>
+ <location filename="../editaddressdialog.cpp" line="+28"/>
<source>New receiving address</source>
<translation type="unfinished"/>
</message>
@@ -1075,20 +1083,24 @@ Address: %4
</message>
</context>
<context>
- <name>GUIUtil::HelpMessageBox</name>
+ <name>HelpMessageDialog</name>
<message>
- <location filename="../guiutil.cpp" line="+597"/>
- <source>version</source>
+ <location filename="../forms/helpmessagedialog.ui" line="+19"/>
+ <source>Bitcoin Core - Command-line options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <location line="+13"/>
+ <location filename="../utilitydialog.cpp" line="+38"/>
<source>Bitcoin Core</source>
<translation>Bitcoin Jezrga</translation>
</message>
<message>
- <location line="-11"/>
+ <location line="+0"/>
+ <source>version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Usage:</source>
<translation type="unfinished"/>
</message>
@@ -1217,7 +1229,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+13"/>
<source>&amp;Main</source>
<translation type="unfinished"/>
</message>
@@ -1242,57 +1254,87 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+35"/>
- <source>Reset all client options to default.</source>
+ <location line="+9"/>
+ <source>Size of &amp;database cache</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>&amp;Reset Options</source>
+ <location line="+13"/>
+ <source>Set database cache size in megabytes (default: 25)</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+13"/>
- <source>&amp;Network</source>
+ <source>MB</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>
+ <location line="+27"/>
+ <source>Number of script &amp;verification threads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Connect to the Bitcoin network through a SOCKS proxy.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
- <source>Map port using &amp;UPnP</source>
+ <source>&amp;Connect through SOCKS proxy (default proxy):</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>
+ <location line="+34"/>
+ <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+224"/>
+ <source>Active command-line options that override above options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
+ <source>Reset all client options to default.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
- <source>&amp;Connect through SOCKS proxy:</source>
+ <source>&amp;Reset Options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+9"/>
- <source>Proxy &amp;IP:</source>
+ <location line="-323"/>
+ <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="+19"/>
- <source>IP address of the proxy (e.g. 127.0.0.1)</source>
+ <source>Proxy &amp;IP:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="+32"/>
<source>&amp;Port:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+19"/>
+ <location line="+25"/>
<source>Port of the proxy (e.g. 9050)</source>
<translation type="unfinished"/>
</message>
@@ -1377,7 +1419,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+71"/>
+ <location line="+136"/>
<source>&amp;OK</source>
<translation type="unfinished"/>
</message>
@@ -1387,44 +1429,38 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>&amp;Apply</source>
+ <location filename="../optionsdialog.cpp" line="+67"/>
+ <source>default</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+63"/>
- <source>default</source>
+ <location line="+57"/>
+ <source>none</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+131"/>
+ <location line="+75"/>
<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>
+ <location line="+29"/>
+ <source>Client restart required to activate changes.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
- <location line="+9"/>
- <source>Warning</source>
+ <location line="-29"/>
+ <source>Client will be shutdown, do you want to proceed?</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-9"/>
- <location line="+9"/>
- <source>This setting will take effect after restarting Bitcoin.</source>
+ <location line="+33"/>
+ <source>This change would require a client restart.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+29"/>
+ <location line="+34"/>
<source>The supplied proxy address is invalid.</source>
<translation type="unfinished"/>
</message>
@@ -1438,22 +1474,22 @@ Address: %4
</message>
<message>
<location line="+50"/>
- <location line="+214"/>
+ <location line="+231"/>
<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="-140"/>
+ <location line="-155"/>
<source>Unconfirmed:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-81"/>
+ <location line="-83"/>
<source>Wallet</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+49"/>
+ <location line="+51"/>
<source>Confirmed:</source>
<translation type="unfinished"/>
</message>
@@ -1488,7 +1524,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+56"/>
+ <location line="+71"/>
<source>&lt;b&gt;Recent transactions&lt;/b&gt;</source>
<translation type="unfinished"/>
</message>
@@ -1502,7 +1538,8 @@ Address: %4
<context>
<name>PaymentServer</name>
<message>
- <location filename="../paymentserver.cpp" line="+397"/>
+ <location filename="../paymentserver.cpp" line="+403"/>
+ <location line="+13"/>
<source>URI handling</source>
<translation type="unfinished"/>
</message>
@@ -1512,24 +1549,52 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+91"/>
+ <location line="+96"/>
<source>Requested payment amount of %1 is too small (considered dust).</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-204"/>
- <location line="+195"/>
+ <location line="-221"/>
+ <location line="+212"/>
<location line="+13"/>
+ <location line="+95"/>
+ <location line="+18"/>
+ <location line="+16"/>
<source>Payment request error</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-207"/>
+ <location line="-353"/>
<source>Cannot start bitcoin: click-to-pay handler</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+195"/>
+ <location line="+58"/>
+ <source>Net manager warning</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Your active proxy doesn&apos;t support SOCKS5, which is required for payment requests via proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>Payment request fetch URL is invalid: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Payment request file handling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Payment request file can not be read or processed! This can be caused by an invalid payment request file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+73"/>
<source>Unverified payment requests to custom payment scripts are unsupported.</source>
<translation type="unfinished"/>
</message>
@@ -1539,24 +1604,27 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
+ <location line="+43"/>
<source>Error communicating with %1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+28"/>
+ <location line="+24"/>
+ <source>Payment request can not be parsed or processed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
<source>Bad response from server %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+32"/>
+ <location line="+33"/>
<source>Payment acknowledged</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-55"/>
- <location line="+27"/>
- <location line="+17"/>
+ <location line="-11"/>
<source>Network request error</source>
<translation type="unfinished"/>
</message>
@@ -1564,18 +1632,18 @@ Address: %4
<context>
<name>QObject</name>
<message>
- <location filename="../bitcoin.cpp" line="+119"/>
- <location line="+5"/>
+ <location filename="../bitcoin.cpp" line="+71"/>
+ <location line="+11"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-4"/>
+ <location line="+1"/>
<source>Error: Specified data directory &quot;%1&quot; does not exist.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="-12"/>
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation type="unfinished"/>
</message>
@@ -1617,15 +1685,16 @@ Address: %4
<location line="+23"/>
<location line="+23"/>
<location line="+36"/>
- <location line="+53"/>
<location line="+23"/>
+ <location line="+36"/>
<location line="+23"/>
- <location filename="../rpcconsole.cpp" line="+360"/>
+ <location line="+23"/>
+ <location filename="../rpcconsole.cpp" line="+359"/>
<source>N/A</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-217"/>
+ <location line="-223"/>
<source>Client version</source>
<translation type="unfinished"/>
</message>
@@ -1640,7 +1709,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+78"/>
+ <location line="+25"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+53"/>
<source>Using OpenSSL version</source>
<translation type="unfinished"/>
</message>
@@ -1656,16 +1730,16 @@ Address: %4
</message>
<message>
<location line="+7"/>
- <source>Number of connections</source>
+ <source>Name</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+23"/>
- <source>On testnet</source>
+ <source>Number of connections</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+23"/>
+ <location line="+29"/>
<source>Block chain</source>
<translation type="unfinished"/>
</message>
@@ -1690,16 +1764,6 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
- <source>Command-line options</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+10"/>
- <source>&amp;Show</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location line="+24"/>
<source>&amp;Console</source>
<translation type="unfinished"/>
@@ -1730,17 +1794,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-541"/>
+ <location line="-521"/>
<source>Build date</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-79"/>
- <source>Bitcoin Core</source>
- <translation>Bitcoin Jezrga</translation>
- </message>
- <message>
- <location line="+279"/>
+ <location line="+206"/>
<source>Debug log file</source>
<translation type="unfinished"/>
</message>
@@ -1750,11 +1809,6 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+26"/>
- <source>Show the Bitcoin-Core help message to get a list with possible Bitcoin command-line options.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location line="+76"/>
<source>Clear console</source>
<translation type="unfinished"/>
@@ -1775,7 +1829,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+128"/>
+ <location line="+122"/>
<source>%1 B</source>
<translation type="unfinished"/>
</message>
@@ -1818,12 +1872,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+19"/>
- <source>The amount to request</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="-32"/>
+ <location line="-13"/>
<source>&amp;Label:</source>
<translation type="unfinished"/>
</message>
@@ -1833,12 +1882,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+20"/>
- <source>The message to attach to payment request</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="-37"/>
+ <location line="-17"/>
<source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
@@ -1849,16 +1893,26 @@ Address: %4
</message>
<message>
<location line="+27"/>
- <source>The label to associate with the new receiving address</source>
+ <source>An optional label to associate with the new receiving address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
- <source>Use this form to request payments. All fields are optional.</source>
+ <location line="+7"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+56"/>
+ <location line="+7"/>
+ <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+39"/>
+ <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+17"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"/>
</message>
@@ -1874,11 +1928,11 @@ Address: %4
</message>
<message>
<location line="+47"/>
- <source>Previously requested payments</source>
+ <source>Requested payments</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+12"/>
+ <location line="+16"/>
<source>Show the selected request (does the same as double clicking an entry)</source>
<translation type="unfinished"/>
</message>
@@ -1969,7 +2023,7 @@ Address: %4
<context>
<name>RecentRequestsTableModel</name>
<message>
- <location filename="../recentrequeststablemodel.cpp" line="+14"/>
+ <location filename="../recentrequeststablemodel.cpp" line="+24"/>
<source>Date</source>
<translation type="unfinished"/>
</message>
@@ -1989,7 +2043,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+36"/>
+ <location line="+38"/>
<source>(no label)</source>
<translation type="unfinished"/>
</message>
@@ -2004,7 +2058,7 @@ Address: %4
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
<location filename="../sendcoinsdialog.cpp" line="+381"/>
- <location line="+81"/>
+ <location line="+80"/>
<source>Send Coins</source>
<translation type="unfinished"/>
</message>
@@ -2114,7 +2168,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-229"/>
+ <location filename="../sendcoinsdialog.cpp" line="-228"/>
<source>Confirm send coins</source>
<translation type="unfinished"/>
</message>
@@ -2217,22 +2271,22 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+113"/>
+ <location line="+112"/>
<source>Warning: Invalid Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+21"/>
<source>(no label)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+8"/>
+ <location line="-11"/>
<source>Warning: Unknown change address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-378"/>
+ <location line="-366"/>
<source>Are you sure you want to send?</source>
<translation type="unfinished"/>
</message>
@@ -2256,13 +2310,13 @@ Address: %4
<name>SendCoinsEntry</name>
<message>
<location filename="../forms/sendcoinsentry.ui" line="+131"/>
- <location line="+501"/>
+ <location line="+521"/>
<location line="+536"/>
<source>A&amp;mount:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-1132"/>
+ <location line="-1152"/>
<source>Pay &amp;To:</source>
<translation type="unfinished"/>
</message>
@@ -2308,23 +2362,33 @@ Address: %4
</message>
<message>
<location line="+7"/>
- <location line="+504"/>
+ <location line="+524"/>
<location line="+536"/>
<source>Remove this entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-40"/>
+ <location line="-1008"/>
+ <source>Message:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+958"/>
<source>This is a verified payment request.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-971"/>
+ <location line="-991"/>
<source>Enter a label for this address to add it to the list of used addresses</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+439"/>
+ <location line="+459"/>
<source>This is an unverified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2347,6 +2411,19 @@ Address: %4
</message>
</context>
<context>
+ <name>ShutdownWindow</name>
+ <message>
+ <location filename="../utilitydialog.cpp" line="+48"/>
+ <source>Bitcoin Core is shutting down...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Do not shut down the computer until this window disappears.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>SignVerifyMessageDialog</name>
<message>
<location filename="../forms/signverifymessagedialog.ui" line="+14"/>
@@ -2354,7 +2431,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+10"/>
<source>&amp;Sign Message</source>
<translation type="unfinished"/>
</message>
@@ -2542,7 +2619,7 @@ Address: %4
<context>
<name>SplashScreen</name>
<message>
- <location filename="../splashscreen.cpp" line="+26"/>
+ <location filename="../splashscreen.cpp" line="+28"/>
<source>Bitcoin Core</source>
<translation>Bitcoin Jezrga</translation>
</message>
@@ -2641,12 +2718,12 @@ Address: %4
<location line="+12"/>
<location line="+45"/>
<location line="+17"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Credit</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="-120"/>
+ <location line="-125"/>
<source>matures in %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -2659,12 +2736,12 @@ Address: %4
<location line="+44"/>
<location line="+8"/>
<location line="+15"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Debit</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-57"/>
+ <location line="-62"/>
<source>Transaction fee</source>
<translation type="unfinished"/>
</message>
@@ -2675,11 +2752,12 @@ Address: %4
</message>
<message>
<location line="+6"/>
+ <location line="+9"/>
<source>Message</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="-7"/>
<source>Comment</source>
<translation type="unfinished"/>
</message>
@@ -2689,7 +2767,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+18"/>
<source>Merchant</source>
<translation type="unfinished"/>
</message>
@@ -2729,7 +2807,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-227"/>
+ <location line="-232"/>
<source>, has not been successfully broadcast yet</source>
<translation type="unfinished"/>
</message>
@@ -2779,8 +2857,13 @@ Address: %4
<source>Amount</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+59"/>
+ <source>Immature (%1 confirmations, will be available after %2)</source>
+ <translation type="unfinished"/>
+ </message>
<message numerus="yes">
- <location line="+57"/>
+ <location line="+16"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -2800,17 +2883,13 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
+ <location line="-22"/>
+ <location line="+25"/>
<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"/>
+ <location line="-22"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation type="unfinished"/>
</message>
@@ -2820,7 +2899,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+43"/>
+ <location line="+62"/>
<source>Received with</source>
<translation type="unfinished"/>
</message>
@@ -3116,7 +3195,7 @@ Address: %4
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+217"/>
+ <location filename="../bitcoinstrings.cpp" line="+221"/>
<source>Usage:</source>
<translation type="unfinished"/>
</message>
@@ -3136,7 +3215,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+23"/>
+ <location line="+22"/>
<source>Specify configuration file (default: bitcoin.conf)</source>
<translation type="unfinished"/>
</message>
@@ -3156,7 +3235,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-27"/>
+ <location line="-26"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
<translation type="unfinished"/>
</message>
@@ -3166,7 +3245,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-50"/>
+ <location line="-51"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation type="unfinished"/>
</message>
@@ -3176,22 +3255,22 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-147"/>
+ <location line="-148"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-33"/>
+ <location line="-36"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation type="unfinished"/>
</message>
@@ -3201,7 +3280,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<source>Run in the background as a daemon and accept commands</source>
<translation type="unfinished"/>
</message>
@@ -3211,12 +3290,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-117"/>
+ <location line="-118"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-92"/>
+ <location line="-95"/>
<source>%s, you must set a rpcpassword in the configuration file:
%s
It is recommended you use the following random password:
@@ -3257,6 +3336,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+4"/>
+ <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</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>
@@ -3362,6 +3446,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+1"/>
+ <source>Do not load the wallet and disable wallet RPC calls</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Do you want to rebuild the block database now?</source>
<translation type="unfinished"/>
</message>
@@ -3526,7 +3615,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+8"/>
+ <location line="+7"/>
<source>Set maximum block size in bytes (default: %d)</source>
<translation type="unfinished"/>
</message>
@@ -3546,7 +3635,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+12"/>
+ <location line="+3"/>
+ <source>This is intended for regression testing tools and app development.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Usage (deprecated, use bitcoin-cli):</source>
<translation type="unfinished"/>
</message>
@@ -3571,7 +3665,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
+ <location line="+2"/>
+ <source>Wallet options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source>
<translation type="unfinished"/>
</message>
@@ -3581,12 +3680,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-78"/>
+ <location line="-79"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-104"/>
+ <location line="-105"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
@@ -3606,7 +3705,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+88"/>
+ <location line="+89"/>
<source>Information</source>
<translation type="unfinished"/>
</message>
@@ -3656,11 +3755,6 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Send trace/debug info to debugger</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location line="+6"/>
<source>Set minimum block size in bytes (default: 0)</source>
<translation type="unfinished"/>
@@ -3686,7 +3780,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Transaction amount too small</source>
<translation type="unfinished"/>
</message>
@@ -3716,7 +3810,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Warning</source>
<translation type="unfinished"/>
</message>
@@ -3736,37 +3830,37 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-57"/>
+ <location line="-58"/>
<source>Password for JSON-RPC connections</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-69"/>
+ <location line="-70"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-131"/>
+ <location line="-132"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+160"/>
+ <location line="+161"/>
<source>Upgrade wallet to latest format</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-12"/>
+ <location line="-11"/>
<source>Rescan the block chain for missing wallet transactions</source>
<translation type="unfinished"/>
</message>
@@ -3776,7 +3870,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-29"/>
+ <location line="-30"/>
<source>Server certificate file (default: server.cert)</source>
<translation type="unfinished"/>
</message>
@@ -3791,17 +3885,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Unable to bind to %s on this computer (bind returned error %d, %s)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-106"/>
+ <location line="-107"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+59"/>
+ <location line="+60"/>
<source>Loading addresses...</source>
<translation type="unfinished"/>
</message>
@@ -3841,7 +3935,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3851,7 +3945,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+47"/>
+ <location line="+48"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3871,7 +3965,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-61"/>
+ <location line="-62"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation type="unfinished"/>
</message>
@@ -3881,12 +3975,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+94"/>
+ <location line="+95"/>
<source>Loading wallet...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-55"/>
+ <location line="-56"/>
<source>Cannot downgrade wallet</source>
<translation type="unfinished"/>
</message>
@@ -3896,7 +3990,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+66"/>
+ <location line="+67"/>
<source>Rescanning...</source>
<translation type="unfinished"/>
</message>
@@ -3916,7 +4010,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-34"/>
+ <location line="-35"/>
<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_ca.ts b/src/qt/locale/bitcoin_ca.ts
index 6198d7d7a0..72a5339cc3 100644
--- a/src/qt/locale/bitcoin_ca.ts
+++ b/src/qt/locale/bitcoin_ca.ts
@@ -3,13 +3,13 @@
<name>AboutDialog</name>
<message>
<location filename="../forms/aboutdialog.ui" line="+14"/>
- <source>About Bitcoin</source>
- <translation>Sobre Bitcoin</translation>
+ <source>About Bitcoin Core</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+39"/>
- <source>&lt;b&gt;Bitcoin&lt;/b&gt; version</source>
- <translation>Versió &lt;b&gt;Bitcoin&lt;/b&gt;</translation>
+ <source>&lt;b&gt;Bitcoin Core&lt;/b&gt; version</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+57"/>
@@ -22,13 +22,13 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location filename="../aboutdialog.cpp" line="+14"/>
+ <location filename="../utilitydialog.cpp" line="+29"/>
<source>Copyright</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+0"/>
- <source>The Bitcoin developers</source>
+ <source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
</context>
@@ -65,7 +65,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location filename="../addressbookpage.cpp" line="+72"/>
+ <location filename="../addressbookpage.cpp" line="+74"/>
<source>&amp;Copy Address</source>
<translation type="unfinished"/>
</message>
@@ -135,7 +135,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+197"/>
+ <location line="+194"/>
<source>Export Address List</source>
<translation type="unfinished"/>
</message>
@@ -146,31 +146,31 @@ This product includes software developed by the OpenSSL Project for use in the O
</message>
<message>
<location line="+13"/>
- <source>Error exporting</source>
- <translation>Error exportant</translation>
+ <source>Exporting Failed</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
+ <location line="+1"/>
+ <source>There was an error trying to save the address list to %1.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>AddressTableModel</name>
<message>
- <location filename="../addresstablemodel.cpp" line="+164"/>
+ <location filename="../addresstablemodel.cpp" line="+168"/>
<source>Label</source>
- <translation type="unfinished"/>
+ <translation>Etiqueta</translation>
</message>
<message>
<location line="+0"/>
<source>Address</source>
- <translation type="unfinished"/>
+ <translation>Adreça</translation>
</message>
<message>
<location line="+36"/>
<source>(no label)</source>
- <translation type="unfinished"/>
+ <translation>(sense etiqueta)</translation>
</message>
</context>
<context>
@@ -183,62 +183,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>Introduïu la frase-contrasenya</translation>
</message>
<message>
<location line="+14"/>
<source>New passphrase</source>
- <translation type="unfinished"/>
+ <translation>Nova frase-contrasenya</translation>
</message>
<message>
<location line="+14"/>
<source>Repeat new passphrase</source>
- <translation type="unfinished"/>
+ <translation>Repetiu la nova frase-contrasenya</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="+34"/>
+ <location filename="../askpassphrasedialog.cpp" line="+40"/>
<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>Introduïu la nova frase-contrasenya per a la cartera.&lt;br/&gt;Empreu una frase-contrasenya de &lt;b&gt;10 o més caràcters aleatoris&lt;b/&gt;, o &lt;b&gt;vuit o més paraules&lt;b/&gt;.</translation>
</message>
<message>
<location line="+1"/>
<source>Encrypt wallet</source>
- <translation type="unfinished"/>
+ <translation>Encriptar cartera</translation>
</message>
<message>
<location line="+3"/>
<source>This operation needs your wallet passphrase to unlock the wallet.</source>
- <translation type="unfinished"/>
+ <translation>Cal que introduïu la frase-contrasenya de la cartera per a desbloquejar-la.</translation>
</message>
<message>
<location line="+5"/>
<source>Unlock wallet</source>
- <translation type="unfinished"/>
+ <translation>Desbloquejar cartera</translation>
</message>
<message>
<location line="+3"/>
<source>This operation needs your wallet passphrase to decrypt the wallet.</source>
- <translation type="unfinished"/>
+ <translation>Cal que introduïu la frase-contrasenya de la cartera per a desencriptar-la.</translation>
</message>
<message>
<location line="+5"/>
<source>Decrypt wallet</source>
- <translation type="unfinished"/>
+ <translation>Desencriptar cartera</translation>
</message>
<message>
<location line="+3"/>
<source>Change passphrase</source>
- <translation type="unfinished"/>
+ <translation>Canviar frase-contrasenya</translation>
</message>
<message>
<location line="+1"/>
<source>Enter the old and new passphrase to the wallet.</source>
- <translation type="unfinished"/>
+ <translation>Introduïu l&apos;antiga i la nova frase-contrasenya per a la cartera.</translation>
</message>
<message>
<location line="+46"/>
<source>Confirm wallet encryption</source>
- <translation type="unfinished"/>
+ <translation>Confirmeu l&apos;encriptació de cartera</translation>
</message>
<message>
<location line="+1"/>
@@ -265,7 +265,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>Cartera encriptada</translation>
</message>
<message>
<location line="-56"/>
@@ -278,35 +278,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>L&apos;encriptació de cartera 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ó de cartera ha fallat degut a un error intern. La vostra cartera no ha estat encriptada.</translation>
</message>
<message>
<location line="+7"/>
<location line="+48"/>
<source>The supplied passphrases do not match.</source>
- <translation type="unfinished"/>
+ <translation>Les frases-contrasenya no concorden.</translation>
</message>
<message>
<location line="-37"/>
<source>Wallet unlock failed</source>
- <translation type="unfinished"/>
+ <translation>El desbloqueig de cartera 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 frase-contrasenya per a la desencriptació de cartera és incorrecta.</translation>
</message>
<message>
<location line="-20"/>
<source>Wallet decryption failed</source>
- <translation type="unfinished"/>
+ <translation>La desencriptació de cartera ha fallat</translation>
</message>
<message>
<location line="+14"/>
@@ -317,49 +317,54 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+250"/>
+ <location filename="../bitcoingui.cpp" line="+295"/>
<source>Sign &amp;message...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+254"/>
+ <location line="+335"/>
<source>Synchronizing with network...</source>
- <translation type="unfinished"/>
+ <translation>Sincronitzant amb la xarxa...</translation>
</message>
<message>
- <location line="-324"/>
+ <location line="-407"/>
<source>&amp;Overview</source>
+ <translation>&amp;Visió general</translation>
+ </message>
+ <message>
+ <location line="-137"/>
+ <source>Node</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="+138"/>
<source>Show general overview of wallet</source>
- <translation type="unfinished"/>
+ <translation>Mostrar visió general de la cartera</translation>
</message>
<message>
<location line="+20"/>
<source>&amp;Transactions</source>
- <translation type="unfinished"/>
+ <translation>&amp;Transaccions</translation>
</message>
<message>
<location line="+1"/>
<source>Browse transaction history</source>
- <translation type="unfinished"/>
+ <translation>Exploreu l&apos;historial de transaccions</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>E&amp;xit</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
<source>Quit application</source>
- <translation type="unfinished"/>
+ <translation>Sortir de l&apos;aplicació</translation>
</message>
<message>
<location line="+7"/>
<source>Show information about Bitcoin</source>
- <translation type="unfinished"/>
+ <translation>Informació sobre Bitcoin</translation>
</message>
<message>
<location line="+3"/>
@@ -375,7 +380,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;Opcions...</translation>
</message>
<message>
<location line="+9"/>
@@ -393,7 +398,22 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+259"/>
+ <location line="+10"/>
+ <source>&amp;Sending addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Receiving addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open &amp;URI...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+325"/>
<source>Importing blocks from disk...</source>
<translation type="unfinished"/>
</message>
@@ -403,12 +423,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="-322"/>
+ <location line="-405"/>
<source>Send coins to a Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+47"/>
+ <location line="+49"/>
<source>Modify configuration options for Bitcoin</source>
<translation type="unfinished"/>
</message>
@@ -420,7 +440,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>Canviar frase-contrasenya per a l&apos;escriptació de la cartera</translation>
</message>
<message>
<location line="+6"/>
@@ -438,20 +458,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="-180"/>
- <location line="+6"/>
- <location line="+513"/>
+ <location line="+430"/>
<source>Bitcoin</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-519"/>
- <location line="+6"/>
+ <location line="-643"/>
<source>Wallet</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+109"/>
+ <location line="+146"/>
<source>&amp;Send</source>
<translation type="unfinished"/>
</message>
@@ -461,13 +478,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+28"/>
- <location line="+2"/>
- <source>&amp;About Bitcoin</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+14"/>
+ <location line="+46"/>
<location line="+2"/>
<source>&amp;Show / Hide</source>
<translation type="unfinished"/>
@@ -493,64 +504,80 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+35"/>
+ <location line="+48"/>
<source>&amp;File</source>
- <translation type="unfinished"/>
+ <translation>&amp;Fitxer</translation>
</message>
<message>
- <location line="+10"/>
+ <location line="+14"/>
<source>&amp;Settings</source>
- <translation type="unfinished"/>
+ <translation>&amp;Configuració</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>&amp;Help</source>
- <translation type="unfinished"/>
+ <translation>&amp;Ajuda</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+15"/>
<source>Tabs toolbar</source>
- <translation type="unfinished"/>
+ <translation>Barra d&apos;eines</translation>
</message>
<message>
- <location line="-235"/>
- <location line="+294"/>
+ <location line="-284"/>
+ <location line="+376"/>
<source>[testnet]</source>
+ <translation>[testnet]</translation>
+ </message>
+ <message>
+ <location line="-401"/>
+ <source>Bitcoin Core</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-177"/>
+ <location line="+163"/>
<source>Request payments (generates QR codes and bitcoin: URIs)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+63"/>
- <source>&amp;Used sending addresses...</source>
+ <location line="+29"/>
+ <location line="+2"/>
+ <source>&amp;About Bitcoin Core</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="+35"/>
<source>Show the list of used sending addresses and labels</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Used &amp;receiving addresses...</source>
+ <location line="+2"/>
+ <source>Show the list of used receiving addresses and labels</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open a bitcoin: URI or payment request</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Command-line options</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
- <source>Show the list of used receiving addresses and labels</source>
+ <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+106"/>
+ <location line="+159"/>
<location line="+5"/>
<source>Bitcoin client</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+120"/>
+ <location line="+142"/>
<source>%n active connection(s) to Bitcoin network</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -570,7 +597,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+20"/>
+ <location line="+23"/>
<source>%n hour(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -590,7 +617,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
+ <location line="+21"/>
<source>Last received block was generated %1 ago.</source>
<translation type="unfinished"/>
</message>
@@ -615,34 +642,24 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+77"/>
- <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="-152"/>
+ <location line="-85"/>
<source>Up to date</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Catching up...</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+124"/>
- <source>Confirm transaction fee</source>
- <translation type="unfinished"/>
+ <translation>Actualitzant...</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+130"/>
<source>Sent transaction</source>
- <translation type="unfinished"/>
+ <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"/>
@@ -654,36 +671,318 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
+ <location line="+69"/>
+ <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
+ <translation>La cartera està &lt;b&gt;encriptada&lt;b/&gt; i &lt;b&gt;desbloquejada&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>La cartera està &lt;b&gt;encriptada&lt;b/&gt; i &lt;b&gt;bloquejada&lt;b/&gt;</translation>
+ </message>
+ <message>
+ <location filename="../bitcoin.cpp" line="+438"/>
+ <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="+119"/>
+ <source>Network Alert</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>CoinControlDialog</name>
+ <message>
+ <location filename="../forms/coincontroldialog.ui" line="+14"/>
+ <source>Coin Control Address Selection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+34"/>
- <source>URI handling</source>
+ <source>Quantity:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
+ <location line="+29"/>
+ <source>Bytes:</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+45"/>
- <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
+ <source>Amount:</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>
+ <location line="+29"/>
+ <source>Priority:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+110"/>
- <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
+ <location line="+45"/>
+ <source>Fee:</source>
<translation type="unfinished"/>
</message>
-</context>
-<context>
- <name>ClientModel</name>
<message>
- <location filename="../clientmodel.cpp" line="+115"/>
- <source>Network Alert</source>
+ <location line="+32"/>
+ <source>Low Output:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>After Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Change:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+63"/>
+ <source>(un)select all</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Tree mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>List mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>Amount</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Address</source>
+ <translation>Adreça</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Date</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Confirmations</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Confirmed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../coincontroldialog.cpp" line="+42"/>
+ <source>Copy address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy label</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+26"/>
+ <source>Copy amount</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-25"/>
+ <source>Copy transaction ID</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Lock unspent</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Unlock unspent</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+22"/>
+ <source>Copy quantity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Copy fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy after fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy bytes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy low output</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy change</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+323"/>
+ <source>highest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>higher</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>high</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>medium-high</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>medium</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>low-medium</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>low</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>lower</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>lowest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>(%1 locked)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+140"/>
+ <source>Dust</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>yes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>no</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>This label turns red, if the transaction size is greater than 1000 bytes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+5"/>
+ <source>This means a fee of at least %1 per kB is required.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-4"/>
+ <source>Can vary +/- 1 byte per input.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Transactions with higher priority are more likely to get included into a block.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>This label turns red, if the priority is smaller than &quot;medium&quot;.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>This label turns red, if any recipient receives an amount smaller than %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+4"/>
+ <source>This means a fee of at least %1 is required.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-3"/>
+ <source>Amounts below 0.546 times the minimum relay fee are shown as dust.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>This label turns red, if the change is smaller than %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
+ <location line="+66"/>
+ <source>(no label)</source>
+ <translation>(sense etiqueta)</translation>
+ </message>
+ <message>
+ <location line="-9"/>
+ <source>change from %1 (%2)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>(change)</source>
<translation type="unfinished"/>
</message>
</context>
@@ -692,12 +991,12 @@ Address: %4
<message>
<location filename="../forms/editaddressdialog.ui" line="+14"/>
<source>Edit Address</source>
- <translation type="unfinished"/>
+ <translation>Editar adreça</translation>
</message>
<message>
<location line="+11"/>
<source>&amp;Label</source>
- <translation type="unfinished"/>
+ <translation>&amp;Etiqueta</translation>
</message>
<message>
<location line="+10"/>
@@ -712,10 +1011,10 @@ Address: %4
<message>
<location line="-10"/>
<source>&amp;Address</source>
- <translation type="unfinished"/>
+ <translation>&amp;Adreça</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+21"/>
+ <location filename="../editaddressdialog.cpp" line="+28"/>
<source>New receiving address</source>
<translation type="unfinished"/>
</message>
@@ -758,7 +1057,7 @@ Address: %4
<context>
<name>FreespaceChecker</name>
<message>
- <location filename="../intro.cpp" line="+61"/>
+ <location filename="../intro.cpp" line="+65"/>
<source>A new data directory will be created.</source>
<translation type="unfinished"/>
</message>
@@ -784,15 +1083,19 @@ Address: %4
</message>
</context>
<context>
- <name>GUIUtil::HelpMessageBox</name>
+ <name>HelpMessageDialog</name>
<message>
- <location filename="../guiutil.cpp" line="+558"/>
- <location line="+13"/>
- <source>Bitcoin-Qt</source>
+ <location filename="../forms/helpmessagedialog.ui" line="+19"/>
+ <source>Bitcoin Core - Command-line options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-13"/>
+ <location filename="../utilitydialog.cpp" line="+38"/>
+ <source>Bitcoin Core</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
<source>version</source>
<translation type="unfinished"/>
</message>
@@ -841,17 +1144,17 @@ Address: %4
</message>
<message>
<location line="+9"/>
- <source>Welcome to Bitcoin-Qt.</source>
+ <source>Welcome to Bitcoin Core.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+26"/>
- <source>As this is the first time the program is launched, you can choose where Bitcoin-Qt will store its data.</source>
+ <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+10"/>
- <source>Bitcoin-Qt will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
+ <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -865,7 +1168,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../intro.cpp" line="+105"/>
+ <location filename="../intro.cpp" line="+85"/>
+ <source>Bitcoin</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error: Specified data directory &quot;%1&quot; can not be created.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+19"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
@@ -881,6 +1194,34 @@ Address: %4
</message>
</context>
<context>
+ <name>OpenURIDialog</name>
+ <message>
+ <location filename="../forms/openuridialog.ui" line="+14"/>
+ <source>Open URI</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Open payment request from URI or file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>URI:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Select payment request file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../openuridialog.cpp" line="+47"/>
+ <source>Select payment request file to open</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OptionsDialog</name>
<message>
<location filename="../forms/optionsdialog.ui" line="+14"/>
@@ -888,7 +1229,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+13"/>
<source>&amp;Main</source>
<translation type="unfinished"/>
</message>
@@ -913,57 +1254,87 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+35"/>
- <source>Reset all client options to default.</source>
+ <location line="+9"/>
+ <source>Size of &amp;database cache</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>&amp;Reset Options</source>
+ <location line="+13"/>
+ <source>Set database cache size in megabytes (default: 25)</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+13"/>
- <source>&amp;Network</source>
+ <source>MB</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>
+ <location line="+27"/>
+ <source>Number of script &amp;verification threads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Connect to the Bitcoin network through a SOCKS proxy.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
- <source>Map port using &amp;UPnP</source>
+ <source>&amp;Connect through SOCKS proxy (default proxy):</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>
+ <location line="+34"/>
+ <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+224"/>
+ <source>Active command-line options that override above options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
+ <source>Reset all client options to default.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
- <source>&amp;Connect through SOCKS proxy:</source>
+ <source>&amp;Reset Options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+9"/>
- <source>Proxy &amp;IP:</source>
+ <location line="-323"/>
+ <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="+19"/>
- <source>IP address of the proxy (e.g. 127.0.0.1)</source>
+ <source>Proxy &amp;IP:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="+32"/>
<source>&amp;Port:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+19"/>
+ <location line="+25"/>
<source>Port of the proxy (e.g. 9050)</source>
<translation type="unfinished"/>
</message>
@@ -1038,7 +1409,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+71"/>
+ <location line="+7"/>
+ <source>Whether to show coin control features or not.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Display coin &amp;control features (experts only)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+136"/>
<source>&amp;OK</source>
<translation type="unfinished"/>
</message>
@@ -1048,44 +1429,38 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>&amp;Apply</source>
+ <location filename="../optionsdialog.cpp" line="+67"/>
+ <source>default</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+58"/>
- <source>default</source>
+ <location line="+57"/>
+ <source>none</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+130"/>
+ <location line="+75"/>
<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>
+ <location line="+29"/>
+ <source>Client restart required to activate changes.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>Do you want to proceed?</source>
+ <location line="-29"/>
+ <source>Client will be shutdown, do you want to proceed?</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
- <location line="+9"/>
- <source>Warning</source>
+ <location line="+33"/>
+ <source>This change would require a client restart.</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"/>
+ <location line="+34"/>
<source>The supplied proxy address is invalid.</source>
<translation type="unfinished"/>
</message>
@@ -1099,22 +1474,22 @@ Address: %4
</message>
<message>
<location line="+50"/>
- <location line="+202"/>
+ <location line="+231"/>
<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="-131"/>
+ <location line="-155"/>
<source>Unconfirmed:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-78"/>
+ <location line="-83"/>
<source>Wallet</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+49"/>
+ <location line="+51"/>
<source>Confirmed:</source>
<translation type="unfinished"/>
</message>
@@ -1124,12 +1499,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+29"/>
+ <location line="+32"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+16"/>
<source>Immature:</source>
<translation type="unfinished"/>
</message>
@@ -1139,7 +1514,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+16"/>
<source>Total:</source>
<translation type="unfinished"/>
</message>
@@ -1149,12 +1524,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+53"/>
+ <location line="+71"/>
<source>&lt;b&gt;Recent transactions&lt;/b&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../overviewpage.cpp" line="+116"/>
+ <location filename="../overviewpage.cpp" line="+120"/>
<location line="+1"/>
<source>out of sync</source>
<translation type="unfinished"/>
@@ -1163,7 +1538,8 @@ Address: %4
<context>
<name>PaymentServer</name>
<message>
- <location filename="../paymentserver.cpp" line="+392"/>
+ <location filename="../paymentserver.cpp" line="+403"/>
+ <location line="+13"/>
<source>URI handling</source>
<translation type="unfinished"/>
</message>
@@ -1173,45 +1549,82 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+69"/>
+ <location line="+96"/>
<source>Requested payment amount of %1 is too small (considered dust).</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
- <location line="+37"/>
+ <location line="-221"/>
+ <location line="+212"/>
+ <location line="+13"/>
+ <location line="+95"/>
+ <location line="+18"/>
+ <location line="+16"/>
<source>Payment request error</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="-353"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Net manager warning</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+1"/>
- <source>Insecure requests to custom payment scripts unsupported</source>
+ <source>Your active proxy doesn&apos;t support SOCKS5, which is required for payment requests via proxy.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+38"/>
+ <location line="+52"/>
+ <source>Payment request fetch URL is invalid: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Payment request file handling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Payment request file can not be read or processed! This can be caused by an invalid payment request file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+73"/>
+ <source>Unverified payment requests to custom payment scripts are unsupported.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+59"/>
<source>Refund from %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
+ <location line="+43"/>
<source>Error communicating with %1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+24"/>
+ <source>Payment request can not be parsed or processed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
<source>Bad response from server %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+32"/>
+ <location line="+33"/>
<source>Payment acknowledged</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-58"/>
- <location line="+30"/>
- <location line="+17"/>
+ <location line="-11"/>
<source>Network request error</source>
<translation type="unfinished"/>
</message>
@@ -1219,32 +1632,26 @@ Address: %4
<context>
<name>QObject</name>
<message>
- <location filename="../bitcoin.cpp" line="+114"/>
- <location line="+5"/>
- <location filename="../intro.cpp" line="-32"/>
+ <location filename="../bitcoin.cpp" line="+71"/>
+ <location line="+11"/>
<source>Bitcoin</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-4"/>
+ <location line="+1"/>
<source>Error: Specified data directory &quot;%1&quot; does not exist.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="-12"/>
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../intro.cpp" line="+1"/>
- <source>Error: Specified data directory &quot;%1&quot; can not be created.</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>QRImageWidget</name>
<message>
- <location filename="../receiverequestdialog.cpp" line="+32"/>
+ <location filename="../receiverequestdialog.cpp" line="+36"/>
<source>&amp;Save Image...</source>
<translation type="unfinished"/>
</message>
@@ -1260,7 +1667,7 @@ Address: %4
</message>
<message>
<location line="+0"/>
- <source>PNG Images (*.png)</source>
+ <source>PNG Image (*.png)</source>
<translation type="unfinished"/>
</message>
</context>
@@ -1278,15 +1685,16 @@ Address: %4
<location line="+23"/>
<location line="+23"/>
<location line="+36"/>
- <location line="+53"/>
+ <location line="+23"/>
+ <location line="+36"/>
<location line="+23"/>
<location line="+23"/>
- <location filename="../rpcconsole.cpp" line="+352"/>
+ <location filename="../rpcconsole.cpp" line="+359"/>
<source>N/A</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-217"/>
+ <location line="-223"/>
<source>Client version</source>
<translation type="unfinished"/>
</message>
@@ -1296,7 +1704,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+68"/>
+ <location line="-10"/>
+ <source>Debug window</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+25"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+53"/>
<source>Using OpenSSL version</source>
<translation type="unfinished"/>
</message>
@@ -1312,16 +1730,16 @@ Address: %4
</message>
<message>
<location line="+7"/>
- <source>Number of connections</source>
+ <source>Name</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+23"/>
- <source>On testnet</source>
+ <source>Number of connections</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+23"/>
+ <location line="+29"/>
<source>Block chain</source>
<translation type="unfinished"/>
</message>
@@ -1346,21 +1764,6 @@ Address: %4
<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"/>
@@ -1391,22 +1794,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-541"/>
+ <location line="-521"/>
<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"/>
+ <location line="+206"/>
<source>Debug log file</source>
<translation type="unfinished"/>
</message>
@@ -1416,7 +1809,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+102"/>
+ <location line="+76"/>
<source>Clear console</source>
<translation type="unfinished"/>
</message>
@@ -1436,7 +1829,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+128"/>
+ <location line="+122"/>
<source>%1 B</source>
<translation type="unfinished"/>
</message>
@@ -1474,48 +1867,48 @@ Address: %4
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+22"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
<source>&amp;Amount:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
- <source>The amount to request</source>
+ <location line="-13"/>
+ <source>&amp;Label:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>&amp;Label:</source>
+ <location line="-34"/>
+ <source>&amp;Message:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>The label to associate with the receiving address</source>
+ <location line="-17"/>
+ <source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>&amp;Message:</source>
+ <location line="+3"/>
+ <source>R&amp;euse an existing receiving address (not recommended)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>The message to attach to payment request</source>
+ <location line="+27"/>
+ <source>An optional label to associate with the new receiving address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
- <source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
+ <location line="+7"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>R&amp;euse an existing receiving address (not recommended)</source>
+ <location line="+7"/>
+ <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>Use this form to request payments. All fields are optional.</source>
+ <location line="+39"/>
+ <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1533,6 +1926,31 @@ Address: %4
<source>&amp;Request payment</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+47"/>
+ <source>Requested payments</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Show the selected request (does the same as double clicking an entry)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Show</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Remove the selected entries from the list</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Remove</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
@@ -1553,16 +1971,11 @@ Address: %4
</message>
<message>
<location line="+7"/>
- <source>&amp;Copy Image</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+7"/>
<source>&amp;Save Image...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../receiverequestdialog.cpp" line="+58"/>
+ <location filename="../receiverequestdialog.cpp" line="+56"/>
<source>Request payment to %1</source>
<translation type="unfinished"/>
</message>
@@ -1579,7 +1992,7 @@ Address: %4
<message>
<location line="+2"/>
<source>Address</source>
- <translation type="unfinished"/>
+ <translation>Adreça</translation>
</message>
<message>
<location line="+2"/>
@@ -1589,7 +2002,7 @@ Address: %4
<message>
<location line="+2"/>
<source>Label</source>
- <translation type="unfinished"/>
+ <translation>Etiqueta</translation>
</message>
<message>
<location line="+2"/>
@@ -1608,16 +2021,119 @@ Address: %4
</message>
</context>
<context>
+ <name>RecentRequestsTableModel</name>
+ <message>
+ <location filename="../recentrequeststablemodel.cpp" line="+24"/>
+ <source>Date</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Label</source>
+ <translation>Etiqueta</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Amount</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+38"/>
+ <source>(no label)</source>
+ <translation>(sense etiqueta)</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>(no message)</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+140"/>
- <location line="+213"/>
+ <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location line="+80"/>
<source>Send Coins</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+50"/>
+ <location line="+76"/>
+ <source>Coin Control Features</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Inputs...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>automatically selected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Insufficient funds!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+89"/>
+ <source>Quantity:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+35"/>
+ <source>Bytes:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Amount:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Priority:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Low Output:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>After Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Change:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+44"/>
+ <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Custom change address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+115"/>
<source>Send to multiple recipients at once</source>
<translation type="unfinished"/>
</message>
@@ -1642,12 +2158,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>123.456 BTC</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+31"/>
+ <location line="+41"/>
<source>Confirm the send action</source>
<translation type="unfinished"/>
</message>
@@ -1657,69 +2168,135 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-154"/>
+ <location filename="../sendcoinsdialog.cpp" line="-228"/>
<source>Confirm send coins</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-90"/>
+ <location line="-74"/>
<location line="+5"/>
<location line="+5"/>
+ <location line="+4"/>
<source>%1 to %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+26"/>
+ <location line="-136"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Copy quantity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy after fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy bytes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy low output</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy change</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+170"/>
+ <source>Total Amount %1 (= %2)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>or</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+202"/>
<source>The recipient address is not valid, please recheck.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The amount to pay must be larger than 0.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The amount exceeds your balance.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The total exceeds your balance when the %1 transaction fee is included.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+3"/>
<source>Duplicate address found, can only send to each address once per send operation.</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="+3"/>
+ <source>Transaction creation failed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+4"/>
- <source>Error: Transaction creation failed!</source>
+ <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+15"/>
- <source>Are you sure you want to send?</source>
+ <location line="+112"/>
+ <source>Warning: Invalid Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+9"/>
- <source>added as transaction fee</source>
+ <location line="+21"/>
+ <source>(no label)</source>
+ <translation>(sense etiqueta)</translation>
+ </message>
+ <message>
+ <location line="-11"/>
+ <source>Warning: Unknown change address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
- <source>Total Amount %1</source>
+ <location line="-366"/>
+ <source>Are you sure you want to send?</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+20"/>
- <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>
+ <location line="+9"/>
+ <source>added as transaction fee</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+144"/>
+ <location line="+170"/>
<source>Payment request expired</source>
<translation type="unfinished"/>
</message>
@@ -1732,39 +2309,44 @@ Address: %4
<context>
<name>SendCoinsEntry</name>
<message>
- <location filename="../forms/sendcoinsentry.ui" line="+33"/>
- <location line="+585"/>
+ <location filename="../forms/sendcoinsentry.ui" line="+131"/>
+ <location line="+521"/>
+ <location line="+536"/>
<source>A&amp;mount:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-572"/>
- <location line="+585"/>
+ <location line="-1152"/>
<source>Pay &amp;To:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-551"/>
+ <location line="+18"/>
<source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../sendcoinsentry.cpp" line="+28"/>
+ <location filename="../sendcoinsentry.cpp" line="+30"/>
<source>Enter a label for this address to add it to your address book</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../forms/sendcoinsentry.ui" line="-18"/>
+ <location filename="../forms/sendcoinsentry.ui" line="+57"/>
<source>&amp;Label:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+28"/>
+ <location line="-50"/>
<source>Choose previously used address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
+ <location line="-40"/>
+ <source>This is a normal payment.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+50"/>
<source>Alt+A</source>
<translation type="unfinished"/>
</message>
@@ -1780,16 +2362,45 @@ Address: %4
</message>
<message>
<location line="+7"/>
- <source>Remove this recipient</source>
+ <location line="+524"/>
+ <location line="+536"/>
+ <source>Remove this entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="-1008"/>
+ <source>Message:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+958"/>
+ <source>This is a verified payment request.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-991"/>
<source>Enter a label for this address to add it to the list of used addresses</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+465"/>
+ <location line="+459"/>
+ <source>This is an unverified payment request.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+18"/>
+ <location line="+532"/>
+ <source>Pay To:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-498"/>
+ <location line="+536"/>
<source>Memo:</source>
<translation type="unfinished"/>
</message>
@@ -1800,6 +2411,19 @@ Address: %4
</message>
</context>
<context>
+ <name>ShutdownWindow</name>
+ <message>
+ <location filename="../utilitydialog.cpp" line="+48"/>
+ <source>Bitcoin Core is shutting down...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Do not shut down the computer until this window disappears.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>SignVerifyMessageDialog</name>
<message>
<location filename="../forms/signverifymessagedialog.ui" line="+14"/>
@@ -1807,7 +2431,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+10"/>
<source>&amp;Sign Message</source>
<translation type="unfinished"/>
</message>
@@ -1910,7 +2534,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+27"/>
+ <location filename="../signverifymessagedialog.cpp" line="+29"/>
<location line="+3"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation type="unfinished"/>
@@ -1926,7 +2550,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+85"/>
+ <location line="+84"/>
<location line="+81"/>
<source>The entered address is invalid.</source>
<translation type="unfinished"/>
@@ -1995,20 +2619,25 @@ Address: %4
<context>
<name>SplashScreen</name>
<message>
- <location filename="../splashscreen.cpp" line="+23"/>
- <source>The Bitcoin developers</source>
+ <location filename="../splashscreen.cpp" line="+28"/>
+ <source>Bitcoin Core</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
<source>[testnet]</source>
- <translation type="unfinished"/>
+ <translation>[testnet]</translation>
</message>
</context>
<context>
<name>TrafficGraphWidget</name>
<message>
- <location filename="../trafficgraphwidget.cpp" line="+75"/>
+ <location filename="../trafficgraphwidget.cpp" line="+79"/>
<source>KB/s</source>
<translation type="unfinished"/>
</message>
@@ -2016,7 +2645,7 @@ Address: %4
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="+22"/>
+ <location filename="../transactiondesc.cpp" line="+28"/>
<source>Open until %1</source>
<translation type="unfinished"/>
</message>
@@ -2089,12 +2718,12 @@ Address: %4
<location line="+12"/>
<location line="+45"/>
<location line="+17"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Credit</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="-120"/>
+ <location line="-125"/>
<source>matures in %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -2107,12 +2736,12 @@ Address: %4
<location line="+44"/>
<location line="+8"/>
<location line="+15"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Debit</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-57"/>
+ <location line="-62"/>
<source>Transaction fee</source>
<translation type="unfinished"/>
</message>
@@ -2123,11 +2752,12 @@ Address: %4
</message>
<message>
<location line="+6"/>
+ <location line="+9"/>
<source>Message</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="-7"/>
<source>Comment</source>
<translation type="unfinished"/>
</message>
@@ -2137,7 +2767,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+18"/>
<source>Merchant</source>
<translation type="unfinished"/>
</message>
@@ -2177,7 +2807,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-227"/>
+ <location line="-232"/>
<source>, has not been successfully broadcast yet</source>
<translation type="unfinished"/>
</message>
@@ -2208,7 +2838,7 @@ Address: %4
<context>
<name>TransactionTableModel</name>
<message>
- <location filename="../transactiontablemodel.cpp" line="+227"/>
+ <location filename="../transactiontablemodel.cpp" line="+234"/>
<source>Date</source>
<translation type="unfinished"/>
</message>
@@ -2220,15 +2850,20 @@ Address: %4
<message>
<location line="+0"/>
<source>Address</source>
- <translation type="unfinished"/>
+ <translation>Adreça</translation>
</message>
<message>
<location line="+0"/>
<source>Amount</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+59"/>
+ <source>Immature (%1 confirmations, will be available after %2)</source>
+ <translation type="unfinished"/>
+ </message>
<message numerus="yes">
- <location line="+57"/>
+ <location line="+16"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -2248,17 +2883,13 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
+ <location line="-22"/>
+ <location line="+25"/>
<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"/>
+ <location line="-22"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation type="unfinished"/>
</message>
@@ -2268,7 +2899,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+43"/>
+ <location line="+62"/>
<source>Received with</source>
<translation type="unfinished"/>
</message>
@@ -2326,7 +2957,7 @@ Address: %4
<context>
<name>TransactionView</name>
<message>
- <location filename="../transactionview.cpp" line="+52"/>
+ <location filename="../transactionview.cpp" line="+57"/>
<location line="+16"/>
<source>All</source>
<translation type="unfinished"/>
@@ -2387,12 +3018,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="+6"/>
<source>Enter address or label to search</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="+6"/>
<source>Min amount</source>
<translation type="unfinished"/>
</message>
@@ -2427,17 +3058,37 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+143"/>
- <source>Export Transaction Data</source>
+ <location line="+142"/>
+ <source>Export Transaction History</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="+19"/>
+ <source>Exporting Failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>There was an error trying to save the transaction history to %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Exporting Successful</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The transaction history was successfully saved to %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-22"/>
<source>Comma separated file (*.csv)</source>
<translation>Fitxer separat per comes (*.csv)</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+9"/>
<source>Confirmed</source>
<translation type="unfinished"/>
</message>
@@ -2454,12 +3105,12 @@ Address: %4
<message>
<location line="+1"/>
<source>Label</source>
- <translation type="unfinished"/>
+ <translation>Etiqueta</translation>
</message>
<message>
<location line="+1"/>
<source>Address</source>
- <translation type="unfinished"/>
+ <translation>Adreça</translation>
</message>
<message>
<location line="+1"/>
@@ -2472,17 +3123,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
- <source>Error exporting</source>
- <translation>Error exportant</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+100"/>
+ <location line="+107"/>
<source>Range:</source>
<translation type="unfinished"/>
</message>
@@ -2493,9 +3134,17 @@ Address: %4
</message>
</context>
<context>
+ <name>WalletFrame</name>
+ <message>
+ <location filename="../walletframe.cpp" line="+26"/>
+ <source>No wallet has been loaded.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>WalletModel</name>
<message>
- <location filename="../walletmodel.cpp" line="+218"/>
+ <location filename="../walletmodel.cpp" line="+245"/>
<source>Send Coins</source>
<translation type="unfinished"/>
</message>
@@ -2503,7 +3152,7 @@ Address: %4
<context>
<name>WalletView</name>
<message>
- <location filename="../walletview.cpp" line="+46"/>
+ <location filename="../walletview.cpp" line="+43"/>
<source>&amp;Export</source>
<translation type="unfinished"/>
</message>
@@ -2513,65 +3162,60 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+183"/>
+ <location line="+181"/>
<source>Backup Wallet</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
+ <location line="+1"/>
<source>Wallet Data (*.dat)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
+ <location line="+6"/>
<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>
+ <source>There was an error trying to save the wallet data to %1.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+4"/>
- <source>Backup Successful</source>
+ <source>The wallet data was successfully saved to %1.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+0"/>
- <source>The wallet data was successfully saved to the new location.</source>
+ <source>Backup Successful</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+102"/>
- <source>Bitcoin version</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+107"/>
+ <location filename="../bitcoinstrings.cpp" line="+221"/>
<source>Usage:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-55"/>
+ <location line="-54"/>
<source>List commands</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-13"/>
+ <location line="-14"/>
<source>Get help for a command</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+25"/>
+ <location line="+26"/>
<source>Options:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+24"/>
+ <location line="+22"/>
<source>Specify configuration file (default: bitcoin.conf)</source>
<translation type="unfinished"/>
</message>
@@ -2591,7 +3235,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-28"/>
+ <location line="-26"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
<translation type="unfinished"/>
</message>
@@ -2601,7 +3245,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-49"/>
+ <location line="-51"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation type="unfinished"/>
</message>
@@ -2611,37 +3255,37 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-142"/>
+ <location line="-148"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-33"/>
+ <location line="-36"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+40"/>
+ <location line="+45"/>
<source>Accept command line and JSON-RPC commands</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<source>Run in the background as a daemon and accept commands</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+40"/>
+ <location line="+39"/>
<source>Use the test network</source>
<translation type="unfinished"/>
</message>
@@ -2651,7 +3295,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-87"/>
+ <location line="-95"/>
<source>%s, you must set a rpcpassword in the configuration file:
%s
It is recommended you use the following random password:
@@ -2692,6 +3336,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+4"/>
+ <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</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>
@@ -2706,17 +3355,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+11"/>
- <source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source>
+ <location line="+18"/>
+ <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="+6"/>
- <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
+ <location line="+5"/>
+ <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+3"/>
<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>
@@ -2746,17 +3395,27 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
+ <location line="+9"/>
+ <source>&lt;category&gt; can be:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
<source>Attempt to recover private keys from a corrupt wallet.dat</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
+ <source>Bitcoin Core Daemon</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Bitcoin RPC client version</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
<source>Block creation options:</source>
<translation type="unfinished"/>
</message>
@@ -2766,7 +3425,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
+ <source>Connect through SOCKS proxy</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect to JSON-RPC on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation type="unfinished"/>
</message>
@@ -2782,6 +3446,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+1"/>
+ <source>Do not load the wallet and disable wallet RPC calls</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Do you want to rebuild the block database now?</source>
<translation type="unfinished"/>
</message>
@@ -2876,7 +3545,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
+ <source>Fee per kB to add to transactions you send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Find peers using DNS lookup (default: 1 unless -connect)</source>
<translation type="unfinished"/>
</message>
@@ -2896,6 +3570,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
+ <location line="+1"/>
+ <source>If &lt;category&gt; is not supplied, output all debugging information.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+2"/>
<source>Incorrect or no genesis block found. Wrong datadir for network?</source>
<translation type="unfinished"/>
@@ -2911,17 +3590,37 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+8"/>
+ <location line="+5"/>
+ <source>Prepend debug output with timestamp (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>RPC client options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Rebuild block chain index from current blk000??.dat files</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+5"/>
+ <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Send command to Bitcoin server</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
+ <location line="+7"/>
+ <source>Set maximum block size in bytes (default: %d)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Set the number of threads to service RPC calls (default: 4)</source>
<translation type="unfinished"/>
</message>
@@ -2936,12 +3635,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+12"/>
+ <location line="+3"/>
+ <source>This is intended for regression testing tools and app development.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Usage (deprecated, use bitcoin-cli):</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+8"/>
+ <location line="+7"/>
<source>Verifying blocks...</source>
<translation type="unfinished"/>
</message>
@@ -2952,31 +3656,56 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+1"/>
+ <source>Wait for RPC server to start</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Wallet %s resides outside data directory %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+2"/>
+ <source>Wallet options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>You need to rebuild the database using -reindex to change -txindex</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-78"/>
+ <location line="-79"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-98"/>
+ <location line="-105"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+17"/>
+ <location line="+14"/>
+ <source>Output debugging information (default: 0, supplying &lt;category&gt; is optional)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+83"/>
+ <location line="+89"/>
<source>Information</source>
<translation type="unfinished"/>
</message>
@@ -3016,47 +3745,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<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"/>
+ <location line="+9"/>
<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"/>
+ <location line="+4"/>
<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"/>
+ <location line="+6"/>
<source>Set minimum block size in bytes (default: 0)</source>
<translation type="unfinished"/>
</message>
@@ -3081,7 +3780,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Transaction amount too small</source>
<translation type="unfinished"/>
</message>
@@ -3106,32 +3805,32 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<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="+5"/>
+ <location line="+7"/>
<source>Warning</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Warning: This version is obsolete, upgrade required!</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+2"/>
+ <source>version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>wallet.dat corrupt, salvage failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-54"/>
+ <location line="-58"/>
<source>Password for JSON-RPC connections</source>
<translation type="unfinished"/>
</message>
@@ -3141,27 +3840,27 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-126"/>
+ <location line="-132"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+155"/>
+ <location line="+161"/>
<source>Upgrade wallet to latest format</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-12"/>
+ <location line="-11"/>
<source>Rescan the block chain for missing wallet transactions</source>
<translation type="unfinished"/>
</message>
@@ -3171,7 +3870,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-29"/>
+ <location line="-30"/>
<source>Server certificate file (default: server.cert)</source>
<translation type="unfinished"/>
</message>
@@ -3186,27 +3885,22 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Unable to bind to %s on this computer (bind returned error %d, %s)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-95"/>
- <source>Connect through socks proxy</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="-11"/>
+ <location line="-107"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+58"/>
+ <location line="+60"/>
<source>Loading addresses...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-36"/>
+ <location line="-37"/>
<source>Error loading wallet.dat: Wallet corrupted</source>
<translation type="unfinished"/>
</message>
@@ -3226,12 +3920,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+30"/>
+ <location line="+31"/>
<source>Invalid -proxy address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+57"/>
+ <location line="+56"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3241,7 +3935,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3251,7 +3945,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+46"/>
+ <location line="+48"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3271,27 +3965,22 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-60"/>
+ <location line="-62"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-28"/>
+ <location line="-32"/>
<source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+69"/>
- <source>Fee per KB to add to transactions you send</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+20"/>
+ <location line="+95"/>
<source>Loading wallet...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-54"/>
+ <location line="-56"/>
<source>Cannot downgrade wallet</source>
<translation type="unfinished"/>
</message>
@@ -3301,7 +3990,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+66"/>
+ <location line="+67"/>
<source>Rescanning...</source>
<translation type="unfinished"/>
</message>
@@ -3321,7 +4010,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-33"/>
+ <location line="-35"/>
<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_ca_ES.ts b/src/qt/locale/bitcoin_ca_ES.ts
index 72e1b6bb93..4c86a99a2c 100644
--- a/src/qt/locale/bitcoin_ca_ES.ts
+++ b/src/qt/locale/bitcoin_ca_ES.ts
@@ -3,13 +3,13 @@
<name>AboutDialog</name>
<message>
<location filename="../forms/aboutdialog.ui" line="+14"/>
- <source>About Bitcoin</source>
- <translation>Sobre Bitcoin</translation>
+ <source>About Bitcoin Core</source>
+ <translation>Sobre el Nucli 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; versió</translation>
+ <source>&lt;b&gt;Bitcoin Core&lt;/b&gt; version</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+57"/>
@@ -22,13 +22,13 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>\n Aquest és software experimental.\n\n Distribuït sota llicència de software MIT/11, veure l&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="+14"/>
+ <location filename="../utilitydialog.cpp" line="+29"/>
<source>Copyright</source>
<translation>Copyright</translation>
</message>
<message>
<location line="+0"/>
- <source>The Bitcoin developers</source>
+ <source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
</context>
@@ -47,7 +47,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+3"/>
<source>&amp;New</source>
- <translation type="unfinished"/>
+ <translation>&amp;Nou</translation>
</message>
<message>
<location line="+11"/>
@@ -57,7 +57,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+3"/>
<source>&amp;Copy</source>
- <translation type="unfinished"/>
+ <translation>&amp;Copiar</translation>
</message>
<message>
<location line="+52"/>
@@ -65,7 +65,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location filename="../addressbookpage.cpp" line="+72"/>
+ <location filename="../addressbookpage.cpp" line="+74"/>
<source>&amp;Copy Address</source>
<translation>&amp;Copiar adreça</translation>
</message>
@@ -77,12 +77,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+27"/>
<source>Export the data in the current tab to a file</source>
- <translation type="unfinished"/>
+ <translation>Exportar les dades de la pestanya actual a un arxiu</translation>
</message>
<message>
<location line="+3"/>
<source>&amp;Export</source>
- <translation type="unfinished"/>
+ <translation>&amp;Exportar</translation>
</message>
<message>
<location line="-27"/>
@@ -92,12 +92,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location filename="../addressbookpage.cpp" line="-30"/>
<source>Choose the address to send coins to</source>
- <translation type="unfinished"/>
+ <translation>Escull una adreça a la qual enviar coins</translation>
</message>
<message>
<location line="+1"/>
<source>Choose the address to receive coins with</source>
- <translation type="unfinished"/>
+ <translation>Escull l&apos;adreça a la quals vols rebre coins</translation>
</message>
<message>
<location line="+5"/>
@@ -107,12 +107,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+6"/>
<source>Sending addresses</source>
- <translation type="unfinished"/>
+ <translation>Enviant adreces</translation>
</message>
<message>
<location line="+1"/>
<source>Receiving addresses</source>
- <translation type="unfinished"/>
+ <translation>Rebent adreces</translation>
</message>
<message>
<location line="+7"/>
@@ -135,9 +135,9 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>&amp;Editar</translation>
</message>
<message>
- <location line="+197"/>
+ <location line="+194"/>
<source>Export Address List</source>
- <translation type="unfinished"/>
+ <translation>Exportar la llista d&apos;adre</translation>
</message>
<message>
<location line="+1"/>
@@ -146,19 +146,19 @@ This product includes software developed by the OpenSSL Project for use in the O
</message>
<message>
<location line="+13"/>
- <source>Error exporting</source>
- <translation>Error en l&apos;exportació</translation>
+ <source>Exporting Failed</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation>No s&apos;ha pogut escriure a l&apos;arxiu %1.</translation>
+ <location line="+1"/>
+ <source>There was an error trying to save the address list to %1.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<name>AddressTableModel</name>
<message>
- <location filename="../addresstablemodel.cpp" line="+164"/>
+ <location filename="../addresstablemodel.cpp" line="+168"/>
<source>Label</source>
<translation>Etiqueta</translation>
</message>
@@ -196,7 +196,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Repeteix la nova contrasenya</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="+34"/>
+ <location filename="../askpassphrasedialog.cpp" line="+40"/>
<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>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>
@@ -317,22 +317,27 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+250"/>
+ <location filename="../bitcoingui.cpp" line="+295"/>
<source>Sign &amp;message...</source>
<translation>Signar &amp;missatge...</translation>
</message>
<message>
- <location line="+254"/>
+ <location line="+335"/>
<source>Synchronizing with network...</source>
<translation>Sincronitzant amb la xarxa ...</translation>
</message>
<message>
- <location line="-324"/>
+ <location line="-407"/>
<source>&amp;Overview</source>
<translation>&amp;Panorama general</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="-137"/>
+ <source>Node</source>
+ <translation>Node</translation>
+ </message>
+ <message>
+ <location line="+138"/>
<source>Show general overview of wallet</source>
<translation>Mostra panorama general del moneder</translation>
</message>
@@ -347,7 +352,7 @@ 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="+15"/>
+ <location line="+17"/>
<source>E&amp;xit</source>
<translation>S&amp;ortir</translation>
</message>
@@ -393,7 +398,22 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>&amp;Canviar contrasenya...</translation>
</message>
<message>
- <location line="+259"/>
+ <location line="+10"/>
+ <source>&amp;Sending addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Receiving addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open &amp;URI...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+325"/>
<source>Importing blocks from disk...</source>
<translation>Important blocs del disc..</translation>
</message>
@@ -403,12 +423,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Re-indexant blocs al disc...</translation>
</message>
<message>
- <location line="-322"/>
+ <location line="-405"/>
<source>Send coins to a Bitcoin address</source>
<translation>Enviar monedes a una adreça Bitcoin</translation>
</message>
<message>
- <location line="+47"/>
+ <location line="+49"/>
<source>Modify configuration options for Bitcoin</source>
<translation>Modificar les opcions de configuració per bitcoin</translation>
</message>
@@ -438,20 +458,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>&amp;Verifica el missatge..</translation>
</message>
<message>
- <location line="-180"/>
- <location line="+6"/>
- <location line="+513"/>
+ <location line="+430"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-519"/>
- <location line="+6"/>
+ <location line="-643"/>
<source>Wallet</source>
<translation>Moneder</translation>
</message>
<message>
- <location line="+109"/>
+ <location line="+146"/>
<source>&amp;Send</source>
<translation>&amp;Enviar</translation>
</message>
@@ -461,13 +478,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>&amp;Rebre</translation>
</message>
<message>
- <location line="+28"/>
- <location line="+2"/>
- <source>&amp;About Bitcoin</source>
- <translation>&amp;Sobre Bitcoin</translation>
- </message>
- <message>
- <location line="+14"/>
+ <location line="+46"/>
<location line="+2"/>
<source>&amp;Show / Hide</source>
<translation>&amp;Mostrar / Amagar</translation>
@@ -493,64 +504,80 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Verificar els missatges per assegurar-te que han estat signades amb una adreça Bitcoin específica.</translation>
</message>
<message>
- <location line="+35"/>
+ <location line="+48"/>
<source>&amp;File</source>
<translation>&amp;Arxiu</translation>
</message>
<message>
- <location line="+10"/>
+ <location line="+14"/>
<source>&amp;Settings</source>
<translation>&amp;Configuració</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>&amp;Help</source>
<translation>&amp;Ajuda</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+15"/>
<source>Tabs toolbar</source>
<translation>Barra d&apos;eines de seccions</translation>
</message>
<message>
- <location line="-235"/>
- <location line="+294"/>
+ <location line="-284"/>
+ <location line="+376"/>
<source>[testnet]</source>
<translation>[testnet]</translation>
</message>
<message>
- <location line="-177"/>
+ <location line="-401"/>
+ <source>Bitcoin Core</source>
+ <translation>Nucli de Bitcoin</translation>
+ </message>
+ <message>
+ <location line="+163"/>
<source>Request payments (generates QR codes and bitcoin: URIs)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+63"/>
- <source>&amp;Used sending addresses...</source>
+ <location line="+29"/>
+ <location line="+2"/>
+ <source>&amp;About Bitcoin Core</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="+35"/>
<source>Show the list of used sending addresses and labels</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Used &amp;receiving addresses...</source>
+ <location line="+2"/>
+ <source>Show the list of used receiving addresses and labels</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open a bitcoin: URI or payment request</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Command-line options</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
- <source>Show the list of used receiving addresses and labels</source>
+ <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+106"/>
+ <location line="+159"/>
<location line="+5"/>
<source>Bitcoin client</source>
<translation>Client Bitcoin</translation>
</message>
<message numerus="yes">
- <location line="+120"/>
+ <location line="+142"/>
<source>%n active connection(s) to Bitcoin network</source>
<translation><numerusform>%n connexió activa a la xarxa Bitcoin</numerusform><numerusform>%n connexions actives a la xarxa Bitcoin</numerusform></translation>
</message>
@@ -570,7 +597,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Proccessats %1 blocs del històric de transaccions.</translation>
</message>
<message numerus="yes">
- <location line="+20"/>
+ <location line="+23"/>
<source>%n hour(s)</source>
<translation><numerusform>%n hora</numerusform><numerusform>%n hores</numerusform></translation>
</message>
@@ -590,7 +617,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>%1 radera</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="+21"/>
<source>Last received block was generated %1 ago.</source>
<translation>Lúltim bloc rebut ha estat generat fa %1.</translation>
</message>
@@ -615,27 +642,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Informació</translation>
</message>
<message>
- <location line="+77"/>
- <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
- <translation>Aquesta transacció supera el límit de tamany. Tot i així pots enviar-la amb una comissió de %1, que es destinen als nodes que processen la seva transacció i ajuda a donar suport a la xarxa. Vols pagar la comissió?</translation>
- </message>
- <message>
- <location line="-152"/>
+ <location line="-85"/>
<source>Up to date</source>
<translation>Al dia</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Catching up...</source>
<translation>Posar-se al dia ...</translation>
</message>
<message>
- <location line="+124"/>
- <source>Confirm transaction fee</source>
- <translation>Confirmar comisió de transacció</translation>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+130"/>
<source>Sent transaction</source>
<translation>Transacció enviada</translation>
</message>
@@ -654,17 +671,7 @@ Address: %4
<translation>Data: %1\nQuantitat %2\n Tipus: %3\n Adreça: %4\n</translation>
</message>
<message>
- <location line="+34"/>
- <source>URI handling</source>
- <translation>Manejant URI</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
- <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="+45"/>
+ <location line="+69"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation>El moneder està &lt;b&gt;encriptat&lt;/b&gt; i actualment &lt;b&gt;desbloquejat&lt;/b&gt;</translation>
</message>
@@ -674,7 +681,7 @@ Address: %4
<translation>El moneder està &lt;b&gt;encriptat&lt;/b&gt; i actualment &lt;b&gt;bloquejat&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+110"/>
+ <location filename="../bitcoin.cpp" line="+438"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation>Ha tingut lloc un error fatal. Bitcoin no pot continuar executant-se de manera segura i es tancará.</translation>
</message>
@@ -682,12 +689,304 @@ Address: %4
<context>
<name>ClientModel</name>
<message>
- <location filename="../clientmodel.cpp" line="+115"/>
+ <location filename="../clientmodel.cpp" line="+119"/>
<source>Network Alert</source>
<translation>Alerta de xarxa</translation>
</message>
</context>
<context>
+ <name>CoinControlDialog</name>
+ <message>
+ <location filename="../forms/coincontroldialog.ui" line="+14"/>
+ <source>Coin Control Address Selection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>Quantity:</source>
+ <translation>Quantitat:</translation>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Bytes:</source>
+ <translation>Bytes:</translation>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>Amount:</source>
+ <translation>Quantitat:</translation>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Priority:</source>
+ <translation>Prioritat:</translation>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>Fee:</source>
+ <translation>Quota:</translation>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Low Output:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>After Fee:</source>
+ <translation>Quota posterior:</translation>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Change:</source>
+ <translation>Canvi:</translation>
+ </message>
+ <message>
+ <location line="+63"/>
+ <source>(un)select all</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Tree mode</source>
+ <translation>Mode arbre</translation>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>List mode</source>
+ <translation>Mode llista</translation>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>Amount</source>
+ <translation>Quantitat</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Address</source>
+ <translation>Adreça</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Date</source>
+ <translation>Data</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Confirmations</source>
+ <translation>Confirmacions</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Confirmed</source>
+ <translation>Confirmat</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Priority</source>
+ <translation>Prioritat</translation>
+ </message>
+ <message>
+ <location filename="../coincontroldialog.cpp" line="+42"/>
+ <source>Copy address</source>
+ <translation>Copiar adreça </translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy label</source>
+ <translation>Copiar etiqueta</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+26"/>
+ <source>Copy amount</source>
+ <translation>Copiar quantitat</translation>
+ </message>
+ <message>
+ <location line="-25"/>
+ <source>Copy transaction ID</source>
+ <translation>Copiar ID de transacció</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Lock unspent</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Unlock unspent</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+22"/>
+ <source>Copy quantity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Copy fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy after fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy bytes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy low output</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy change</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+323"/>
+ <source>highest</source>
+ <translation>El més alt</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>higher</source>
+ <translation>Més alt</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>high</source>
+ <translation>Alt</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>medium-high</source>
+ <translation>mig-alt</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>medium</source>
+ <translation>mig</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>low-medium</source>
+ <translation>baix-mig</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>low</source>
+ <translation>baix</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>lower</source>
+ <translation>més baix</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>lowest</source>
+ <translation>el més baix</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>(%1 locked)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+140"/>
+ <source>Dust</source>
+ <translation>Pols</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>yes</source>
+ <translation>si</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>no</source>
+ <translation>no</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>This label turns red, if the transaction size is greater than 1000 bytes.</source>
+ <translation>Aquesta etiqueta es posa de color vermell si la mida de la transacció és més gran de 1000 bytes.</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+5"/>
+ <source>This means a fee of at least %1 per kB is required.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-4"/>
+ <source>Can vary +/- 1 byte per input.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Transactions with higher priority are more likely to get included into a block.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>This label turns red, if the priority is smaller than &quot;medium&quot;.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>This label turns red, if any recipient receives an amount smaller than %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+4"/>
+ <source>This means a fee of at least %1 is required.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-3"/>
+ <source>Amounts below 0.546 times the minimum relay fee are shown as dust.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>This label turns red, if the change is smaller than %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
+ <location line="+66"/>
+ <source>(no label)</source>
+ <translation>(sense etiqueta)</translation>
+ </message>
+ <message>
+ <location line="-9"/>
+ <source>change from %1 (%2)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>(change)</source>
+ <translation>(canviar)</translation>
+ </message>
+</context>
+<context>
<name>EditAddressDialog</name>
<message>
<location filename="../forms/editaddressdialog.ui" line="+14"/>
@@ -715,7 +1014,7 @@ Address: %4
<translation>&amp;Direcció</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+21"/>
+ <location filename="../editaddressdialog.cpp" line="+28"/>
<source>New receiving address</source>
<translation>Nova adreça de recepció.</translation>
</message>
@@ -758,19 +1057,19 @@ Address: %4
<context>
<name>FreespaceChecker</name>
<message>
- <location filename="../intro.cpp" line="+61"/>
+ <location filename="../intro.cpp" line="+65"/>
<source>A new data directory will be created.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+22"/>
<source>name</source>
- <translation type="unfinished"/>
+ <translation>nom</translation>
</message>
<message>
<location line="+2"/>
<source>Directory already exists. Add %1 if you intend to create a new directory here.</source>
- <translation type="unfinished"/>
+ <translation>El directori ja existeix. Afegeix %1 si vols crear un nou directori en aquesta ubicació.</translation>
</message>
<message>
<location line="+3"/>
@@ -784,15 +1083,19 @@ Address: %4
</message>
</context>
<context>
- <name>GUIUtil::HelpMessageBox</name>
+ <name>HelpMessageDialog</name>
<message>
- <location filename="../guiutil.cpp" line="+558"/>
- <location line="+13"/>
- <source>Bitcoin-Qt</source>
- <translation>Bitcoin-Qt</translation>
+ <location filename="../forms/helpmessagedialog.ui" line="+19"/>
+ <source>Bitcoin Core - Command-line options</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="-13"/>
+ <location filename="../utilitydialog.cpp" line="+38"/>
+ <source>Bitcoin Core</source>
+ <translation>Nucli de Bitcoin</translation>
+ </message>
+ <message>
+ <location line="+0"/>
<source>version</source>
<translation>versió</translation>
</message>
@@ -837,21 +1140,21 @@ Address: %4
<message>
<location filename="../forms/intro.ui" line="+14"/>
<source>Welcome</source>
- <translation type="unfinished"/>
+ <translation>Benvingut</translation>
</message>
<message>
<location line="+9"/>
- <source>Welcome to Bitcoin-Qt.</source>
- <translation type="unfinished"/>
+ <source>Welcome to Bitcoin Core.</source>
+ <translation>Benvingut a Bitcoin Core.</translation>
</message>
<message>
<location line="+26"/>
- <source>As this is the first time the program is launched, you can choose where Bitcoin-Qt will store its data.</source>
+ <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+10"/>
- <source>Bitcoin-Qt will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
+ <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -865,18 +1168,56 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../intro.cpp" line="+105"/>
- <source>Error</source>
+ <location filename="../intro.cpp" line="+85"/>
+ <source>Bitcoin</source>
+ <translation>Bitcoin</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error: Specified data directory &quot;%1&quot; can not be created.</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="+19"/>
+ <source>Error</source>
+ <translation>Error</translation>
+ </message>
+ <message>
<location line="+9"/>
<source>GB of free space available</source>
- <translation type="unfinished"/>
+ <translation>GB d&apos;espai lliure disponible</translation>
</message>
<message>
<location line="+3"/>
<source>(of %1GB needed)</source>
+ <translation>(d&apos; %1GB necessari)</translation>
+ </message>
+</context>
+<context>
+ <name>OpenURIDialog</name>
+ <message>
+ <location filename="../forms/openuridialog.ui" line="+14"/>
+ <source>Open URI</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Open payment request from URI or file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>URI:</source>
+ <translation>URI:</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Select payment request file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../openuridialog.cpp" line="+47"/>
+ <source>Select payment request file to open</source>
<translation type="unfinished"/>
</message>
</context>
@@ -888,7 +1229,7 @@ Address: %4
<translation>Opcions</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+13"/>
<source>&amp;Main</source>
<translation>&amp;Principal</translation>
</message>
@@ -913,7 +1254,52 @@ Address: %4
<translation>&amp;Iniciar Bitcoin al inici de sessió del sistema.</translation>
</message>
<message>
- <location line="+35"/>
+ <location line="+9"/>
+ <source>Size of &amp;database cache</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set database cache size in megabytes (default: 25)</source>
+ <translation>Establir tamany de la memoria cau en megabytes (per defecte: 25)</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>MB</source>
+ <translation>MB</translation>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Number of script &amp;verification threads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Connect to the Bitcoin network through a SOCKS proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Connect through SOCKS proxy (default proxy):</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+224"/>
+ <source>Active command-line options that override above options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
<source>Reset all client options to default.</source>
<translation>Reestablir totes les opcions del client.</translation>
</message>
@@ -923,7 +1309,7 @@ Address: %4
<translation>&amp;Reestablir Opcions</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="-323"/>
<source>&amp;Network</source>
<translation>&amp;Xarxa</translation>
</message>
@@ -938,32 +1324,17 @@ Address: %4
<translation>Port obert amb &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>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>&amp;Connecta a través de un proxy SOCKS:</translation>
- </message>
- <message>
- <location line="+9"/>
+ <location line="+19"/>
<source>Proxy &amp;IP:</source>
<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>Adreça IP del proxy (per exemple 127.0.0.1)</translation>
- </message>
- <message>
- <location line="+7"/>
+ <location line="+32"/>
<source>&amp;Port:</source>
<translation>&amp;Port:</translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+25"/>
<source>Port of the proxy (e.g. 9050)</source>
<translation>Port del proxy (per exemple 9050)</translation>
</message>
@@ -1038,7 +1409,17 @@ Address: %4
<translation>&amp;Mostrar adreces al llistat de transaccions</translation>
</message>
<message>
- <location line="+71"/>
+ <location line="+7"/>
+ <source>Whether to show coin control features or not.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Display coin &amp;control features (experts only)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+136"/>
<source>&amp;OK</source>
<translation>&amp;OK</translation>
</message>
@@ -1048,44 +1429,38 @@ Address: %4
<translation>&amp;Cancel·la</translation>
</message>
<message>
- <location line="+10"/>
- <source>&amp;Apply</source>
- <translation>&amp;Aplicar</translation>
- </message>
- <message>
- <location filename="../optionsdialog.cpp" line="+58"/>
+ <location filename="../optionsdialog.cpp" line="+67"/>
<source>default</source>
<translation>Per defecte</translation>
</message>
<message>
- <location line="+130"/>
+ <location line="+57"/>
+ <source>none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+75"/>
<source>Confirm options reset</source>
<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>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>Vols procedir?</translation>
+ <location line="+29"/>
+ <source>Client restart required to activate changes.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
- <location line="+9"/>
- <source>Warning</source>
- <translation>Avís</translation>
+ <location line="-29"/>
+ <source>Client will be shutdown, do you want to proceed?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="-9"/>
- <location line="+9"/>
- <source>This setting will take effect after restarting Bitcoin.</source>
- <translation>Aquesta configuració tindrà efecte un cop es reiniciï Bitcoin.</translation>
+ <location line="+33"/>
+ <source>This change would require a client restart.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+29"/>
+ <location line="+34"/>
<source>The supplied proxy address is invalid.</source>
<translation>L&apos;adreça proxy introduïda és invalida.</translation>
</message>
@@ -1099,22 +1474,22 @@ Address: %4
</message>
<message>
<location line="+50"/>
- <location line="+202"/>
+ <location line="+231"/>
<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ó 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="-131"/>
+ <location line="-155"/>
<source>Unconfirmed:</source>
<translation>Sense confirmar:</translation>
</message>
<message>
- <location line="-78"/>
+ <location line="-83"/>
<source>Wallet</source>
<translation>Moneder</translation>
</message>
<message>
- <location line="+49"/>
+ <location line="+51"/>
<source>Confirmed:</source>
<translation type="unfinished"/>
</message>
@@ -1124,12 +1499,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+29"/>
+ <location line="+32"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+16"/>
<source>Immature:</source>
<translation>Immatur:</translation>
</message>
@@ -1139,9 +1514,9 @@ Address: %4
<translation>Balanç minat que encara no ha madurat</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+16"/>
<source>Total:</source>
- <translation type="unfinished"/>
+ <translation>Total:</translation>
</message>
<message>
<location line="+16"/>
@@ -1149,12 +1524,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+53"/>
+ <location line="+71"/>
<source>&lt;b&gt;Recent transactions&lt;/b&gt;</source>
<translation>&lt;b&gt;Transaccions recents&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../overviewpage.cpp" line="+116"/>
+ <location filename="../overviewpage.cpp" line="+120"/>
<location line="+1"/>
<source>out of sync</source>
<translation>Fora de sincronia</translation>
@@ -1163,7 +1538,8 @@ Address: %4
<context>
<name>PaymentServer</name>
<message>
- <location filename="../paymentserver.cpp" line="+392"/>
+ <location filename="../paymentserver.cpp" line="+403"/>
+ <location line="+13"/>
<source>URI handling</source>
<translation>Manejant URI</translation>
</message>
@@ -1173,78 +1549,109 @@ Address: %4
<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="+69"/>
+ <location line="+96"/>
<source>Requested payment amount of %1 is too small (considered dust).</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
- <location line="+37"/>
+ <location line="-221"/>
+ <location line="+212"/>
+ <location line="+13"/>
+ <location line="+95"/>
+ <location line="+18"/>
+ <location line="+16"/>
<source>Payment request error</source>
+ <translation>Error en la sol·licitud de pagament</translation>
+ </message>
+ <message>
+ <location line="-353"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
+ <translation>No es pot iniciar bitcoin: manejador clicla-per-pagar</translation>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Net manager warning</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
- <source>Insecure requests to custom payment scripts unsupported</source>
+ <source>Your active proxy doesn&apos;t support SOCKS5, which is required for payment requests via proxy.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+38"/>
- <source>Refund from %1</source>
+ <location line="+52"/>
+ <source>Payment request fetch URL is invalid: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
+ <location line="+27"/>
+ <source>Payment request file handling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Payment request file can not be read or processed! This can be caused by an invalid payment request file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+73"/>
+ <source>Unverified payment requests to custom payment scripts are unsupported.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+59"/>
+ <source>Refund from %1</source>
+ <translation>Reemborsament de %1</translation>
+ </message>
+ <message>
+ <location line="+43"/>
<source>Error communicating with %1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+24"/>
+ <source>Payment request can not be parsed or processed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
<source>Bad response from server %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+32"/>
+ <location line="+33"/>
<source>Payment acknowledged</source>
- <translation type="unfinished"/>
+ <translation>Pagament notificat</translation>
</message>
<message>
- <location line="-58"/>
- <location line="+30"/>
- <location line="+17"/>
+ <location line="-11"/>
<source>Network request error</source>
- <translation type="unfinished"/>
+ <translation>Error en la sol·licitud de xarxa</translation>
</message>
</context>
<context>
<name>QObject</name>
<message>
- <location filename="../bitcoin.cpp" line="+114"/>
- <location line="+5"/>
- <location filename="../intro.cpp" line="-32"/>
+ <location filename="../bitcoin.cpp" line="+71"/>
+ <location line="+11"/>
<source>Bitcoin</source>
- <translation type="unfinished"/>
+ <translation>Bitcoin</translation>
</message>
<message>
- <location line="-4"/>
+ <location line="+1"/>
<source>Error: Specified data directory &quot;%1&quot; does not exist.</source>
- <translation type="unfinished"/>
+ <translation>Error: El directori de dades específiques &quot;%1! no existeix.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="-12"/>
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../intro.cpp" line="+1"/>
- <source>Error: Specified data directory &quot;%1&quot; can not be created.</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>QRImageWidget</name>
<message>
- <location filename="../receiverequestdialog.cpp" line="+32"/>
+ <location filename="../receiverequestdialog.cpp" line="+36"/>
<source>&amp;Save Image...</source>
<translation type="unfinished"/>
</message>
@@ -1260,8 +1667,8 @@ Address: %4
</message>
<message>
<location line="+0"/>
- <source>PNG Images (*.png)</source>
- <translation>Imatges PNG (*.png)</translation>
+ <source>PNG Image (*.png)</source>
+ <translation>Imatge PNG (*.png)</translation>
</message>
</context>
<context>
@@ -1278,15 +1685,16 @@ Address: %4
<location line="+23"/>
<location line="+23"/>
<location line="+36"/>
- <location line="+53"/>
+ <location line="+23"/>
+ <location line="+36"/>
<location line="+23"/>
<location line="+23"/>
- <location filename="../rpcconsole.cpp" line="+352"/>
+ <location filename="../rpcconsole.cpp" line="+359"/>
<source>N/A</source>
<translation>N/A</translation>
</message>
<message>
- <location line="-217"/>
+ <location line="-223"/>
<source>Client version</source>
<translation>Versió del client</translation>
</message>
@@ -1296,7 +1704,17 @@ Address: %4
<translation>&amp;Informació</translation>
</message>
<message>
- <location line="+68"/>
+ <location line="-10"/>
+ <source>Debug window</source>
+ <translation>Depura finestra</translation>
+ </message>
+ <message>
+ <location line="+25"/>
+ <source>General</source>
+ <translation>General</translation>
+ </message>
+ <message>
+ <location line="+53"/>
<source>Using OpenSSL version</source>
<translation>Utilitzant OpenSSL versió</translation>
</message>
@@ -1312,16 +1730,16 @@ Address: %4
</message>
<message>
<location line="+7"/>
- <source>Number of connections</source>
- <translation>Nombre de connexions</translation>
+ <source>Name</source>
+ <translation>Nom</translation>
</message>
<message>
<location line="+23"/>
- <source>On testnet</source>
- <translation>A testnet</translation>
+ <source>Number of connections</source>
+ <translation>Nombre de connexions</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+29"/>
<source>Block chain</source>
<translation>Bloquejar cadena</translation>
</message>
@@ -1346,21 +1764,6 @@ Address: %4
<translation>&amp;Obrir</translation>
</message>
<message>
- <location line="+16"/>
- <source>Command-line options</source>
- <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>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>&amp;Mostrar</translation>
- </message>
- <message>
<location line="+24"/>
<source>&amp;Console</source>
<translation>&amp;Consola</translation>
@@ -1378,35 +1781,25 @@ Address: %4
<message>
<location line="+13"/>
<source>Totals</source>
- <translation type="unfinished"/>
+ <translation>Totals</translation>
</message>
<message>
<location line="+64"/>
<source>In:</source>
- <translation type="unfinished"/>
+ <translation>Dins:</translation>
</message>
<message>
<location line="+80"/>
<source>Out:</source>
- <translation type="unfinished"/>
+ <translation>Fora:</translation>
</message>
<message>
- <location line="-541"/>
+ <location line="-521"/>
<source>Build date</source>
<translation>Data de compilació</translation>
</message>
<message>
- <location line="-104"/>
- <source>Bitcoin - Debug window</source>
- <translation>Bitcoin -Finestra de debug</translation>
- </message>
- <message>
- <location line="+25"/>
- <source>Bitcoin Core</source>
- <translation>Nucli de Bitcoin</translation>
- </message>
- <message>
- <location line="+279"/>
+ <location line="+206"/>
<source>Debug log file</source>
<translation>Dietàri de debug</translation>
</message>
@@ -1416,7 +1809,7 @@ Address: %4
<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"/>
+ <location line="+76"/>
<source>Clear console</source>
<translation>Netejar consola</translation>
</message>
@@ -1436,29 +1829,29 @@ Address: %4
<translation>Escriu &lt;b&gt;help&lt;\b&gt; per a obtenir una llistat de les ordres disponibles.</translation>
</message>
<message>
- <location line="+128"/>
+ <location line="+122"/>
<source>%1 B</source>
- <translation type="unfinished"/>
+ <translation>%1 B</translation>
</message>
<message>
<location line="+2"/>
<source>%1 KB</source>
- <translation type="unfinished"/>
+ <translation>%1 KB</translation>
</message>
<message>
<location line="+2"/>
<source>%1 MB</source>
- <translation type="unfinished"/>
+ <translation>%1 MB</translation>
</message>
<message>
<location line="+2"/>
<source>%1 GB</source>
- <translation type="unfinished"/>
+ <translation>%1 GB</translation>
</message>
<message>
<location line="+7"/>
<source>%1 m</source>
- <translation type="unfinished"/>
+ <translation>%1 m</translation>
</message>
<message>
<location line="+5"/>
@@ -1468,93 +1861,113 @@ Address: %4
<message>
<location line="+2"/>
<source>%1 h %2 m</source>
- <translation type="unfinished"/>
+ <translation>%1 h %2 m</translation>
</message>
</context>
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+22"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
<source>&amp;Amount:</source>
- <translation type="unfinished"/>
+ <translation>&amp;Quantitat:</translation>
</message>
<message>
- <location line="+16"/>
- <source>The amount to request</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+7"/>
+ <location line="-13"/>
<source>&amp;Label:</source>
<translation>&amp;Etiqueta:</translation>
</message>
<message>
- <location line="+10"/>
- <source>The label to associate with the receiving address</source>
- <translation type="unfinished"/>
+ <location line="-34"/>
+ <source>&amp;Message:</source>
+ <translation>&amp;Missatge:</translation>
</message>
<message>
- <location line="+7"/>
- <source>&amp;Message:</source>
+ <location line="-17"/>
+ <source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>The message to attach to payment request</source>
+ <location line="+3"/>
+ <source>R&amp;euse an existing receiving address (not recommended)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
- <source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
+ <location line="+27"/>
+ <source>An optional label to associate with the new receiving address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>R&amp;euse an existing receiving address (not recommended)</source>
+ <location line="+7"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+7"/>
- <source>Use this form to request payments. All fields are optional.</source>
+ <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+39"/>
+ <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+17"/>
<source>Clear all fields of the form.</source>
- <translation type="unfinished"/>
+ <translation>Esborra tots els camps del formuari.</translation>
</message>
<message>
<location line="+3"/>
<source>Clear</source>
- <translation type="unfinished"/>
+ <translation>Esborra</translation>
</message>
<message>
<location line="+36"/>
<source>&amp;Request payment</source>
+ <translation>&amp;Sol·licitud de pagament</translation>
+ </message>
+ <message>
+ <location line="+47"/>
+ <source>Requested payments</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+16"/>
+ <source>Show the selected request (does the same as double clicking an entry)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Show</source>
+ <translation>Mostra</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Remove the selected entries from the list</source>
+ <translation>Esborra les entrades seleccionades de la llista</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Remove</source>
+ <translation>Esborra</translation>
+ </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
<message>
<location filename="../forms/receiverequestdialog.ui" line="+29"/>
<source>QR Code</source>
- <translation type="unfinished"/>
+ <translation> Codi QR</translation>
</message>
<message>
<location line="+46"/>
<source>Copy &amp;URI</source>
- <translation type="unfinished"/>
+ <translation>Copiar &amp;URI</translation>
</message>
<message>
<location line="+7"/>
<source>Copy &amp;Address</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+7"/>
- <source>&amp;Copy Image</source>
- <translation type="unfinished"/>
+ <translation>Copiar &amp;Adress</translation>
</message>
<message>
<location line="+7"/>
@@ -1562,19 +1975,19 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../receiverequestdialog.cpp" line="+58"/>
+ <location filename="../receiverequestdialog.cpp" line="+56"/>
<source>Request payment to %1</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+6"/>
<source>Payment information</source>
- <translation type="unfinished"/>
+ <translation>Informació de pagament</translation>
</message>
<message>
<location line="+1"/>
<source>URI</source>
- <translation type="unfinished"/>
+ <translation>URI</translation>
</message>
<message>
<location line="+2"/>
@@ -1608,16 +2021,119 @@ Address: %4
</message>
</context>
<context>
+ <name>RecentRequestsTableModel</name>
+ <message>
+ <location filename="../recentrequeststablemodel.cpp" line="+24"/>
+ <source>Date</source>
+ <translation>Data</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Label</source>
+ <translation>Etiqueta</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Message</source>
+ <translation>Missatge</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Amount</source>
+ <translation>Quantitat</translation>
+ </message>
+ <message>
+ <location line="+38"/>
+ <source>(no label)</source>
+ <translation>(sense etiqueta)</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>(no message)</source>
+ <translation>(sense missatge)</translation>
+ </message>
+</context>
+<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+140"/>
- <location line="+213"/>
+ <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location line="+80"/>
<source>Send Coins</source>
<translation>Enviar monedes</translation>
</message>
<message>
- <location line="+50"/>
+ <location line="+76"/>
+ <source>Coin Control Features</source>
+ <translation>(Opcions del control del Coin)</translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Inputs...</source>
+ <translation>Entrades</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>automatically selected</source>
+ <translation>Seleccionat automàticament</translation>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Insufficient funds!</source>
+ <translation>Fons insuficient</translation>
+ </message>
+ <message>
+ <location line="+89"/>
+ <source>Quantity:</source>
+ <translation>Quantitat:</translation>
+ </message>
+ <message>
+ <location line="+35"/>
+ <source>Bytes:</source>
+ <translation>Bytes:</translation>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Amount:</source>
+ <translation>Quantitat:</translation>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Priority:</source>
+ <translation>Prioritat:</translation>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Fee:</source>
+ <translation>Quota:</translation>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Low Output:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>After Fee:</source>
+ <translation>Quota posterior:</translation>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Change:</source>
+ <translation>Canvi:</translation>
+ </message>
+ <message>
+ <location line="+44"/>
+ <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Custom change address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+115"/>
<source>Send to multiple recipients at once</source>
<translation>Enviar a multiples destinataris al mateix temps</translation>
</message>
@@ -1629,7 +2145,7 @@ Address: %4
<message>
<location line="+20"/>
<source>Clear all fields of the form.</source>
- <translation type="unfinished"/>
+ <translation>Netejar tots els camps del formulari.</translation>
</message>
<message>
<location line="+3"/>
@@ -1642,12 +2158,7 @@ Address: %4
<translation>Balanç:</translation>
</message>
<message>
- <location line="+10"/>
- <source>123.456 BTC</source>
- <translation>123.456 BTC</translation>
- </message>
- <message>
- <location line="+31"/>
+ <location line="+41"/>
<source>Confirm the send action</source>
<translation>Confirmi l&apos;acció d&apos;enviament</translation>
</message>
@@ -1657,71 +2168,137 @@ Address: %4
<translation>E&amp;nviar</translation>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-154"/>
+ <location filename="../sendcoinsdialog.cpp" line="-228"/>
<source>Confirm send coins</source>
<translation>Confirmar l&apos;enviament de monedes</translation>
</message>
<message>
- <location line="-90"/>
+ <location line="-74"/>
<location line="+5"/>
<location line="+5"/>
+ <location line="+4"/>
<source>%1 to %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+26"/>
+ <location line="-136"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation>Introdueixi una adreça de Bitcoin (per exemple 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Copy quantity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation>Copiar quantitat</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy after fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy bytes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy low output</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy change</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+170"/>
+ <source>Total Amount %1 (= %2)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>or</source>
+ <translation>o</translation>
+ </message>
+ <message>
+ <location line="+202"/>
<source>The recipient address is not valid, please recheck.</source>
<translation>L&apos;adreça remetent no és vàlida, si us plau comprovi-la.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The amount to pay must be larger than 0.</source>
<translation>La quantitat a pagar ha de ser major que 0.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The amount exceeds your balance.</source>
<translation>Import superi el saldo de la seva compte.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The total exceeds your balance when the %1 transaction fee is included.</source>
<translation>El total excedeix el teu balanç quan s&apos;afegeix la comisió a la transacció %1.</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+3"/>
<source>Duplicate address found, can only send to each address once per send operation.</source>
<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="+4"/>
- <source>Error: Transaction creation failed!</source>
- <translation>Error: La ceació de la transacció ha fallat!</translation>
+ <location line="+3"/>
+ <source>Transaction creation failed!</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+15"/>
- <source>Are you sure you want to send?</source>
+ <location line="+4"/>
+ <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+9"/>
- <source>added as transaction fee</source>
+ <location line="+112"/>
+ <source>Warning: Invalid Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
- <source>Total Amount %1</source>
+ <location line="+21"/>
+ <source>(no label)</source>
+ <translation>(sense etiqueta)</translation>
+ </message>
+ <message>
+ <location line="-11"/>
+ <source>Warning: Unknown change address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+20"/>
- <source>Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
- <translation>Error: La transacció ha estat rebutjada. Això pot passar si alguna de les monedes del teu moneder ja s&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>
+ <location line="-366"/>
+ <source>Are you sure you want to send?</source>
+ <translation>Estàs segur que ho vols enviar?</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>added as transaction fee</source>
+ <translation>S&apos;ha afegit una taxa de transacció</translation>
</message>
<message>
- <location line="+144"/>
+ <location line="+170"/>
<source>Payment request expired</source>
- <translation type="unfinished"/>
+ <translation>La sol·licitud de pagament ha caducat</translation>
</message>
<message>
<location line="+8"/>
@@ -1732,39 +2309,44 @@ Address: %4
<context>
<name>SendCoinsEntry</name>
<message>
- <location filename="../forms/sendcoinsentry.ui" line="+33"/>
- <location line="+585"/>
+ <location filename="../forms/sendcoinsentry.ui" line="+131"/>
+ <location line="+521"/>
+ <location line="+536"/>
<source>A&amp;mount:</source>
<translation>Q&amp;uantitat:</translation>
</message>
<message>
- <location line="-572"/>
- <location line="+585"/>
+ <location line="-1152"/>
<source>Pay &amp;To:</source>
<translation>Pagar &amp;A:</translation>
</message>
<message>
- <location line="-551"/>
+ <location line="+18"/>
<source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>La adreça a on envia el pagament (per exemple: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location filename="../sendcoinsentry.cpp" line="+28"/>
+ <location filename="../sendcoinsentry.cpp" line="+30"/>
<source>Enter a label for this address to add it to your address book</source>
<translation>Introdueixi una etiquera per a aquesta adreça per afegir-la a la llibreta d&apos;adreces</translation>
</message>
<message>
- <location filename="../forms/sendcoinsentry.ui" line="-18"/>
+ <location filename="../forms/sendcoinsentry.ui" line="+57"/>
<source>&amp;Label:</source>
<translation>&amp;Etiqueta:</translation>
</message>
<message>
- <location line="+28"/>
+ <location line="-50"/>
<source>Choose previously used address</source>
+ <translation>Escull una adreça feta servir anteriorment</translation>
+ </message>
+ <message>
+ <location line="-40"/>
+ <source>This is a normal payment.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
+ <location line="+50"/>
<source>Alt+A</source>
<translation>Alta+A</translation>
</message>
@@ -1780,16 +2362,45 @@ Address: %4
</message>
<message>
<location line="+7"/>
- <source>Remove this recipient</source>
- <translation>Eliminar aquest destinatari</translation>
+ <location line="+524"/>
+ <location line="+536"/>
+ <source>Remove this entry</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="-1008"/>
+ <source>Message:</source>
+ <translation>Missatge:</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+958"/>
+ <source>This is a verified payment request.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-991"/>
<source>Enter a label for this address to add it to the list of used addresses</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+465"/>
+ <location line="+459"/>
+ <source>This is an unverified payment request.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+18"/>
+ <location line="+532"/>
+ <source>Pay To:</source>
+ <translation>Paga a:</translation>
+ </message>
+ <message>
+ <location line="-498"/>
+ <location line="+536"/>
<source>Memo:</source>
<translation type="unfinished"/>
</message>
@@ -1800,6 +2411,19 @@ Address: %4
</message>
</context>
<context>
+ <name>ShutdownWindow</name>
+ <message>
+ <location filename="../utilitydialog.cpp" line="+48"/>
+ <source>Bitcoin Core is shutting down...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Do not shut down the computer until this window disappears.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>SignVerifyMessageDialog</name>
<message>
<location filename="../forms/signverifymessagedialog.ui" line="+14"/>
@@ -1807,7 +2431,7 @@ Address: %4
<translation>Signatures .Signar/Verificar un Missatge</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+10"/>
<source>&amp;Sign Message</source>
<translation>&amp;Signar Missatge</translation>
</message>
@@ -1825,7 +2449,7 @@ Address: %4
<location line="+10"/>
<location line="+213"/>
<source>Choose previously used address</source>
- <translation type="unfinished"/>
+ <translation>Escull adreces fetes servir amb anterioritat</translation>
</message>
<message>
<location line="-203"/>
@@ -1910,7 +2534,7 @@ Address: %4
<translation>Neteja tots els camps de verificació de missatge</translation>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+27"/>
+ <location filename="../signverifymessagedialog.cpp" line="+29"/>
<location line="+3"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>Introdueixi una adreça de Bitcoin (per exemple 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
@@ -1926,7 +2550,7 @@ Address: %4
<translation>Introduïr una clau Bitcoin</translation>
</message>
<message>
- <location line="+85"/>
+ <location line="+84"/>
<location line="+81"/>
<source>The entered address is invalid.</source>
<translation>L&apos;adreça intoduïda és invàlida.</translation>
@@ -1995,8 +2619,13 @@ Address: %4
<context>
<name>SplashScreen</name>
<message>
- <location filename="../splashscreen.cpp" line="+23"/>
- <source>The Bitcoin developers</source>
+ <location filename="../splashscreen.cpp" line="+28"/>
+ <source>Bitcoin Core</source>
+ <translation>Nucli de Bitcoin</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
<message>
@@ -2008,15 +2637,15 @@ Address: %4
<context>
<name>TrafficGraphWidget</name>
<message>
- <location filename="../trafficgraphwidget.cpp" line="+75"/>
+ <location filename="../trafficgraphwidget.cpp" line="+79"/>
<source>KB/s</source>
- <translation type="unfinished"/>
+ <translation>KB/s</translation>
</message>
</context>
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="+22"/>
+ <location filename="../transactiondesc.cpp" line="+28"/>
<source>Open until %1</source>
<translation>Obert fins %1</translation>
</message>
@@ -2089,12 +2718,12 @@ Address: %4
<location line="+12"/>
<location line="+45"/>
<location line="+17"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Credit</source>
<translation>Crèdit</translation>
</message>
<message numerus="yes">
- <location line="-120"/>
+ <location line="-125"/>
<source>matures in %n more block(s)</source>
<translation><numerusform>disponible en %n bloc més</numerusform><numerusform>disponibles en %n blocs més</numerusform></translation>
</message>
@@ -2107,12 +2736,12 @@ Address: %4
<location line="+44"/>
<location line="+8"/>
<location line="+15"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Debit</source>
<translation>Dèbit</translation>
</message>
<message>
- <location line="-57"/>
+ <location line="-62"/>
<source>Transaction fee</source>
<translation>Comissió de transacció</translation>
</message>
@@ -2123,11 +2752,12 @@ Address: %4
</message>
<message>
<location line="+6"/>
+ <location line="+9"/>
<source>Message</source>
<translation>Missatge</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="-7"/>
<source>Comment</source>
<translation>Comentar</translation>
</message>
@@ -2137,9 +2767,9 @@ Address: %4
<translation>ID de transacció</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+18"/>
<source>Merchant</source>
- <translation type="unfinished"/>
+ <translation>Mercader</translation>
</message>
<message>
<location line="+7"/>
@@ -2177,7 +2807,7 @@ Address: %4
<translation>fals</translation>
</message>
<message>
- <location line="-227"/>
+ <location line="-232"/>
<source>, has not been successfully broadcast yet</source>
<translation>, encara no ha estat emès correctement</translation>
</message>
@@ -2208,7 +2838,7 @@ Address: %4
<context>
<name>TransactionTableModel</name>
<message>
- <location filename="../transactiontablemodel.cpp" line="+227"/>
+ <location filename="../transactiontablemodel.cpp" line="+234"/>
<source>Date</source>
<translation>Data</translation>
</message>
@@ -2227,8 +2857,13 @@ Address: %4
<source>Amount</source>
<translation>Quantitat</translation>
</message>
+ <message>
+ <location line="+59"/>
+ <source>Immature (%1 confirmations, will be available after %2)</source>
+ <translation type="unfinished"/>
+ </message>
<message numerus="yes">
- <location line="+57"/>
+ <location line="+16"/>
<source>Open for %n more block(s)</source>
<translation><numerusform>Obre per %n bloc més</numerusform><numerusform>Obre per %n blocs més</numerusform></translation>
</message>
@@ -2248,17 +2883,13 @@ Address: %4
<translation>Sense confirmar (%1 de %2 confirmacions)</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="-22"/>
+ <location line="+25"/>
<source>Confirmed (%1 confirmations)</source>
<translation>Confirmat (%1 confirmacions)</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>El saldo recent minat estarà disponible quan venci el termini en %n bloc més</numerusform><numerusform>El saldo recent minat estarà disponible quan venci el termini en %n blocs més</numerusform></translation>
- </message>
<message>
- <location line="+5"/>
+ <location line="-22"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation>Aquest bloc no ha estat rebut per cap altre node i probablement no serà acceptat!</translation>
</message>
@@ -2268,7 +2899,7 @@ Address: %4
<translation>Generat però no acceptat</translation>
</message>
<message>
- <location line="+43"/>
+ <location line="+62"/>
<source>Received with</source>
<translation>Rebut amb</translation>
</message>
@@ -2326,7 +2957,7 @@ Address: %4
<context>
<name>TransactionView</name>
<message>
- <location filename="../transactionview.cpp" line="+52"/>
+ <location filename="../transactionview.cpp" line="+57"/>
<location line="+16"/>
<source>All</source>
<translation>Tot</translation>
@@ -2387,12 +3018,12 @@ Address: %4
<translation>Altres</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+6"/>
<source>Enter address or label to search</source>
<translation>Introdueix una adreça o una etiqueta per cercar</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+6"/>
<source>Min amount</source>
<translation>Quantitat mínima</translation>
</message>
@@ -2427,17 +3058,37 @@ Address: %4
<translation>Mostra detalls de la transacció</translation>
</message>
<message>
- <location line="+143"/>
- <source>Export Transaction Data</source>
- <translation>Exportar detalls de la transacció </translation>
+ <location line="+142"/>
+ <source>Export Transaction History</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="+19"/>
+ <source>Exporting Failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>There was an error trying to save the transaction history to %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Exporting Successful</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The transaction history was successfully saved to %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-22"/>
<source>Comma separated file (*.csv)</source>
<translation>Arxiu de separació per comes (*.csv)</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+9"/>
<source>Confirmed</source>
<translation>Confirmat</translation>
</message>
@@ -2472,17 +3123,7 @@ Address: %4
<translation>ID</translation>
</message>
<message>
- <location line="+4"/>
- <source>Error exporting</source>
- <translation>Error en l&apos;exportació</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation>No s&apos;ha pogut escriure a l&apos;arxiu %1.</translation>
- </message>
- <message>
- <location line="+100"/>
+ <location line="+107"/>
<source>Range:</source>
<translation>Rang:</translation>
</message>
@@ -2493,9 +3134,17 @@ Address: %4
</message>
</context>
<context>
+ <name>WalletFrame</name>
+ <message>
+ <location filename="../walletframe.cpp" line="+26"/>
+ <source>No wallet has been loaded.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>WalletModel</name>
<message>
- <location filename="../walletmodel.cpp" line="+218"/>
+ <location filename="../walletmodel.cpp" line="+245"/>
<source>Send Coins</source>
<translation>Enviar monedes</translation>
</message>
@@ -2503,75 +3152,70 @@ Address: %4
<context>
<name>WalletView</name>
<message>
- <location filename="../walletview.cpp" line="+46"/>
+ <location filename="../walletview.cpp" line="+43"/>
<source>&amp;Export</source>
- <translation type="unfinished"/>
+ <translation>&amp;Exportar</translation>
</message>
<message>
<location line="+1"/>
<source>Export the data in the current tab to a file</source>
- <translation type="unfinished"/>
+ <translation>Exportar les dades de la pestanya actual a un arxiu</translation>
</message>
<message>
- <location line="+183"/>
+ <location line="+181"/>
<source>Backup Wallet</source>
<translation>Realitzar còpia de seguretat del moneder</translation>
</message>
<message>
- <location line="+0"/>
+ <location line="+1"/>
<source>Wallet Data (*.dat)</source>
<translation>Dades del moneder (*.dat)</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="+6"/>
<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>
+ <source>There was an error trying to save the wallet data to %1.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+4"/>
- <source>Backup Successful</source>
- <translation>Copia de seguretat realitzada correctament</translation>
+ <source>The wallet data was successfully saved to %1.</source>
+ <translation type="unfinished"/>
</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>
+ <source>Backup Successful</source>
+ <translation>Copia de seguretat realitzada correctament</translation>
</message>
</context>
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+102"/>
- <source>Bitcoin version</source>
- <translation>Versió de Bitcoin</translation>
- </message>
- <message>
- <location line="+107"/>
+ <location filename="../bitcoinstrings.cpp" line="+221"/>
<source>Usage:</source>
<translation>Ús:</translation>
</message>
<message>
- <location line="-55"/>
+ <location line="-54"/>
<source>List commands</source>
<translation>Llista d&apos;ordres</translation>
</message>
<message>
- <location line="-13"/>
+ <location line="-14"/>
<source>Get help for a command</source>
<translation>Obtenir ajuda per a un ordre.</translation>
</message>
<message>
- <location line="+25"/>
+ <location line="+26"/>
<source>Options:</source>
<translation>Opcions:</translation>
</message>
<message>
- <location line="+24"/>
+ <location line="+22"/>
<source>Specify configuration file (default: bitcoin.conf)</source>
<translation>Especificat arxiu de configuració (per defecte: bitcoin.conf)</translation>
</message>
@@ -2591,7 +3235,7 @@ Address: %4
<translation>Establir tamany de la memoria cau en megabytes (per defecte: 25)</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-26"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
<translation>Escoltar connexions a &lt;port&gt; (per defecte: 8333 o testnet: 18333)</translation>
</message>
@@ -2601,7 +3245,7 @@ Address: %4
<translation>Mantenir com a molt &lt;n&gt; connexions a peers (per defecte: 125)</translation>
</message>
<message>
- <location line="-49"/>
+ <location line="-51"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation>Connectar al node per obtenir les adreces de les connexions, i desconectar</translation>
</message>
@@ -2611,37 +3255,37 @@ Address: %4
<translation>Especificar la teva adreça pública</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation>Límit per a desconectar connexions errònies (per defecte: 100)</translation>
</message>
<message>
- <location line="-142"/>
+ <location line="-148"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation>Nombre de segons abans de reconectar amb connexions errònies (per defecte: 86400)</translation>
</message>
<message>
- <location line="-33"/>
+ <location line="-36"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
<translation>Ha sorgit un error al configurar el port RPC %u escoltant a IPv4: %s</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation>Escoltar connexions JSON-RPC al port &lt;port&gt; (per defecte: 8332 o testnet:18332)</translation>
</message>
<message>
- <location line="+40"/>
+ <location line="+45"/>
<source>Accept command line and JSON-RPC commands</source>
<translation>Acceptar línia d&apos;ordres i ordres JSON-RPC </translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>Executar en segon pla com a programa dimoni i acceptar ordres</translation>
</message>
<message>
- <location line="+40"/>
+ <location line="+39"/>
<source>Use the test network</source>
<translation>Usar la xarxa de prova</translation>
</message>
@@ -2651,7 +3295,7 @@ Address: %4
<translation>Aceptar connexions d&apos;afora (per defecte: 1 si no -proxy o -connect)</translation>
</message>
<message>
- <location line="-87"/>
+ <location line="-95"/>
<source>%s, you must set a rpcpassword in the configuration file:
%s
It is recommended you use the following random password:
@@ -2692,6 +3336,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+4"/>
+ <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</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>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>
@@ -2706,17 +3355,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<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>Establir una mida màxima de transaccions d&apos;alta prioritat/baixa comisió en bytes (per defecte: 27000)</translation>
- </message>
- <message>
- <location line="+6"/>
+ <location line="+18"/>
<source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
<translation>Aquesta és una versió de pre-llançament - utilitza-la sota la teva responsabilitat - No usar per a minería o aplicacions de compra-venda</translation>
</message>
<message>
<location line="+5"/>
+ <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
<source>Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source>
<translation>Advertència: el -paytxfee és molt elevat! Aquesta és la comissió de transacció que pagaràs quan enviis una transacció.</translation>
</message>
@@ -2746,17 +3395,27 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<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"/>
+ <location line="+9"/>
+ <source>&lt;category&gt; can be:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
<source>Attempt to recover private keys from a corrupt wallet.dat</source>
<translation>Intentar recuperar les claus privades d&apos;un arxiu wallet.dat corrupte</translation>
</message>
<message>
<location line="+1"/>
- <source>Bitcoin RPC client version</source>
+ <source>Bitcoin Core Daemon</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
+ <source>Bitcoin RPC client version</source>
+ <translation>Versió RPC del client Bitcoin</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Block creation options:</source>
<translation>Opcions de la creació de blocs:</translation>
</message>
@@ -2766,7 +3425,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Connectar només al(s) node(s) especificats</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
+ <source>Connect through SOCKS proxy</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect to JSON-RPC on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation type="unfinished"/>
</message>
@@ -2782,6 +3446,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+1"/>
+ <source>Do not load the wallet and disable wallet RPC calls</source>
+ <translation type="unfinished"/>
+ </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>
@@ -2876,14 +3545,19 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Ha fallat el desfer de dades</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
+ <source>Fee per kB to add to transactions you send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Find peers using DNS lookup (default: 1 unless -connect)</source>
<translation>Cerca punts de connexió usant rastreig de DNS (per defecte: 1 tret d&apos;usar -connect)</translation>
</message>
<message>
<location line="+1"/>
<source>Generate coins (default: 0)</source>
- <translation type="unfinished"/>
+ <translation>Generar monedes (estàndard: 0)</translation>
</message>
<message>
<location line="+2"/>
@@ -2896,6 +3570,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Com verificar el bloc (0-4, per defecte 3)</translation>
</message>
<message>
+ <location line="+1"/>
+ <source>If &lt;category&gt; is not supplied, output all debugging information.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+2"/>
<source>Incorrect or no genesis block found. Wrong datadir for network?</source>
<translation type="unfinished"/>
@@ -2911,37 +3590,62 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+8"/>
+ <location line="+5"/>
+ <source>Prepend debug output with timestamp (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>RPC client options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<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="+6"/>
+ <location line="+5"/>
+ <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Send command to Bitcoin server</source>
+ <translation>Enviar comandament al servidor de Bitcoin</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Set maximum block size in bytes (default: %d)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
+ <location line="+2"/>
<source>Set the number of threads to service RPC calls (default: 4)</source>
<translation>Estableix el nombre de fils per atendre trucades RPC (per defecte: 4)</translation>
</message>
<message>
<location line="+7"/>
<source>Specify wallet file (within data directory)</source>
- <translation type="unfinished"/>
+ <translation>Especifica un arxiu de moneder (dintre del directori de les dades)</translation>
</message>
<message>
<location line="+2"/>
<source>Start Bitcoin server</source>
+ <translation>Arranca el servidor de Bitcoin</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>This is intended for regression testing tools and app development.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+12"/>
+ <location line="+10"/>
<source>Usage (deprecated, use bitcoin-cli):</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+8"/>
+ <location line="+7"/>
<source>Verifying blocks...</source>
<translation>Verificant blocs...</translation>
</message>
@@ -2952,31 +3656,56 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+1"/>
+ <source>Wait for RPC server to start</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Wallet %s resides outside data directory %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+2"/>
+ <source>Wallet options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>You need to rebuild the database using -reindex to change -txindex</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-78"/>
+ <location line="-79"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation>Importa blocs de un fitxer blk000??.dat extern</translation>
</message>
<message>
- <location line="-98"/>
+ <location line="-105"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+17"/>
+ <location line="+14"/>
+ <source>Output debugging information (default: 0, supplying &lt;category&gt; is optional)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+83"/>
+ <location line="+89"/>
<source>Information</source>
<translation>&amp;Informació</translation>
</message>
@@ -3016,47 +3745,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<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>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>Sortida de la informació extra de debugging de xarxa.</translation>
- </message>
- <message>
- <location line="+2"/>
- <source>Prepend debug output with timestamp</source>
- <translation>Anteposar estampa temporal a les dades de debug</translation>
- </message>
- <message>
- <location line="+5"/>
+ <location line="+9"/>
<source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
<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>Selecciona la versió de socks proxy a utilitzar (4-5, per defecte: 5)</translation>
- </message>
- <message>
- <location line="+3"/>
+ <location line="+4"/>
<source>Send trace/debug info to console instead of debug.log file</source>
<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>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>Establir una mida màxima de bloc en bytes (per defecte: 250000)</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+6"/>
<source>Set minimum block size in bytes (default: 0)</source>
<translation>Establir una mida mínima de bloc en bytes (per defecte: 0)</translation>
</message>
@@ -3081,7 +3780,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Error de sistema:</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Transaction amount too small</source>
<translation type="unfinished"/>
</message>
@@ -3106,32 +3805,32 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<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>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>Nom d&apos;usuari per a connexions JSON-RPC</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+7"/>
<source>Warning</source>
<translation>Avís</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Warning: This version is obsolete, upgrade required!</source>
<translation>Advertència: Aquetsa versió està obsoleta, és necessari actualitzar!</translation>
</message>
<message>
<location line="+2"/>
+ <source>version</source>
+ <translation>versió</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>wallet.dat corrupt, salvage failed</source>
<translation>L&apos;arxiu wallet.data és corrupte, el rescat de les dades ha fallat</translation>
</message>
<message>
- <location line="-54"/>
+ <location line="-58"/>
<source>Password for JSON-RPC connections</source>
<translation>Contrasenya per a connexions JSON-RPC</translation>
</message>
@@ -3141,27 +3840,27 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Permetre connexions JSON-RPC d&apos;adreces IP específiques</translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation>Enviar ordre al node en execució a &lt;ip&gt; (per defecte: 127.0.0.1)</translation>
</message>
<message>
- <location line="-126"/>
+ <location line="-132"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation>Executar orde quan el millor bloc canviï (%s al cmd es reemplaça per un bloc de hash)</translation>
</message>
<message>
- <location line="+155"/>
+ <location line="+161"/>
<source>Upgrade wallet to latest format</source>
<translation>Actualitzar moneder a l&apos;últim format</translation>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation>Establir límit de nombre de claus a &lt;n&gt; (per defecte: 100)</translation>
</message>
<message>
- <location line="-12"/>
+ <location line="-11"/>
<source>Rescan the block chain for missing wallet transactions</source>
<translation>Re-escanejar cadena de blocs en cerca de transaccions de moneder perdudes</translation>
</message>
@@ -3171,7 +3870,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Utilitzar OpenSSL (https) per a connexions JSON-RPC</translation>
</message>
<message>
- <location line="-29"/>
+ <location line="-30"/>
<source>Server certificate file (default: server.cert)</source>
<translation>Arxiu del certificat de servidor (per defecte: server.cert)</translation>
</message>
@@ -3186,27 +3885,22 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Aquest misatge d&apos;ajuda</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Unable to bind to %s on this computer (bind returned error %d, %s)</source>
<translation>Impossible d&apos;unir %s a aquest ordinador (s&apos;ha retornat l&apos;error %d, %s)</translation>
</message>
<message>
- <location line="-95"/>
- <source>Connect through socks proxy</source>
- <translation>Connectar a través de socks proxy</translation>
- </message>
- <message>
- <location line="-11"/>
+ <location line="-107"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation>Permetre consultes DNS per a -addnode, -seednode i -connect</translation>
</message>
<message>
- <location line="+58"/>
+ <location line="+60"/>
<source>Loading addresses...</source>
<translation>Carregant adreces...</translation>
</message>
<message>
- <location line="-36"/>
+ <location line="-37"/>
<source>Error loading wallet.dat: Wallet corrupted</source>
<translation>Error carregant wallet.dat: Moneder corrupte</translation>
</message>
@@ -3226,12 +3920,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Error carregant wallet.dat</translation>
</message>
<message>
- <location line="+30"/>
+ <location line="+31"/>
<source>Invalid -proxy address: &apos;%s&apos;</source>
<translation>Adreça -proxy invalida: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+57"/>
+ <location line="+56"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation>Xarxa desconeguda especificada a -onlynet: &apos;%s&apos;</translation>
</message>
@@ -3241,7 +3935,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>S&apos;ha demanat una versió desconeguda de -socks proxy: %i</translation>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation>No es pot resoldre l&apos;adreça -bind: &apos;%s&apos;</translation>
</message>
@@ -3251,7 +3945,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>No es pot resoldre l&apos;adreça -externalip: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+46"/>
+ <location line="+48"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation>Quantitat invalida per a -paytxfee=&lt;amount&gt;: &apos;%s&apos;</translation>
</message>
@@ -3271,27 +3965,22 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Carregant índex de blocs...</translation>
</message>
<message>
- <location line="-60"/>
+ <location line="-62"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation>Afegir un node per a connectar&apos;s-hi i intentar mantenir la connexió oberta</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-32"/>
<source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source>
<translation>Impossible d&apos;unir %s en aquest ordinador. Probablement Bitcoin ja estigui en execució.</translation>
</message>
<message>
- <location line="+69"/>
- <source>Fee per KB to add to transactions you send</source>
- <translation>Comisió a afegir per cada KB de transaccions que enviïs</translation>
- </message>
- <message>
- <location line="+20"/>
+ <location line="+95"/>
<source>Loading wallet...</source>
<translation>Carregant moneder...</translation>
</message>
<message>
- <location line="-54"/>
+ <location line="-56"/>
<source>Cannot downgrade wallet</source>
<translation>No es pot reduir la versió del moneder</translation>
</message>
@@ -3301,7 +3990,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>No es pot escriure l&apos;adreça per defecte</translation>
</message>
<message>
- <location line="+66"/>
+ <location line="+67"/>
<source>Rescanning...</source>
<translation>Re-escanejant...</translation>
</message>
@@ -3321,7 +4010,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Error</translation>
</message>
<message>
- <location line="-33"/>
+ <location line="-35"/>
<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_cs.ts b/src/qt/locale/bitcoin_cs.ts
index cccfa9ecbd..668afd3acc 100644
--- a/src/qt/locale/bitcoin_cs.ts
+++ b/src/qt/locale/bitcoin_cs.ts
@@ -3,13 +3,13 @@
<name>AboutDialog</name>
<message>
<location filename="../forms/aboutdialog.ui" line="+14"/>
- <source>About Bitcoin</source>
- <translation>O Bitcoinu</translation>
+ <source>About Bitcoin Core</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+39"/>
- <source>&lt;b&gt;Bitcoin&lt;/b&gt; version</source>
- <translation>&lt;b&gt;Bitcoin&lt;/b&gt; verze</translation>
+ <source>&lt;b&gt;Bitcoin Core&lt;/b&gt; version</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+57"/>
@@ -27,14 +27,14 @@ Tohle je experimentální program.
Tento produkt zahrnuje programy vyvinuté OpenSSL Projektem pro použití v OpenSSL Toolkitu (http://www.openssl.org/) a kryptografický program od Erika Younga (eay@cryptsoft.com) a program UPnP od Thomase Bernarda.</translation>
</message>
<message>
- <location filename="../aboutdialog.cpp" line="+14"/>
+ <location filename="../utilitydialog.cpp" line="+29"/>
<source>Copyright</source>
<translation>Copyright</translation>
</message>
<message>
<location line="+0"/>
- <source>The Bitcoin developers</source>
- <translation>Vývojáři Bitcoinu</translation>
+ <source>The Bitcoin Core developers</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -70,7 +70,7 @@ Tento produkt zahrnuje programy vyvinuté OpenSSL Projektem pro použití v Open
<translation type="unfinished"/>
</message>
<message>
- <location filename="../addressbookpage.cpp" line="+72"/>
+ <location filename="../addressbookpage.cpp" line="+74"/>
<source>&amp;Copy Address</source>
<translation>&amp;Kopíruj adresu</translation>
</message>
@@ -140,7 +140,7 @@ Tento produkt zahrnuje programy vyvinuté OpenSSL Projektem pro použití v Open
<translation>&amp;Uprav</translation>
</message>
<message>
- <location line="+197"/>
+ <location line="+194"/>
<source>Export Address List</source>
<translation type="unfinished"/>
</message>
@@ -151,19 +151,19 @@ Tento produkt zahrnuje programy vyvinuté OpenSSL Projektem pro použití v Open
</message>
<message>
<location line="+13"/>
- <source>Error exporting</source>
- <translation>Chyba při exportu</translation>
+ <source>Exporting Failed</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation>Nemohu zapisovat do souboru %1.</translation>
+ <location line="+1"/>
+ <source>There was an error trying to save the address list to %1.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<name>AddressTableModel</name>
<message>
- <location filename="../addresstablemodel.cpp" line="+164"/>
+ <location filename="../addresstablemodel.cpp" line="+168"/>
<source>Label</source>
<translation>OznaÄení</translation>
</message>
@@ -201,7 +201,7 @@ Tento produkt zahrnuje programy vyvinuté OpenSSL Projektem pro použití v Open
<translation>Totéž heslo ještě jednou</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="+34"/>
+ <location filename="../askpassphrasedialog.cpp" line="+40"/>
<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>Zadej nové heslo k peněžence.&lt;br/&gt;Použij &lt;b&gt;alespoň 10 náhodných znaků&lt;/b&gt; nebo &lt;b&gt;alespoň osm slov&lt;/b&gt;.</translation>
</message>
@@ -322,22 +322,27 @@ Tento produkt zahrnuje programy vyvinuté OpenSSL Projektem pro použití v Open
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+250"/>
+ <location filename="../bitcoingui.cpp" line="+295"/>
<source>Sign &amp;message...</source>
<translation>Po&amp;depiš zprávu...</translation>
</message>
<message>
- <location line="+254"/>
+ <location line="+335"/>
<source>Synchronizing with network...</source>
<translation>Synchronizuji se se sítí...</translation>
</message>
<message>
- <location line="-324"/>
+ <location line="-407"/>
<source>&amp;Overview</source>
<translation>&amp;Přehled</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="-137"/>
+ <source>Node</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+138"/>
<source>Show general overview of wallet</source>
<translation>Zobraz celkový přehled peněženky</translation>
</message>
@@ -352,7 +357,7 @@ Tento produkt zahrnuje programy vyvinuté OpenSSL Projektem pro použití v Open
<translation>Procházej historii transakcí</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>E&amp;xit</source>
<translation>&amp;Konec</translation>
</message>
@@ -398,7 +403,22 @@ Tento produkt zahrnuje programy vyvinuté OpenSSL Projektem pro použití v Open
<translation>Změň &amp;heslo...</translation>
</message>
<message>
- <location line="+259"/>
+ <location line="+10"/>
+ <source>&amp;Sending addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Receiving addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open &amp;URI...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+325"/>
<source>Importing blocks from disk...</source>
<translation>Importuji bloky z disku...</translation>
</message>
@@ -408,12 +428,12 @@ Tento produkt zahrnuje programy vyvinuté OpenSSL Projektem pro použití v Open
<translation>Vytvářím nový index bloků na disku...</translation>
</message>
<message>
- <location line="-322"/>
+ <location line="-405"/>
<source>Send coins to a Bitcoin address</source>
<translation>Pošli mince na Bitcoinovou adresu</translation>
</message>
<message>
- <location line="+47"/>
+ <location line="+49"/>
<source>Modify configuration options for Bitcoin</source>
<translation>Uprav nastavení Bitcoinu</translation>
</message>
@@ -443,20 +463,17 @@ Tento produkt zahrnuje programy vyvinuté OpenSSL Projektem pro použití v Open
<translation>&amp;Ověř zprávu...</translation>
</message>
<message>
- <location line="-180"/>
- <location line="+6"/>
- <location line="+513"/>
+ <location line="+430"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-519"/>
- <location line="+6"/>
+ <location line="-643"/>
<source>Wallet</source>
<translation>Peněženka</translation>
</message>
<message>
- <location line="+109"/>
+ <location line="+146"/>
<source>&amp;Send</source>
<translation>&amp;Pošli</translation>
</message>
@@ -466,13 +483,7 @@ Tento produkt zahrnuje programy vyvinuté OpenSSL Projektem pro použití v Open
<translation>Při&amp;jmi</translation>
</message>
<message>
- <location line="+28"/>
- <location line="+2"/>
- <source>&amp;About Bitcoin</source>
- <translation>O &amp;Bitcoinu</translation>
- </message>
- <message>
- <location line="+14"/>
+ <location line="+46"/>
<location line="+2"/>
<source>&amp;Show / Hide</source>
<translation>&amp;Zobraz/Skryj</translation>
@@ -498,64 +509,80 @@ Tento produkt zahrnuje programy vyvinuté OpenSSL Projektem pro použití v Open
<translation>Ověř zprávy, aby ses ujistil, že byly podepsány danými Bitcoinovými adresami</translation>
</message>
<message>
- <location line="+35"/>
+ <location line="+48"/>
<source>&amp;File</source>
<translation>&amp;Soubor</translation>
</message>
<message>
- <location line="+10"/>
+ <location line="+14"/>
<source>&amp;Settings</source>
<translation>&amp;Nastavení</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>&amp;Help</source>
<translation>Ná&amp;pověda</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+15"/>
<source>Tabs toolbar</source>
<translation>Panel s listy</translation>
</message>
<message>
- <location line="-235"/>
- <location line="+294"/>
+ <location line="-284"/>
+ <location line="+376"/>
<source>[testnet]</source>
<translation>[testnet]</translation>
</message>
<message>
- <location line="-177"/>
+ <location line="-401"/>
+ <source>Bitcoin Core</source>
+ <translation>Jádro Bitcoinu</translation>
+ </message>
+ <message>
+ <location line="+163"/>
<source>Request payments (generates QR codes and bitcoin: URIs)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+63"/>
- <source>&amp;Used sending addresses...</source>
+ <location line="+29"/>
+ <location line="+2"/>
+ <source>&amp;About Bitcoin Core</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="+35"/>
<source>Show the list of used sending addresses and labels</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Used &amp;receiving addresses...</source>
+ <location line="+2"/>
+ <source>Show the list of used receiving addresses and labels</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open a bitcoin: URI or payment request</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Command-line options</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
- <source>Show the list of used receiving addresses and labels</source>
+ <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+106"/>
+ <location line="+159"/>
<location line="+5"/>
<source>Bitcoin client</source>
<translation>Bitcoin klient</translation>
</message>
<message numerus="yes">
- <location line="+120"/>
+ <location line="+142"/>
<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>
@@ -575,7 +602,7 @@ Tento produkt zahrnuje programy vyvinuté OpenSSL Projektem pro použití v Open
<translation>Zpracováno %1 bloků transakÄní historie.</translation>
</message>
<message numerus="yes">
- <location line="+20"/>
+ <location line="+23"/>
<source>%n hour(s)</source>
<translation><numerusform>hodinu</numerusform><numerusform>%n hodiny</numerusform><numerusform>%n hodin</numerusform></translation>
</message>
@@ -595,7 +622,7 @@ Tento produkt zahrnuje programy vyvinuté OpenSSL Projektem pro použití v Open
<translation>Stahuji ještě bloky transakcí za poslední %1</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="+21"/>
<source>Last received block was generated %1 ago.</source>
<translation>Poslední stažený blok byl vygenerován %1 zpátky.</translation>
</message>
@@ -620,27 +647,17 @@ Tento produkt zahrnuje programy vyvinuté OpenSSL Projektem pro použití v Open
<translation>Informace</translation>
</message>
<message>
- <location line="+77"/>
- <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="-152"/>
+ <location line="-85"/>
<source>Up to date</source>
<translation>Aktuální</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Catching up...</source>
<translation>Stahuji...</translation>
</message>
<message>
- <location line="+124"/>
- <source>Confirm transaction fee</source>
- <translation>PotvrÄ transakÄní poplatek</translation>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+130"/>
<source>Sent transaction</source>
<translation>Odeslané transakce</translation>
</message>
@@ -663,17 +680,7 @@ Adresa: %4
</translation>
</message>
<message>
- <location line="+34"/>
- <source>URI handling</source>
- <translation>Zpracování URI</translation>
- </message>
- <message>
- <location line="+0"/>
- <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>
- <message>
- <location line="+45"/>
+ <location line="+69"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation>Peněženka je &lt;b&gt;zaÅ¡ifrovaná&lt;/b&gt; a momentálnÄ› &lt;b&gt;odemÄená&lt;/b&gt;</translation>
</message>
@@ -683,7 +690,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 filename="../bitcoin.cpp" line="+110"/>
+ <location filename="../bitcoin.cpp" line="+438"/>
<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>
@@ -691,12 +698,304 @@ Adresa: %4
<context>
<name>ClientModel</name>
<message>
- <location filename="../clientmodel.cpp" line="+115"/>
+ <location filename="../clientmodel.cpp" line="+119"/>
<source>Network Alert</source>
<translation>Upozornění sítě</translation>
</message>
</context>
<context>
+ <name>CoinControlDialog</name>
+ <message>
+ <location filename="../forms/coincontroldialog.ui" line="+14"/>
+ <source>Coin Control Address Selection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>Quantity:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Bytes:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>Amount:</source>
+ <translation>Částka:</translation>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Priority:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Low Output:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>After Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Change:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+63"/>
+ <source>(un)select all</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Tree mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>List mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>Amount</source>
+ <translation>Částka</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Address</source>
+ <translation>Adresa</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Date</source>
+ <translation>Datum</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Confirmations</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Confirmed</source>
+ <translation>Potvrzeno</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../coincontroldialog.cpp" line="+42"/>
+ <source>Copy address</source>
+ <translation>Kopírovat sdresu</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy label</source>
+ <translation>Kopírovat popis</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+26"/>
+ <source>Copy amount</source>
+ <translation>Kopíruj Äástku</translation>
+ </message>
+ <message>
+ <location line="-25"/>
+ <source>Copy transaction ID</source>
+ <translation>Kopíruj ID transakce</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Lock unspent</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Unlock unspent</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+22"/>
+ <source>Copy quantity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Copy fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy after fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy bytes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy low output</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy change</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+323"/>
+ <source>highest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>higher</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>high</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>medium-high</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>medium</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>low-medium</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>low</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>lower</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>lowest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>(%1 locked)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+140"/>
+ <source>Dust</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>yes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>no</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>This label turns red, if the transaction size is greater than 1000 bytes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+5"/>
+ <source>This means a fee of at least %1 per kB is required.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-4"/>
+ <source>Can vary +/- 1 byte per input.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Transactions with higher priority are more likely to get included into a block.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>This label turns red, if the priority is smaller than &quot;medium&quot;.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>This label turns red, if any recipient receives an amount smaller than %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+4"/>
+ <source>This means a fee of at least %1 is required.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-3"/>
+ <source>Amounts below 0.546 times the minimum relay fee are shown as dust.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>This label turns red, if the change is smaller than %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
+ <location line="+66"/>
+ <source>(no label)</source>
+ <translation>(bez popisu)</translation>
+ </message>
+ <message>
+ <location line="-9"/>
+ <source>change from %1 (%2)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>(change)</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>EditAddressDialog</name>
<message>
<location filename="../forms/editaddressdialog.ui" line="+14"/>
@@ -724,7 +1023,7 @@ Adresa: %4
<translation>&amp;Adresa</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+21"/>
+ <location filename="../editaddressdialog.cpp" line="+28"/>
<source>New receiving address</source>
<translation>Nová přijímací adresa</translation>
</message>
@@ -767,7 +1066,7 @@ Adresa: %4
<context>
<name>FreespaceChecker</name>
<message>
- <location filename="../intro.cpp" line="+61"/>
+ <location filename="../intro.cpp" line="+65"/>
<source>A new data directory will be created.</source>
<translation>Vytvoří se nový adresář pro data.</translation>
</message>
@@ -793,15 +1092,19 @@ Adresa: %4
</message>
</context>
<context>
- <name>GUIUtil::HelpMessageBox</name>
+ <name>HelpMessageDialog</name>
<message>
- <location filename="../guiutil.cpp" line="+558"/>
- <location line="+13"/>
- <source>Bitcoin-Qt</source>
- <translation>Bitcoin-Qt</translation>
+ <location filename="../forms/helpmessagedialog.ui" line="+19"/>
+ <source>Bitcoin Core - Command-line options</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="-13"/>
+ <location filename="../utilitydialog.cpp" line="+38"/>
+ <source>Bitcoin Core</source>
+ <translation>Jádro Bitcoinu</translation>
+ </message>
+ <message>
+ <location line="+0"/>
<source>version</source>
<translation>verze</translation>
</message>
@@ -850,18 +1153,18 @@ Adresa: %4
</message>
<message>
<location line="+9"/>
- <source>Welcome to Bitcoin-Qt.</source>
- <translation>Vítej v Bitcoin-Qt.</translation>
+ <source>Welcome to Bitcoin Core.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+26"/>
- <source>As this is the first time the program is launched, you can choose where Bitcoin-Qt will store its data.</source>
- <translation>Tohle je poprvé, co spouštíš Bitcoin-Qt, takže si můžeš zvolit, kam bude ukládat svá data.</translation>
+ <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+10"/>
- <source>Bitcoin-Qt will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
- <translation>Bitcoin-Qt bude stahovat kopii Å™etÄ›zce bloků. Proto bude potÅ™eba do tohoto adresáře uložit nejménÄ› %1 GB dat – toto Äíslo bude navíc v průbÄ›hu Äasu pomalu růst. Tvá peněženka bude rovněž uložena v tomto adresáři.</translation>
+ <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+10"/>
@@ -874,7 +1177,17 @@ Adresa: %4
<translation>Použij tento adresář pro data:</translation>
</message>
<message>
- <location filename="../intro.cpp" line="+105"/>
+ <location filename="../intro.cpp" line="+85"/>
+ <source>Bitcoin</source>
+ <translation>Bitcoin</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error: Specified data directory &quot;%1&quot; can not be created.</source>
+ <translation>Chyba: Nejde vytvořit požadovaný adresář pro data „%1“.</translation>
+ </message>
+ <message>
+ <location line="+19"/>
<source>Error</source>
<translation>Chyba</translation>
</message>
@@ -890,6 +1203,34 @@ Adresa: %4
</message>
</context>
<context>
+ <name>OpenURIDialog</name>
+ <message>
+ <location filename="../forms/openuridialog.ui" line="+14"/>
+ <source>Open URI</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Open payment request from URI or file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>URI:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Select payment request file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../openuridialog.cpp" line="+47"/>
+ <source>Select payment request file to open</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OptionsDialog</name>
<message>
<location filename="../forms/optionsdialog.ui" line="+14"/>
@@ -897,7 +1238,7 @@ Adresa: %4
<translation>Možnosti</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+13"/>
<source>&amp;Main</source>
<translation>&amp;Hlavní</translation>
</message>
@@ -922,7 +1263,52 @@ Adresa: %4
<translation>S&amp;pustit Bitcoin po přihlášení do systému</translation>
</message>
<message>
- <location line="+35"/>
+ <location line="+9"/>
+ <source>Size of &amp;database cache</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set database cache size in megabytes (default: 25)</source>
+ <translation>Nastavit velikost databázové vyrovnávací paměti v megabajtech (výchozí: 25)</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>MB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Number of script &amp;verification threads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
+ <translation>Nastavení poÄtu vláken pro verifikaci skriptů (max. 16, 0 = automaticky, &lt;0 = nechat daný poÄet jader volný, výchozí: 0)</translation>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Connect to the Bitcoin network through a SOCKS proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Connect through SOCKS proxy (default proxy):</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+224"/>
+ <source>Active command-line options that override above options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
<source>Reset all client options to default.</source>
<translation>Vrátí všechny volby na výchozí hodnoty.</translation>
</message>
@@ -932,7 +1318,7 @@ Adresa: %4
<translation>&amp;Obnovit nastavení</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="-323"/>
<source>&amp;Network</source>
<translation>&amp;Síť</translation>
</message>
@@ -947,32 +1333,17 @@ Adresa: %4
<translation>Namapovat port přes &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>Připojí se do Bitcoinové sítě přes SOCKS proxy (např. když se připojuje přes Tor).</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>&amp;Connect through SOCKS proxy:</source>
- <translation>&amp;Připojit přes SOCKS proxy:</translation>
- </message>
- <message>
- <location line="+9"/>
+ <location line="+19"/>
<source>Proxy &amp;IP:</source>
<translation>&amp;IP adresa proxy:</translation>
</message>
<message>
- <location line="+19"/>
- <source>IP address of the proxy (e.g. 127.0.0.1)</source>
- <translation>IP adresa proxy (napÅ™. 127.0.0.1)</translation>
- </message>
- <message>
- <location line="+7"/>
+ <location line="+32"/>
<source>&amp;Port:</source>
<translation>Por&amp;t:</translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+25"/>
<source>Port of the proxy (e.g. 9050)</source>
<translation>Port proxy (napÅ™. 9050)</translation>
</message>
@@ -1047,7 +1418,17 @@ Adresa: %4
<translation>Ukazo&amp;vat adresy ve výpisu transakcí</translation>
</message>
<message>
- <location line="+71"/>
+ <location line="+7"/>
+ <source>Whether to show coin control features or not.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Display coin &amp;control features (experts only)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+136"/>
<source>&amp;OK</source>
<translation>&amp;Budiž</translation>
</message>
@@ -1057,44 +1438,38 @@ Adresa: %4
<translation>&amp;Zrušit</translation>
</message>
<message>
- <location line="+10"/>
- <source>&amp;Apply</source>
- <translation>&amp;Uložit</translation>
- </message>
- <message>
- <location filename="../optionsdialog.cpp" line="+58"/>
+ <location filename="../optionsdialog.cpp" line="+67"/>
<source>default</source>
<translation>výchozí</translation>
</message>
<message>
- <location line="+130"/>
+ <location line="+57"/>
+ <source>none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+75"/>
<source>Confirm options reset</source>
<translation>Potvrzení obnovení nastavení</translation>
</message>
<message>
<location line="+1"/>
- <source>Some settings may require a client restart to take effect.</source>
- <translation>Některá nastavení mohou vyžadovat restart klienta, aby se mohly projevit.</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Do you want to proceed?</source>
- <translation>ChceÅ¡ pokraÄovat?</translation>
+ <location line="+29"/>
+ <source>Client restart required to activate changes.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
- <location line="+9"/>
- <source>Warning</source>
- <translation>Upozornění</translation>
+ <location line="-29"/>
+ <source>Client will be shutdown, do you want to proceed?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="-9"/>
- <location line="+9"/>
- <source>This setting will take effect after restarting Bitcoin.</source>
- <translation>Nastavení se projeví až po restartování Bitcoinu.</translation>
+ <location line="+33"/>
+ <source>This change would require a client restart.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+29"/>
+ <location line="+34"/>
<source>The supplied proxy address is invalid.</source>
<translation>Zadaná adresa proxy je neplatná.</translation>
</message>
@@ -1108,22 +1483,22 @@ Adresa: %4
</message>
<message>
<location line="+50"/>
- <location line="+202"/>
+ <location line="+231"/>
<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="-131"/>
+ <location line="-155"/>
<source>Unconfirmed:</source>
<translation>Nepotvrzeno:</translation>
</message>
<message>
- <location line="-78"/>
+ <location line="-83"/>
<source>Wallet</source>
<translation>Peněženka</translation>
</message>
<message>
- <location line="+49"/>
+ <location line="+51"/>
<source>Confirmed:</source>
<translation>Potvrzeno:</translation>
</message>
@@ -1133,12 +1508,12 @@ Adresa: %4
<translation>Aktuální disponibilní stav tvého úÄtu</translation>
</message>
<message>
- <location line="+29"/>
+ <location line="+32"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation>Celkem z transakcí, které jeÅ¡tÄ› nejsou potvrzené a které se jeÅ¡tÄ› nezapoÄítávají do celkového disponibilního stavu úÄtu</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+16"/>
<source>Immature:</source>
<translation>Nedozráno:</translation>
</message>
@@ -1148,7 +1523,7 @@ Adresa: %4
<translation>Vytěžené mince, které ještě nejsou zralé</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+16"/>
<source>Total:</source>
<translation>Celkem:</translation>
</message>
@@ -1158,12 +1533,12 @@ Adresa: %4
<translation>Celkový stav tvého úÄtu</translation>
</message>
<message>
- <location line="+53"/>
+ <location line="+71"/>
<source>&lt;b&gt;Recent transactions&lt;/b&gt;</source>
<translation>&lt;b&gt;Poslední transakce&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../overviewpage.cpp" line="+116"/>
+ <location filename="../overviewpage.cpp" line="+120"/>
<location line="+1"/>
<source>out of sync</source>
<translation>nesynchronizováno</translation>
@@ -1172,7 +1547,8 @@ Adresa: %4
<context>
<name>PaymentServer</name>
<message>
- <location filename="../paymentserver.cpp" line="+392"/>
+ <location filename="../paymentserver.cpp" line="+403"/>
+ <location line="+13"/>
<source>URI handling</source>
<translation>Zpracování URI</translation>
</message>
@@ -1182,45 +1558,82 @@ Adresa: %4
<translation>Nepodařilo se analyzovat URI! Důvodem může být neplatná Bitcoinová adresa nebo poškozené parametry URI.</translation>
</message>
<message>
- <location line="+69"/>
+ <location line="+96"/>
<source>Requested payment amount of %1 is too small (considered dust).</source>
- <translation type="unfinished"/>
+ <translation>Požadovaná platební Äástka ve výši %1 je příliÅ¡ malá (požadovaná za prach).</translation>
</message>
<message>
- <location line="+4"/>
- <location line="+37"/>
+ <location line="-221"/>
+ <location line="+212"/>
+ <location line="+13"/>
+ <location line="+95"/>
+ <location line="+18"/>
+ <location line="+16"/>
<source>Payment request error</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="-353"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
+ <translation>Nemůžu spustit bitcoin: obsluha click-to-pay</translation>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Net manager warning</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+1"/>
- <source>Insecure requests to custom payment scripts unsupported</source>
+ <source>Your active proxy doesn&apos;t support SOCKS5, which is required for payment requests via proxy.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+38"/>
- <source>Refund from %1</source>
+ <location line="+52"/>
+ <source>Payment request fetch URL is invalid: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
+ <location line="+27"/>
+ <source>Payment request file handling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Payment request file can not be read or processed! This can be caused by an invalid payment request file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+73"/>
+ <source>Unverified payment requests to custom payment scripts are unsupported.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+59"/>
+ <source>Refund from %1</source>
+ <translation>Vrácení peněz od %1</translation>
+ </message>
+ <message>
+ <location line="+43"/>
<source>Error communicating with %1: %2</source>
+ <translation>Chyba komunikující s %1: %2</translation>
+ </message>
+ <message>
+ <location line="+24"/>
+ <source>Payment request can not be parsed or processed!</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+11"/>
<source>Bad response from server %1</source>
- <translation type="unfinished"/>
+ <translation>Špatná reakce serveru %1</translation>
</message>
<message>
- <location line="+32"/>
+ <location line="+33"/>
<source>Payment acknowledged</source>
- <translation type="unfinished"/>
+ <translation>Platba potvrzena</translation>
</message>
<message>
- <location line="-58"/>
- <location line="+30"/>
- <location line="+17"/>
+ <location line="-11"/>
<source>Network request error</source>
<translation type="unfinished"/>
</message>
@@ -1228,39 +1641,33 @@ Adresa: %4
<context>
<name>QObject</name>
<message>
- <location filename="../bitcoin.cpp" line="+114"/>
- <location line="+5"/>
- <location filename="../intro.cpp" line="-32"/>
+ <location filename="../bitcoin.cpp" line="+71"/>
+ <location line="+11"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-4"/>
+ <location line="+1"/>
<source>Error: Specified data directory &quot;%1&quot; does not exist.</source>
<translation>Chyba: Zadaný adresář pro data „%1“ neexistuje.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="-12"/>
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../intro.cpp" line="+1"/>
- <source>Error: Specified data directory &quot;%1&quot; can not be created.</source>
- <translation>Chyba: Nejde vytvořit požadovaný adresář pro data „%1“.</translation>
- </message>
</context>
<context>
<name>QRImageWidget</name>
<message>
- <location filename="../receiverequestdialog.cpp" line="+32"/>
+ <location filename="../receiverequestdialog.cpp" line="+36"/>
<source>&amp;Save Image...</source>
- <translation type="unfinished"/>
+ <translation>&amp;Ulož Obrázek...</translation>
</message>
<message>
<location line="+3"/>
<source>&amp;Copy Image</source>
- <translation type="unfinished"/>
+ <translation>&amp;Kopíruj Obraz</translation>
</message>
<message>
<location line="+28"/>
@@ -1269,8 +1676,8 @@ Adresa: %4
</message>
<message>
<location line="+0"/>
- <source>PNG Images (*.png)</source>
- <translation>PNG obrázky (*.png)</translation>
+ <source>PNG Image (*.png)</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1287,15 +1694,16 @@ Adresa: %4
<location line="+23"/>
<location line="+23"/>
<location line="+36"/>
- <location line="+53"/>
+ <location line="+23"/>
+ <location line="+36"/>
<location line="+23"/>
<location line="+23"/>
- <location filename="../rpcconsole.cpp" line="+352"/>
+ <location filename="../rpcconsole.cpp" line="+359"/>
<source>N/A</source>
<translation>N/A</translation>
</message>
<message>
- <location line="-217"/>
+ <location line="-223"/>
<source>Client version</source>
<translation>Verze klienta</translation>
</message>
@@ -1305,7 +1713,17 @@ Adresa: %4
<translation>&amp;Informace</translation>
</message>
<message>
- <location line="+68"/>
+ <location line="-10"/>
+ <source>Debug window</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+25"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+53"/>
<source>Using OpenSSL version</source>
<translation>Používaná verze OpenSSL</translation>
</message>
@@ -1321,16 +1739,16 @@ Adresa: %4
</message>
<message>
<location line="+7"/>
- <source>Number of connections</source>
- <translation>PoÄet spojení</translation>
+ <source>Name</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+23"/>
- <source>On testnet</source>
- <translation>V testnetu</translation>
+ <source>Number of connections</source>
+ <translation>PoÄet spojení</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+29"/>
<source>Block chain</source>
<translation>Řetězec bloků</translation>
</message>
@@ -1355,21 +1773,6 @@ Adresa: %4
<translation>&amp;Otevřít</translation>
</message>
<message>
- <location line="+16"/>
- <source>Command-line options</source>
- <translation>Argumenty z příkazové řádky</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>Seznam parametrů Bitcoinu pro příkazovou řádku získáš v nápovědě Bitcoinu Qt.</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>&amp;Show</source>
- <translation>&amp;Zobrazit</translation>
- </message>
- <message>
<location line="+24"/>
<source>&amp;Console</source>
<translation>&amp;Konzole</translation>
@@ -1377,7 +1780,7 @@ Adresa: %4
<message>
<location line="+72"/>
<source>&amp;Network Traffic</source>
- <translation type="unfinished"/>
+ <translation>&amp;Provoz na síti</translation>
</message>
<message>
<location line="+52"/>
@@ -1400,22 +1803,12 @@ Adresa: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-541"/>
+ <location line="-521"/>
<source>Build date</source>
<translation>Datum kompilace</translation>
</message>
<message>
- <location line="-104"/>
- <source>Bitcoin - Debug window</source>
- <translation>Bitcoin - ladicí okno</translation>
- </message>
- <message>
- <location line="+25"/>
- <source>Bitcoin Core</source>
- <translation>Jádro Bitcoinu</translation>
- </message>
- <message>
- <location line="+279"/>
+ <location line="+206"/>
<source>Debug log file</source>
<translation>Soubor s ladicími záznamy</translation>
</message>
@@ -1425,7 +1818,7 @@ Adresa: %4
<translation>Otevři soubor s ladicími záznamy Bitcoinu z aktuálního datového adresáře. U velkých logů to může pár vteřin zabrat.</translation>
</message>
<message>
- <location line="+102"/>
+ <location line="+76"/>
<source>Clear console</source>
<translation>VyÄistit konzoli</translation>
</message>
@@ -1445,7 +1838,7 @@ Adresa: %4
<translation>Napsáním &lt;b&gt;help&lt;/b&gt; si vypíšeš přehled dostupných příkazů.</translation>
</message>
<message>
- <location line="+128"/>
+ <location line="+122"/>
<source>%1 B</source>
<translation type="unfinished"/>
</message>
@@ -1483,48 +1876,48 @@ Adresa: %4
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+22"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
<source>&amp;Amount:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
- <source>The amount to request</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+7"/>
+ <location line="-13"/>
<source>&amp;Label:</source>
<translation>O&amp;znaÄení:</translation>
</message>
<message>
- <location line="+10"/>
- <source>The label to associate with the receiving address</source>
+ <location line="-34"/>
+ <source>&amp;Message:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>&amp;Message:</source>
+ <location line="-17"/>
+ <source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>The message to attach to payment request</source>
+ <location line="+3"/>
+ <source>R&amp;euse an existing receiving address (not recommended)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
- <source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
+ <location line="+27"/>
+ <source>An optional label to associate with the new receiving address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>R&amp;euse an existing receiving address (not recommended)</source>
+ <location line="+7"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+7"/>
- <source>Use this form to request payments. All fields are optional.</source>
+ <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+39"/>
+ <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1542,6 +1935,31 @@ Adresa: %4
<source>&amp;Request payment</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+47"/>
+ <source>Requested payments</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Show the selected request (does the same as double clicking an entry)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Show</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Remove the selected entries from the list</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Remove</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
@@ -1562,16 +1980,11 @@ Adresa: %4
</message>
<message>
<location line="+7"/>
- <source>&amp;Copy Image</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+7"/>
<source>&amp;Save Image...</source>
- <translation type="unfinished"/>
+ <translation>&amp;Ulož Obrázek...</translation>
</message>
<message>
- <location filename="../receiverequestdialog.cpp" line="+58"/>
+ <location filename="../receiverequestdialog.cpp" line="+56"/>
<source>Request payment to %1</source>
<translation type="unfinished"/>
</message>
@@ -1617,16 +2030,119 @@ Adresa: %4
</message>
</context>
<context>
+ <name>RecentRequestsTableModel</name>
+ <message>
+ <location filename="../recentrequeststablemodel.cpp" line="+24"/>
+ <source>Date</source>
+ <translation>Datum</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Label</source>
+ <translation>Popis</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Message</source>
+ <translation>Zpráva</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Amount</source>
+ <translation>Částka</translation>
+ </message>
+ <message>
+ <location line="+38"/>
+ <source>(no label)</source>
+ <translation>(bez popisu)</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>(no message)</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+140"/>
- <location line="+213"/>
+ <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location line="+80"/>
<source>Send Coins</source>
<translation>Pošli mince</translation>
</message>
<message>
- <location line="+50"/>
+ <location line="+76"/>
+ <source>Coin Control Features</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Inputs...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>automatically selected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Insufficient funds!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+89"/>
+ <source>Quantity:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+35"/>
+ <source>Bytes:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Amount:</source>
+ <translation>Částka:</translation>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Priority:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Low Output:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>After Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Change:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+44"/>
+ <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Custom change address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+115"/>
<source>Send to multiple recipients at once</source>
<translation>Pošli více příjemcům naráz</translation>
</message>
@@ -1651,12 +2167,7 @@ Adresa: %4
<translation>Stav úÄtu:</translation>
</message>
<message>
- <location line="+10"/>
- <source>123.456 BTC</source>
- <translation>123.456 BTC</translation>
- </message>
- <message>
- <location line="+31"/>
+ <location line="+41"/>
<source>Confirm the send action</source>
<translation>PotvrÄ odeslání</translation>
</message>
@@ -1666,69 +2177,135 @@ Adresa: %4
<translation>P&amp;ošli</translation>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-154"/>
+ <location filename="../sendcoinsdialog.cpp" line="-228"/>
<source>Confirm send coins</source>
<translation>PotvrÄ odeslání mincí</translation>
</message>
<message>
- <location line="-90"/>
+ <location line="-74"/>
<location line="+5"/>
<location line="+5"/>
+ <location line="+4"/>
<source>%1 to %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+26"/>
+ <location line="-136"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation>Zadej Bitcoinovou adresu (napÅ™. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Copy quantity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation>Kopíruj Äástku</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy after fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy bytes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy low output</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy change</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+170"/>
+ <source>Total Amount %1 (= %2)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>or</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+202"/>
<source>The recipient address is not valid, please recheck.</source>
<translation>Adresa příjemce je neplatná, překontroluj ji prosím.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The amount to pay must be larger than 0.</source>
<translation>Odesílaná Äástka musí být vÄ›tší než 0.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The amount exceeds your balance.</source>
<translation>Částka pÅ™ekraÄuje stav úÄtu.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The total exceeds your balance when the %1 transaction fee is included.</source>
<translation>Celková Äástka pÅ™i pÅ™ipoÄítání poplatku %1 pÅ™ekroÄí stav úÄtu.</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+3"/>
<source>Duplicate address found, can only send to each address once per send operation.</source>
<translation>Zaznamenána duplikovaná adresa; každá adresa může být v odesílané platbě pouze jednou.</translation>
</message>
<message>
+ <location line="+3"/>
+ <source>Transaction creation failed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+4"/>
- <source>Error: Transaction creation failed!</source>
- <translation>Chyba: Vytvoření transakce selhalo!</translation>
+ <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+15"/>
- <source>Are you sure you want to send?</source>
+ <location line="+112"/>
+ <source>Warning: Invalid Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+9"/>
- <source>added as transaction fee</source>
+ <location line="+21"/>
+ <source>(no label)</source>
+ <translation>(bez popisu)</translation>
+ </message>
+ <message>
+ <location line="-11"/>
+ <source>Warning: Unknown change address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
- <source>Total Amount %1</source>
+ <location line="-366"/>
+ <source>Are you sure you want to send?</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+20"/>
- <source>Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
- <translation>Chyba: Transakce byla odmítnuta. Tohle může nastat, pokud nÄ›jaké mince z tvé peněženky už jednou byly utraceny, například pokud používáš kopii souboru wallet.dat a mince byly utraceny v druhé kopii, ale nebyly oznaÄeny jako utracené v této.</translation>
+ <location line="+9"/>
+ <source>added as transaction fee</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+144"/>
+ <location line="+170"/>
<source>Payment request expired</source>
<translation type="unfinished"/>
</message>
@@ -1741,39 +2318,44 @@ Adresa: %4
<context>
<name>SendCoinsEntry</name>
<message>
- <location filename="../forms/sendcoinsentry.ui" line="+33"/>
- <location line="+585"/>
+ <location filename="../forms/sendcoinsentry.ui" line="+131"/>
+ <location line="+521"/>
+ <location line="+536"/>
<source>A&amp;mount:</source>
<translation>Čás&amp;tka:</translation>
</message>
<message>
- <location line="-572"/>
- <location line="+585"/>
+ <location line="-1152"/>
<source>Pay &amp;To:</source>
<translation>&amp;Komu:</translation>
</message>
<message>
- <location line="-551"/>
+ <location line="+18"/>
<source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>Adresa příjemce (např. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location filename="../sendcoinsentry.cpp" line="+28"/>
+ <location filename="../sendcoinsentry.cpp" line="+30"/>
<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 filename="../forms/sendcoinsentry.ui" line="-18"/>
+ <location filename="../forms/sendcoinsentry.ui" line="+57"/>
<source>&amp;Label:</source>
<translation>O&amp;znaÄení:</translation>
</message>
<message>
- <location line="+28"/>
+ <location line="-50"/>
<source>Choose previously used address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
+ <location line="-40"/>
+ <source>This is a normal payment.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+50"/>
<source>Alt+A</source>
<translation>Alt+A</translation>
</message>
@@ -1789,16 +2371,45 @@ Adresa: %4
</message>
<message>
<location line="+7"/>
- <source>Remove this recipient</source>
- <translation>Smaž tohoto příjemce</translation>
+ <location line="+524"/>
+ <location line="+536"/>
+ <source>Remove this entry</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="-1008"/>
+ <source>Message:</source>
+ <translation>Zpráva:</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+958"/>
+ <source>This is a verified payment request.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-991"/>
<source>Enter a label for this address to add it to the list of used addresses</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+465"/>
+ <location line="+459"/>
+ <source>This is an unverified payment request.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+18"/>
+ <location line="+532"/>
+ <source>Pay To:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-498"/>
+ <location line="+536"/>
<source>Memo:</source>
<translation type="unfinished"/>
</message>
@@ -1809,6 +2420,19 @@ Adresa: %4
</message>
</context>
<context>
+ <name>ShutdownWindow</name>
+ <message>
+ <location filename="../utilitydialog.cpp" line="+48"/>
+ <source>Bitcoin Core is shutting down...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Do not shut down the computer until this window disappears.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>SignVerifyMessageDialog</name>
<message>
<location filename="../forms/signverifymessagedialog.ui" line="+14"/>
@@ -1816,7 +2440,7 @@ Adresa: %4
<translation>Podpisy - podepsat/ověřit zprávu</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+10"/>
<source>&amp;Sign Message</source>
<translation>&amp;Podepiš zprávu</translation>
</message>
@@ -1919,7 +2543,7 @@ Adresa: %4
<translation>Vymaž všechna pole formuláře pro ověření zrávy</translation>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+27"/>
+ <location filename="../signverifymessagedialog.cpp" line="+29"/>
<location line="+3"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>Zadej Bitcoinovou adresu (napÅ™. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
@@ -1935,7 +2559,7 @@ Adresa: %4
<translation>Vlož Bitcoinový podpis</translation>
</message>
<message>
- <location line="+85"/>
+ <location line="+84"/>
<location line="+81"/>
<source>The entered address is invalid.</source>
<translation>Zadaná adresa je neplatná.</translation>
@@ -2004,9 +2628,14 @@ Adresa: %4
<context>
<name>SplashScreen</name>
<message>
- <location filename="../splashscreen.cpp" line="+23"/>
- <source>The Bitcoin developers</source>
- <translation>Vývojáři Bitcoinu</translation>
+ <location filename="../splashscreen.cpp" line="+28"/>
+ <source>Bitcoin Core</source>
+ <translation>Jádro Bitcoinu</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>The Bitcoin Core developers</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
@@ -2017,7 +2646,7 @@ Adresa: %4
<context>
<name>TrafficGraphWidget</name>
<message>
- <location filename="../trafficgraphwidget.cpp" line="+75"/>
+ <location filename="../trafficgraphwidget.cpp" line="+79"/>
<source>KB/s</source>
<translation type="unfinished"/>
</message>
@@ -2025,7 +2654,7 @@ Adresa: %4
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="+22"/>
+ <location filename="../transactiondesc.cpp" line="+28"/>
<source>Open until %1</source>
<translation>Otřevřeno dokud %1</translation>
</message>
@@ -2098,12 +2727,12 @@ Adresa: %4
<location line="+12"/>
<location line="+45"/>
<location line="+17"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Credit</source>
<translation>Příjem</translation>
</message>
<message numerus="yes">
- <location line="-120"/>
+ <location line="-125"/>
<source>matures in %n more block(s)</source>
<translation><numerusform>dozraje po jednom bloku</numerusform><numerusform>dozraje po %n blocích</numerusform><numerusform>dozraje po %n blocích</numerusform></translation>
</message>
@@ -2116,12 +2745,12 @@ Adresa: %4
<location line="+44"/>
<location line="+8"/>
<location line="+15"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Debit</source>
<translation>Výdaj</translation>
</message>
<message>
- <location line="-57"/>
+ <location line="-62"/>
<source>Transaction fee</source>
<translation>TransakÄní poplatek</translation>
</message>
@@ -2132,11 +2761,12 @@ Adresa: %4
</message>
<message>
<location line="+6"/>
+ <location line="+9"/>
<source>Message</source>
<translation>Zpráva</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="-7"/>
<source>Comment</source>
<translation>Komentář</translation>
</message>
@@ -2146,7 +2776,7 @@ Adresa: %4
<translation>ID transakce</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+18"/>
<source>Merchant</source>
<translation type="unfinished"/>
</message>
@@ -2186,7 +2816,7 @@ Adresa: %4
<translation>false</translation>
</message>
<message>
- <location line="-227"/>
+ <location line="-232"/>
<source>, has not been successfully broadcast yet</source>
<translation>, ještě nebylo rozesláno</translation>
</message>
@@ -2217,7 +2847,7 @@ Adresa: %4
<context>
<name>TransactionTableModel</name>
<message>
- <location filename="../transactiontablemodel.cpp" line="+227"/>
+ <location filename="../transactiontablemodel.cpp" line="+234"/>
<source>Date</source>
<translation>Datum</translation>
</message>
@@ -2236,8 +2866,13 @@ Adresa: %4
<source>Amount</source>
<translation>Částka</translation>
</message>
+ <message>
+ <location line="+59"/>
+ <source>Immature (%1 confirmations, will be available after %2)</source>
+ <translation type="unfinished"/>
+ </message>
<message numerus="yes">
- <location line="+57"/>
+ <location line="+16"/>
<source>Open for %n more block(s)</source>
<translation><numerusform>Otevřeno pro 1 další blok</numerusform><numerusform>Otevřeno pro %n další bloky</numerusform><numerusform>Otevřeno pro %n dalších bloků</numerusform></translation>
</message>
@@ -2257,17 +2892,13 @@ Adresa: %4
<translation>Nepotvrzeno (%1 z %2 potvrzení)</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="-22"/>
+ <location line="+25"/>
<source>Confirmed (%1 confirmations)</source>
<translation>Potvrzeno (%1 potvrzení)</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>Vytěžené mince budou použitelné po dozrání, tj. po jednom bloku</numerusform><numerusform>Vytěžené mince budou použitelné po dozrání, tj. po %n blocích</numerusform><numerusform>Vytěžené mince budou použitelné po dozrání, tj. po %n blocích</numerusform></translation>
- </message>
<message>
- <location line="+5"/>
+ <location line="-22"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation>Tento blok nedostal žádný jiný uzel a pravděpodobně nebude akceptován!</translation>
</message>
@@ -2277,7 +2908,7 @@ Adresa: %4
<translation>Vygenerováno, ale neakceptováno</translation>
</message>
<message>
- <location line="+43"/>
+ <location line="+62"/>
<source>Received with</source>
<translation>Přijato do</translation>
</message>
@@ -2335,7 +2966,7 @@ Adresa: %4
<context>
<name>TransactionView</name>
<message>
- <location filename="../transactionview.cpp" line="+52"/>
+ <location filename="../transactionview.cpp" line="+57"/>
<location line="+16"/>
<source>All</source>
<translation>VÅ¡e</translation>
@@ -2396,12 +3027,12 @@ Adresa: %4
<translation>Ostatní</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+6"/>
<source>Enter address or label to search</source>
<translation>Zadej adresu nebo oznaÄení pro její vyhledání</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+6"/>
<source>Min amount</source>
<translation>Minimální Äástka</translation>
</message>
@@ -2436,17 +3067,37 @@ Adresa: %4
<translation>Zobraz detaily transakce</translation>
</message>
<message>
- <location line="+143"/>
- <source>Export Transaction Data</source>
- <translation>Exportuj transakÄní data</translation>
+ <location line="+142"/>
+ <source>Export Transaction History</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="+19"/>
+ <source>Exporting Failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>There was an error trying to save the transaction history to %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Exporting Successful</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The transaction history was successfully saved to %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-22"/>
<source>Comma separated file (*.csv)</source>
<translation>CSV formát (*.csv)</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+9"/>
<source>Confirmed</source>
<translation>Potvrzeno</translation>
</message>
@@ -2481,17 +3132,7 @@ Adresa: %4
<translation>ID</translation>
</message>
<message>
- <location line="+4"/>
- <source>Error exporting</source>
- <translation>Chyba při exportu</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation>Nemohu zapisovat do souboru %1.</translation>
- </message>
- <message>
- <location line="+100"/>
+ <location line="+107"/>
<source>Range:</source>
<translation>Rozsah:</translation>
</message>
@@ -2502,9 +3143,17 @@ Adresa: %4
</message>
</context>
<context>
+ <name>WalletFrame</name>
+ <message>
+ <location filename="../walletframe.cpp" line="+26"/>
+ <source>No wallet has been loaded.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>WalletModel</name>
<message>
- <location filename="../walletmodel.cpp" line="+218"/>
+ <location filename="../walletmodel.cpp" line="+245"/>
<source>Send Coins</source>
<translation>Pošli mince</translation>
</message>
@@ -2512,7 +3161,7 @@ Adresa: %4
<context>
<name>WalletView</name>
<message>
- <location filename="../walletview.cpp" line="+46"/>
+ <location filename="../walletview.cpp" line="+43"/>
<source>&amp;Export</source>
<translation>&amp;Export</translation>
</message>
@@ -2522,65 +3171,60 @@ Adresa: %4
<translation>Exportuj data z tohoto panelu do souboru</translation>
</message>
<message>
- <location line="+183"/>
+ <location line="+181"/>
<source>Backup Wallet</source>
<translation>Záloha peněženky</translation>
</message>
<message>
- <location line="+0"/>
+ <location line="+1"/>
<source>Wallet Data (*.dat)</source>
<translation>Data peněženky (*.dat)</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="+6"/>
<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>
+ <source>There was an error trying to save the wallet data to %1.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+4"/>
- <source>Backup Successful</source>
- <translation>Úspěšně zazálohováno</translation>
+ <source>The wallet data was successfully saved to %1.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+0"/>
- <source>The wallet data was successfully saved to the new location.</source>
- <translation>Data z peněženky byla v pořádku uložena na nové místo.</translation>
+ <source>Backup Successful</source>
+ <translation>Úspěšně zazálohováno</translation>
</message>
</context>
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+102"/>
- <source>Bitcoin version</source>
- <translation>Verze Bitcoinu</translation>
- </message>
- <message>
- <location line="+107"/>
+ <location filename="../bitcoinstrings.cpp" line="+221"/>
<source>Usage:</source>
<translation>Užití:</translation>
</message>
<message>
- <location line="-55"/>
+ <location line="-54"/>
<source>List commands</source>
<translation>Výpis příkazů</translation>
</message>
<message>
- <location line="-13"/>
+ <location line="-14"/>
<source>Get help for a command</source>
<translation>Získat nápovědu pro příkaz</translation>
</message>
<message>
- <location line="+25"/>
+ <location line="+26"/>
<source>Options:</source>
<translation>Možnosti:</translation>
</message>
<message>
- <location line="+24"/>
+ <location line="+22"/>
<source>Specify configuration file (default: bitcoin.conf)</source>
<translation>KonfiguraÄní soubor (výchozí: bitcoin.conf)</translation>
</message>
@@ -2600,7 +3244,7 @@ Adresa: %4
<translation>Nastavit velikost databázové vyrovnávací paměti v megabajtech (výchozí: 25)</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-26"/>
<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>
@@ -2610,7 +3254,7 @@ Adresa: %4
<translation>Povolit nejvýše &lt;n&gt; připojení k uzlům (výchozí: 125)</translation>
</message>
<message>
- <location line="-49"/>
+ <location line="-51"/>
<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>
@@ -2620,37 +3264,37 @@ Adresa: %4
<translation>Specifikuj svou veřejnou adresu</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation>Práh pro odpojování zlobivých uzlů (výchozí: 100)</translation>
</message>
<message>
- <location line="-142"/>
+ <location line="-148"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation>Doba ve vteřinách, po kterou se nebudou moci zlobivé uzly znovu připojit (výchozí: 86400)</translation>
</message>
<message>
- <location line="-33"/>
+ <location line="-36"/>
<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="+31"/>
+ <location line="+34"/>
<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="+40"/>
+ <location line="+45"/>
<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="+79"/>
+ <location line="+80"/>
<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="+40"/>
+ <location line="+39"/>
<source>Use the test network</source>
<translation>Použít testovací síť (testnet)</translation>
</message>
@@ -2660,7 +3304,7 @@ Adresa: %4
<translation>PÅ™ijímat spojení zvenÄí (výchozí: 1, pokud není zadáno -proxy nebo -connect)</translation>
</message>
<message>
- <location line="-87"/>
+ <location line="-95"/>
<source>%s, you must set a rpcpassword in the configuration file:
%s
It is recommended you use the following random password:
@@ -2711,6 +3355,11 @@ například: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+4"/>
+ <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</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>Chyba: Transakce byla odmítnuta! Tohle může nastat, pokud nÄ›jaké mince z tvé peněženky už jednou byly utraceny, například pokud používáš kopii souboru wallet.dat a mince byly utraceny v druhé kopii, ale nebyly oznaÄeny jako utracené v této.</translation>
</message>
@@ -2725,17 +3374,17 @@ například: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<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="+6"/>
+ <location line="+18"/>
<source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
<translation>Tohle je testovací verze – používej ji jen na vlastní riziko, ale rozhodně ji nepoužívej k těžbě nebo pro obchodní aplikace</translation>
</message>
<message>
<location line="+5"/>
+ <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
<source>Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source>
<translation>UpozornÄ›ní: -paytxfee je nastaveno velmi vysoko! Toto je transakÄní poplatek, který zaplatíš za každou poslanou transakci.</translation>
</message>
@@ -2765,17 +3414,27 @@ například: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>UpozornÄ›ní: soubor wallet.dat je poÅ¡kozený, data jsou vÅ¡ak zachránÄ›na! Původní soubor wallet.dat je uložený jako wallet.{timestamp}.bak v %s. Pokud je stav tvého úÄtu nebo transakce nesprávné, zÅ™ejmÄ› bys mÄ›l obnovit zálohu.</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="+9"/>
+ <source>&lt;category&gt; can be:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
<source>Attempt to recover private keys from a corrupt wallet.dat</source>
<translation>Pokusit se zachránit soukromé klíÄe z poÅ¡kozeného souboru wallet.dat</translation>
</message>
<message>
<location line="+1"/>
+ <source>Bitcoin Core Daemon</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Bitcoin RPC client version</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
<source>Block creation options:</source>
<translation>Možnosti vytvoření bloku:</translation>
</message>
@@ -2785,7 +3444,12 @@ například: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Připojit se pouze k zadanému uzlu (příp. zadaným uzlům)</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
+ <source>Connect through SOCKS proxy</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect to JSON-RPC on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation type="unfinished"/>
</message>
@@ -2801,6 +3465,11 @@ například: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+1"/>
+ <source>Do not load the wallet and disable wallet RPC calls</source>
+ <translation type="unfinished"/>
+ </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>
@@ -2895,7 +3564,12 @@ například: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Nepodařilo se zapsat data o vracení změn</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
+ <source>Fee per kB to add to transactions you send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<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>
@@ -2915,6 +3589,11 @@ například: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Jak moc důkladná má být verifikace bloků (0-4, výchozí: 3)</translation>
</message>
<message>
+ <location line="+1"/>
+ <source>If &lt;category&gt; is not supplied, output all debugging information.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+2"/>
<source>Incorrect or no genesis block found. Wrong datadir for network?</source>
<translation>Nemám žádný nebo jen špatný genesis blok. Není špatně nastavený datadir?</translation>
@@ -2930,17 +3609,37 @@ například: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Je nedostatek deskriptorů souborů.</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+5"/>
+ <source>Prepend debug output with timestamp (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>RPC client options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Rebuild block chain index from current blk000??.dat files</source>
<translation>Znovu vytvořit index řetězce bloků z aktuálních blk000??.dat souborů</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+5"/>
+ <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Send command to Bitcoin server</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
+ <location line="+7"/>
+ <source>Set maximum block size in bytes (default: %d)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Set the number of threads to service RPC calls (default: 4)</source>
<translation>Nastavení poÄtu vláken pro servisní RPC volání (výchozí: 4)</translation>
</message>
@@ -2955,12 +3654,17 @@ například: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+12"/>
+ <location line="+3"/>
+ <source>This is intended for regression testing tools and app development.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Usage (deprecated, use bitcoin-cli):</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+8"/>
+ <location line="+7"/>
<source>Verifying blocks...</source>
<translation>Ověřuji bloky...</translation>
</message>
@@ -2971,31 +3675,56 @@ například: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+1"/>
+ <source>Wait for RPC server to start</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Wallet %s resides outside data directory %s</source>
<translation>Peněženka %s se nachází mimo datový adresář %s</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+2"/>
+ <source>Wallet options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>You need to rebuild the database 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="-78"/>
+ <location line="-79"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation>Importovat bloky z externího souboru blk000??.dat</translation>
</message>
<message>
- <location line="-98"/>
+ <location line="-105"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+17"/>
+ <location line="+14"/>
+ <source>Output debugging information (default: 0, supplying &lt;category&gt; is optional)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
<translation>Nastavení poÄtu vláken pro verifikaci skriptů (max. 16, 0 = automaticky, &lt;0 = nechat daný poÄet jader volný, výchozí: 0)</translation>
</message>
<message>
- <location line="+83"/>
+ <location line="+89"/>
<source>Information</source>
<translation>Informace</translation>
</message>
@@ -3035,47 +3764,17 @@ například: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<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šech -debug* voleb</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Output extra network debugging information</source>
- <translation>Tisknout speciální ladicí informace o síti</translation>
- </message>
- <message>
- <location line="+2"/>
- <source>Prepend debug output with timestamp</source>
- <translation>PÅ™ipojit pÅ™ed ladicí výstup Äasové razítko</translation>
- </message>
- <message>
- <location line="+5"/>
+ <location line="+9"/>
<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>
<message>
- <location line="+1"/>
- <source>Select the version of socks proxy to use (4-5, default: 5)</source>
- <translation>Zvol verzi socks proxy (4-5, výchozí: 5)</translation>
- </message>
- <message>
- <location line="+3"/>
+ <location line="+4"/>
<source>Send trace/debug info to console instead of debug.log file</source>
<translation>Posílat stopovací/ladicí informace do konzole místo do souboru debug.log</translation>
</message>
<message>
- <location line="+1"/>
- <source>Send trace/debug info to debugger</source>
- <translation>Posílat stopovací/ladicí informace do debuggeru</translation>
- </message>
- <message>
- <location line="+5"/>
- <source>Set maximum block size in bytes (default: 250000)</source>
- <translation>Nastavit maximální velikost bloku v bajtech (výchozí: 250000)</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+6"/>
<source>Set minimum block size in bytes (default: 0)</source>
<translation>Nastavit minimální velikost bloku v bajtech (výchozí: 0)</translation>
</message>
@@ -3100,7 +3799,7 @@ například: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Systémová chyba: </translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Transaction amount too small</source>
<translation>Částka v transakci je příliš malá</translation>
</message>
@@ -3125,32 +3824,32 @@ například: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Použít UPnP k namapování naslouchacího portu (výchozí: 1, pokud naslouchá)</translation>
</message>
<message>
- <location line="+1"/>
- <source>Use proxy to reach tor hidden services (default: same as -proxy)</source>
- <translation>Použít proxy k připojení ke skryté služby (výchozí: stejné jako -proxy)</translation>
- </message>
- <message>
<location line="+2"/>
<source>Username for JSON-RPC connections</source>
<translation>Uživatelské jméno pro JSON-RPC spojení</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+7"/>
<source>Warning</source>
<translation>Upozornění</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Warning: This version is obsolete, upgrade required!</source>
<translation>Upozornění: tahle verze je zastaralá, měl bys ji aktualizovat!</translation>
</message>
<message>
<location line="+2"/>
+ <source>version</source>
+ <translation>verze</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="-54"/>
+ <location line="-58"/>
<source>Password for JSON-RPC connections</source>
<translation>Heslo pro JSON-RPC spojení</translation>
</message>
@@ -3160,27 +3859,27 @@ například: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Povolit JSON-RPC spojení ze specifikované IP adresy</translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<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="-126"/>
+ <location line="-132"/>
<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="+155"/>
+ <location line="+161"/>
<source>Upgrade wallet to latest format</source>
<translation>Převést peněženku na nejnovější formát</translation>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<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>
<message>
- <location line="-12"/>
+ <location line="-11"/>
<source>Rescan the block chain for missing wallet transactions</source>
<translation>Přeskenovat řetězec bloků na chybějící transakce tvé pěněženky</translation>
</message>
@@ -3190,7 +3889,7 @@ například: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Použít OpenSSL (https) pro JSON-RPC spojení</translation>
</message>
<message>
- <location line="-29"/>
+ <location line="-30"/>
<source>Server certificate file (default: server.cert)</source>
<translation>Soubor se serverovým certifikátem (výchozí: server.cert)</translation>
</message>
@@ -3205,27 +3904,22 @@ například: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Tato nápověda</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Unable to bind to %s on this computer (bind returned error %d, %s)</source>
<translation>Nedaří se mi pÅ™ipojit na %s na tomhle poÄítaÄi (operace bind vrátila chybu %d, %s)</translation>
</message>
<message>
- <location line="-95"/>
- <source>Connect through socks proxy</source>
- <translation>Připojit se přes socks proxy</translation>
- </message>
- <message>
- <location line="-11"/>
+ <location line="-107"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation>Povolit DNS dotazy pro -addnode (přidání uzlu), -seednode a -connect (připojení)</translation>
</message>
<message>
- <location line="+58"/>
+ <location line="+60"/>
<source>Loading addresses...</source>
<translation>NaÄítám adresy...</translation>
</message>
<message>
- <location line="-36"/>
+ <location line="-37"/>
<source>Error loading wallet.dat: Wallet corrupted</source>
<translation>Chyba pÅ™i naÄítání wallet.dat: peněženka je poÅ¡kozená</translation>
</message>
@@ -3245,12 +3939,12 @@ například: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Chyba pÅ™i naÄítání wallet.dat</translation>
</message>
<message>
- <location line="+30"/>
+ <location line="+31"/>
<source>Invalid -proxy address: &apos;%s&apos;</source>
<translation>Neplatná -proxy adresa: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+57"/>
+ <location line="+56"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation>V -onlynet byla uvedena neznámá síť: &apos;%s&apos;</translation>
</message>
@@ -3260,7 +3954,7 @@ například: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>V -socks byla požadována neznámá verze proxy: %i</translation>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation>Nemohu přeložit -bind adresu: &apos;%s&apos;</translation>
</message>
@@ -3270,7 +3964,7 @@ například: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Nemohu přeložit -externalip adresu: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+46"/>
+ <location line="+48"/>
<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>
@@ -3290,27 +3984,22 @@ například: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>NaÄítám index bloků...</translation>
</message>
<message>
- <location line="-60"/>
+ <location line="-62"/>
<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>
<message>
- <location line="-28"/>
+ <location line="-32"/>
<source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source>
<translation>Nedaří se mi pÅ™ipojit na %s na tomhle poÄítaÄi. Bitcoin už pravdÄ›podobnÄ› jednou běží.</translation>
</message>
<message>
- <location line="+69"/>
- <source>Fee per KB to add to transactions you send</source>
- <translation>Poplatek za kB, který se přidá ke každé odeslané transakci</translation>
- </message>
- <message>
- <location line="+20"/>
+ <location line="+95"/>
<source>Loading wallet...</source>
<translation>NaÄítám peněženku...</translation>
</message>
<message>
- <location line="-54"/>
+ <location line="-56"/>
<source>Cannot downgrade wallet</source>
<translation>Nemohu převést peněženku do staršího formátu</translation>
</message>
@@ -3320,7 +4009,7 @@ například: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Nemohu napsat výchozí adresu</translation>
</message>
<message>
- <location line="+66"/>
+ <location line="+67"/>
<source>Rescanning...</source>
<translation>Přeskenovávám...</translation>
</message>
@@ -3340,7 +4029,7 @@ například: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Chyba</translation>
</message>
<message>
- <location line="-33"/>
+ <location line="-35"/>
<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
index 60a0cd24a3..a28772d748 100644
--- a/src/qt/locale/bitcoin_cy.ts
+++ b/src/qt/locale/bitcoin_cy.ts
@@ -3,13 +3,13 @@
<name>AboutDialog</name>
<message>
<location filename="../forms/aboutdialog.ui" line="+14"/>
- <source>About Bitcoin</source>
- <translation>Ynghylch Bitcoin</translation>
+ <source>About Bitcoin Core</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>
+ <source>&lt;b&gt;Bitcoin Core&lt;/b&gt; version</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+57"/>
@@ -22,13 +22,13 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location filename="../aboutdialog.cpp" line="+14"/>
+ <location filename="../utilitydialog.cpp" line="+29"/>
<source>Copyright</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+0"/>
- <source>The Bitcoin developers</source>
+ <source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
</context>
@@ -65,7 +65,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location filename="../addressbookpage.cpp" line="+72"/>
+ <location filename="../addressbookpage.cpp" line="+74"/>
<source>&amp;Copy Address</source>
<translation type="unfinished"/>
</message>
@@ -135,7 +135,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+197"/>
+ <location line="+194"/>
<source>Export Address List</source>
<translation type="unfinished"/>
</message>
@@ -146,19 +146,19 @@ This product includes software developed by the OpenSSL Project for use in the O
</message>
<message>
<location line="+13"/>
- <source>Error exporting</source>
- <translation>Gwall allforio</translation>
+ <source>Exporting Failed</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation>Ni ellir ysgrifennu i ffeil %1.</translation>
+ <location line="+1"/>
+ <source>There was an error trying to save the address list to %1.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<name>AddressTableModel</name>
<message>
- <location filename="../addresstablemodel.cpp" line="+164"/>
+ <location filename="../addresstablemodel.cpp" line="+168"/>
<source>Label</source>
<translation>Label</translation>
</message>
@@ -196,7 +196,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Ailadroddwch gyfrinymadrodd newydd</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="+34"/>
+ <location filename="../askpassphrasedialog.cpp" line="+40"/>
<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>
@@ -317,22 +317,27 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+250"/>
+ <location filename="../bitcoingui.cpp" line="+295"/>
<source>Sign &amp;message...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+254"/>
+ <location line="+335"/>
<source>Synchronizing with network...</source>
<translation>Cysoni â&apos;r rhwydwaith...</translation>
</message>
<message>
- <location line="-324"/>
+ <location line="-407"/>
<source>&amp;Overview</source>
<translation>&amp;Trosolwg</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="-137"/>
+ <source>Node</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+138"/>
<source>Show general overview of wallet</source>
<translation>Dangos trosolwg cyffredinol y waled</translation>
</message>
@@ -347,7 +352,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Pori hanes trafodion</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>E&amp;xit</source>
<translation type="unfinished"/>
</message>
@@ -393,7 +398,22 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+259"/>
+ <location line="+10"/>
+ <source>&amp;Sending addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Receiving addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open &amp;URI...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+325"/>
<source>Importing blocks from disk...</source>
<translation type="unfinished"/>
</message>
@@ -403,12 +423,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="-322"/>
+ <location line="-405"/>
<source>Send coins to a Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+47"/>
+ <location line="+49"/>
<source>Modify configuration options for Bitcoin</source>
<translation type="unfinished"/>
</message>
@@ -438,20 +458,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="-180"/>
- <location line="+6"/>
- <location line="+513"/>
+ <location line="+430"/>
<source>Bitcoin</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-519"/>
- <location line="+6"/>
+ <location line="-643"/>
<source>Wallet</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+109"/>
+ <location line="+146"/>
<source>&amp;Send</source>
<translation type="unfinished"/>
</message>
@@ -461,13 +478,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+28"/>
- <location line="+2"/>
- <source>&amp;About Bitcoin</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+14"/>
+ <location line="+46"/>
<location line="+2"/>
<source>&amp;Show / Hide</source>
<translation type="unfinished"/>
@@ -493,64 +504,80 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+35"/>
+ <location line="+48"/>
<source>&amp;File</source>
<translation>&amp;Ffeil</translation>
</message>
<message>
- <location line="+10"/>
+ <location line="+14"/>
<source>&amp;Settings</source>
<translation>&amp;Gosodiadau</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>&amp;Help</source>
<translation>&amp;Cymorth</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+15"/>
<source>Tabs toolbar</source>
<translation>Bar offer tabiau</translation>
</message>
<message>
- <location line="-235"/>
- <location line="+294"/>
+ <location line="-284"/>
+ <location line="+376"/>
<source>[testnet]</source>
<translation>[testnet]</translation>
</message>
<message>
- <location line="-177"/>
+ <location line="-401"/>
+ <source>Bitcoin Core</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+163"/>
<source>Request payments (generates QR codes and bitcoin: URIs)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+63"/>
- <source>&amp;Used sending addresses...</source>
+ <location line="+29"/>
+ <location line="+2"/>
+ <source>&amp;About Bitcoin Core</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="+35"/>
<source>Show the list of used sending addresses and labels</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Used &amp;receiving addresses...</source>
+ <location line="+2"/>
+ <source>Show the list of used receiving addresses and labels</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open a bitcoin: URI or payment request</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Command-line options</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
- <source>Show the list of used receiving addresses and labels</source>
+ <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+106"/>
+ <location line="+159"/>
<location line="+5"/>
<source>Bitcoin client</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+120"/>
+ <location line="+142"/>
<source>%n active connection(s) to Bitcoin network</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -570,7 +597,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+20"/>
+ <location line="+23"/>
<source>%n hour(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -590,7 +617,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
+ <location line="+21"/>
<source>Last received block was generated %1 ago.</source>
<translation type="unfinished"/>
</message>
@@ -615,27 +642,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Gwybodaeth</translation>
</message>
<message>
- <location line="+77"/>
- <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="-152"/>
+ <location line="-85"/>
<source>Up to date</source>
<translation>Cyfamserol</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Catching up...</source>
<translation>Dal i fyny</translation>
</message>
<message>
- <location line="+124"/>
- <source>Confirm transaction fee</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+130"/>
<source>Sent transaction</source>
<translation>Trafodiad a anfonwyd</translation>
</message>
@@ -654,17 +671,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+34"/>
- <source>URI handling</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+0"/>
- <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="+45"/>
+ <location line="+69"/>
<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>
@@ -674,7 +681,7 @@ Address: %4
<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="+110"/>
+ <location filename="../bitcoin.cpp" line="+438"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation type="unfinished"/>
</message>
@@ -682,12 +689,304 @@ Address: %4
<context>
<name>ClientModel</name>
<message>
- <location filename="../clientmodel.cpp" line="+115"/>
+ <location filename="../clientmodel.cpp" line="+119"/>
<source>Network Alert</source>
<translation type="unfinished"/>
</message>
</context>
<context>
+ <name>CoinControlDialog</name>
+ <message>
+ <location filename="../forms/coincontroldialog.ui" line="+14"/>
+ <source>Coin Control Address Selection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>Quantity:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Bytes:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>Amount:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Priority:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Low Output:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>After Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Change:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+63"/>
+ <source>(un)select all</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Tree mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>List mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>Amount</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Address</source>
+ <translation>Cyfeiriad</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Date</source>
+ <translation>Dyddiad</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Confirmations</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Confirmed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../coincontroldialog.cpp" line="+42"/>
+ <source>Copy address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy label</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+26"/>
+ <source>Copy amount</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-25"/>
+ <source>Copy transaction ID</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Lock unspent</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Unlock unspent</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+22"/>
+ <source>Copy quantity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Copy fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy after fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy bytes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy low output</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy change</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+323"/>
+ <source>highest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>higher</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>high</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>medium-high</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>medium</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>low-medium</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>low</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>lower</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>lowest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>(%1 locked)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+140"/>
+ <source>Dust</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>yes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>no</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>This label turns red, if the transaction size is greater than 1000 bytes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+5"/>
+ <source>This means a fee of at least %1 per kB is required.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-4"/>
+ <source>Can vary +/- 1 byte per input.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Transactions with higher priority are more likely to get included into a block.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>This label turns red, if the priority is smaller than &quot;medium&quot;.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>This label turns red, if any recipient receives an amount smaller than %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+4"/>
+ <source>This means a fee of at least %1 is required.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-3"/>
+ <source>Amounts below 0.546 times the minimum relay fee are shown as dust.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>This label turns red, if the change is smaller than %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
+ <location line="+66"/>
+ <source>(no label)</source>
+ <translation>(heb label)</translation>
+ </message>
+ <message>
+ <location line="-9"/>
+ <source>change from %1 (%2)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>(change)</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>EditAddressDialog</name>
<message>
<location filename="../forms/editaddressdialog.ui" line="+14"/>
@@ -715,7 +1014,7 @@ Address: %4
<translation>&amp;Cyfeiriad</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+21"/>
+ <location filename="../editaddressdialog.cpp" line="+28"/>
<source>New receiving address</source>
<translation>Cyfeiriad derbyn newydd</translation>
</message>
@@ -758,7 +1057,7 @@ Address: %4
<context>
<name>FreespaceChecker</name>
<message>
- <location filename="../intro.cpp" line="+61"/>
+ <location filename="../intro.cpp" line="+65"/>
<source>A new data directory will be created.</source>
<translation type="unfinished"/>
</message>
@@ -784,15 +1083,19 @@ Address: %4
</message>
</context>
<context>
- <name>GUIUtil::HelpMessageBox</name>
+ <name>HelpMessageDialog</name>
<message>
- <location filename="../guiutil.cpp" line="+558"/>
- <location line="+13"/>
- <source>Bitcoin-Qt</source>
+ <location filename="../forms/helpmessagedialog.ui" line="+19"/>
+ <source>Bitcoin Core - Command-line options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-13"/>
+ <location filename="../utilitydialog.cpp" line="+38"/>
+ <source>Bitcoin Core</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
<source>version</source>
<translation type="unfinished"/>
</message>
@@ -841,17 +1144,17 @@ Address: %4
</message>
<message>
<location line="+9"/>
- <source>Welcome to Bitcoin-Qt.</source>
+ <source>Welcome to Bitcoin Core.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+26"/>
- <source>As this is the first time the program is launched, you can choose where Bitcoin-Qt will store its data.</source>
+ <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+10"/>
- <source>Bitcoin-Qt will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
+ <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -865,7 +1168,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../intro.cpp" line="+105"/>
+ <location filename="../intro.cpp" line="+85"/>
+ <source>Bitcoin</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error: Specified data directory &quot;%1&quot; can not be created.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+19"/>
<source>Error</source>
<translation>Gwall</translation>
</message>
@@ -881,6 +1194,34 @@ Address: %4
</message>
</context>
<context>
+ <name>OpenURIDialog</name>
+ <message>
+ <location filename="../forms/openuridialog.ui" line="+14"/>
+ <source>Open URI</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Open payment request from URI or file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>URI:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Select payment request file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../openuridialog.cpp" line="+47"/>
+ <source>Select payment request file to open</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OptionsDialog</name>
<message>
<location filename="../forms/optionsdialog.ui" line="+14"/>
@@ -888,7 +1229,7 @@ Address: %4
<translation>Opsiynau</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+13"/>
<source>&amp;Main</source>
<translation type="unfinished"/>
</message>
@@ -913,57 +1254,87 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+35"/>
- <source>Reset all client options to default.</source>
+ <location line="+9"/>
+ <source>Size of &amp;database cache</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>&amp;Reset Options</source>
+ <location line="+13"/>
+ <source>Set database cache size in megabytes (default: 25)</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+13"/>
- <source>&amp;Network</source>
+ <source>MB</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>
+ <location line="+27"/>
+ <source>Number of script &amp;verification threads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Connect to the Bitcoin network through a SOCKS proxy.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
- <source>Map port using &amp;UPnP</source>
+ <source>&amp;Connect through SOCKS proxy (default proxy):</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>
+ <location line="+34"/>
+ <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+224"/>
+ <source>Active command-line options that override above options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
+ <source>Reset all client options to default.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
- <source>&amp;Connect through SOCKS proxy:</source>
+ <source>&amp;Reset Options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+9"/>
- <source>Proxy &amp;IP:</source>
+ <location line="-323"/>
+ <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="+19"/>
- <source>IP address of the proxy (e.g. 127.0.0.1)</source>
+ <source>Proxy &amp;IP:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="+32"/>
<source>&amp;Port:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+19"/>
+ <location line="+25"/>
<source>Port of the proxy (e.g. 9050)</source>
<translation type="unfinished"/>
</message>
@@ -1038,7 +1409,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+71"/>
+ <location line="+7"/>
+ <source>Whether to show coin control features or not.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Display coin &amp;control features (experts only)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+136"/>
<source>&amp;OK</source>
<translation type="unfinished"/>
</message>
@@ -1048,44 +1429,38 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>&amp;Apply</source>
+ <location filename="../optionsdialog.cpp" line="+67"/>
+ <source>default</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+58"/>
- <source>default</source>
+ <location line="+57"/>
+ <source>none</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+130"/>
+ <location line="+75"/>
<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>
+ <location line="+29"/>
+ <source>Client restart required to activate changes.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>Do you want to proceed?</source>
+ <location line="-29"/>
+ <source>Client will be shutdown, do you want to proceed?</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
- <location line="+9"/>
- <source>Warning</source>
- <translation>Rhybudd</translation>
- </message>
- <message>
- <location line="-9"/>
- <location line="+9"/>
- <source>This setting will take effect after restarting Bitcoin.</source>
+ <location line="+33"/>
+ <source>This change would require a client restart.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+29"/>
+ <location line="+34"/>
<source>The supplied proxy address is invalid.</source>
<translation type="unfinished"/>
</message>
@@ -1099,22 +1474,22 @@ Address: %4
</message>
<message>
<location line="+50"/>
- <location line="+202"/>
+ <location line="+231"/>
<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="-131"/>
+ <location line="-155"/>
<source>Unconfirmed:</source>
<translation>Nas cadarnheir:</translation>
</message>
<message>
- <location line="-78"/>
+ <location line="-83"/>
<source>Wallet</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+49"/>
+ <location line="+51"/>
<source>Confirmed:</source>
<translation type="unfinished"/>
</message>
@@ -1124,12 +1499,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+29"/>
+ <location line="+32"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+16"/>
<source>Immature:</source>
<translation type="unfinished"/>
</message>
@@ -1139,7 +1514,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+16"/>
<source>Total:</source>
<translation type="unfinished"/>
</message>
@@ -1149,12 +1524,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+53"/>
+ <location line="+71"/>
<source>&lt;b&gt;Recent transactions&lt;/b&gt;</source>
<translation>&lt;b&gt;Trafodion diweddar&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../overviewpage.cpp" line="+116"/>
+ <location filename="../overviewpage.cpp" line="+120"/>
<location line="+1"/>
<source>out of sync</source>
<translation type="unfinished"/>
@@ -1163,7 +1538,8 @@ Address: %4
<context>
<name>PaymentServer</name>
<message>
- <location filename="../paymentserver.cpp" line="+392"/>
+ <location filename="../paymentserver.cpp" line="+403"/>
+ <location line="+13"/>
<source>URI handling</source>
<translation type="unfinished"/>
</message>
@@ -1173,45 +1549,82 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+69"/>
+ <location line="+96"/>
<source>Requested payment amount of %1 is too small (considered dust).</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
- <location line="+37"/>
+ <location line="-221"/>
+ <location line="+212"/>
+ <location line="+13"/>
+ <location line="+95"/>
+ <location line="+18"/>
+ <location line="+16"/>
<source>Payment request error</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="-353"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Net manager warning</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+1"/>
- <source>Insecure requests to custom payment scripts unsupported</source>
+ <source>Your active proxy doesn&apos;t support SOCKS5, which is required for payment requests via proxy.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+38"/>
+ <location line="+52"/>
+ <source>Payment request fetch URL is invalid: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Payment request file handling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Payment request file can not be read or processed! This can be caused by an invalid payment request file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+73"/>
+ <source>Unverified payment requests to custom payment scripts are unsupported.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+59"/>
<source>Refund from %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
+ <location line="+43"/>
<source>Error communicating with %1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+24"/>
+ <source>Payment request can not be parsed or processed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
<source>Bad response from server %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+32"/>
+ <location line="+33"/>
<source>Payment acknowledged</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-58"/>
- <location line="+30"/>
- <location line="+17"/>
+ <location line="-11"/>
<source>Network request error</source>
<translation type="unfinished"/>
</message>
@@ -1219,32 +1632,26 @@ Address: %4
<context>
<name>QObject</name>
<message>
- <location filename="../bitcoin.cpp" line="+114"/>
- <location line="+5"/>
- <location filename="../intro.cpp" line="-32"/>
+ <location filename="../bitcoin.cpp" line="+71"/>
+ <location line="+11"/>
<source>Bitcoin</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-4"/>
+ <location line="+1"/>
<source>Error: Specified data directory &quot;%1&quot; does not exist.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="-12"/>
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../intro.cpp" line="+1"/>
- <source>Error: Specified data directory &quot;%1&quot; can not be created.</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>QRImageWidget</name>
<message>
- <location filename="../receiverequestdialog.cpp" line="+32"/>
+ <location filename="../receiverequestdialog.cpp" line="+36"/>
<source>&amp;Save Image...</source>
<translation type="unfinished"/>
</message>
@@ -1260,7 +1667,7 @@ Address: %4
</message>
<message>
<location line="+0"/>
- <source>PNG Images (*.png)</source>
+ <source>PNG Image (*.png)</source>
<translation type="unfinished"/>
</message>
</context>
@@ -1278,15 +1685,16 @@ Address: %4
<location line="+23"/>
<location line="+23"/>
<location line="+36"/>
- <location line="+53"/>
+ <location line="+23"/>
+ <location line="+36"/>
<location line="+23"/>
<location line="+23"/>
- <location filename="../rpcconsole.cpp" line="+352"/>
+ <location filename="../rpcconsole.cpp" line="+359"/>
<source>N/A</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-217"/>
+ <location line="-223"/>
<source>Client version</source>
<translation type="unfinished"/>
</message>
@@ -1296,7 +1704,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+68"/>
+ <location line="-10"/>
+ <source>Debug window</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+25"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+53"/>
<source>Using OpenSSL version</source>
<translation type="unfinished"/>
</message>
@@ -1312,16 +1730,16 @@ Address: %4
</message>
<message>
<location line="+7"/>
- <source>Number of connections</source>
+ <source>Name</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+23"/>
- <source>On testnet</source>
+ <source>Number of connections</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+23"/>
+ <location line="+29"/>
<source>Block chain</source>
<translation type="unfinished"/>
</message>
@@ -1346,21 +1764,6 @@ Address: %4
<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"/>
@@ -1391,22 +1794,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-541"/>
+ <location line="-521"/>
<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"/>
+ <location line="+206"/>
<source>Debug log file</source>
<translation type="unfinished"/>
</message>
@@ -1416,7 +1809,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+102"/>
+ <location line="+76"/>
<source>Clear console</source>
<translation type="unfinished"/>
</message>
@@ -1436,7 +1829,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+128"/>
+ <location line="+122"/>
<source>%1 B</source>
<translation type="unfinished"/>
</message>
@@ -1474,48 +1867,48 @@ Address: %4
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+22"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
<source>&amp;Amount:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
- <source>The amount to request</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+7"/>
+ <location line="-13"/>
<source>&amp;Label:</source>
<translation>&amp;Label:</translation>
</message>
<message>
- <location line="+10"/>
- <source>The label to associate with the receiving address</source>
+ <location line="-34"/>
+ <source>&amp;Message:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>&amp;Message:</source>
+ <location line="-17"/>
+ <source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>The message to attach to payment request</source>
+ <location line="+3"/>
+ <source>R&amp;euse an existing receiving address (not recommended)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
- <source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
+ <location line="+27"/>
+ <source>An optional label to associate with the new receiving address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>R&amp;euse an existing receiving address (not recommended)</source>
+ <location line="+7"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+7"/>
- <source>Use this form to request payments. All fields are optional.</source>
+ <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+39"/>
+ <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1533,6 +1926,31 @@ Address: %4
<source>&amp;Request payment</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+47"/>
+ <source>Requested payments</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Show the selected request (does the same as double clicking an entry)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Show</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Remove the selected entries from the list</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Remove</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
@@ -1553,16 +1971,11 @@ Address: %4
</message>
<message>
<location line="+7"/>
- <source>&amp;Copy Image</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+7"/>
<source>&amp;Save Image...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../receiverequestdialog.cpp" line="+58"/>
+ <location filename="../receiverequestdialog.cpp" line="+56"/>
<source>Request payment to %1</source>
<translation type="unfinished"/>
</message>
@@ -1608,16 +2021,119 @@ Address: %4
</message>
</context>
<context>
+ <name>RecentRequestsTableModel</name>
+ <message>
+ <location filename="../recentrequeststablemodel.cpp" line="+24"/>
+ <source>Date</source>
+ <translation>Dyddiad</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Label</source>
+ <translation>Label</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Message</source>
+ <translation>Neges</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Amount</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+38"/>
+ <source>(no label)</source>
+ <translation>(heb label)</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>(no message)</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+140"/>
- <location line="+213"/>
+ <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location line="+80"/>
<source>Send Coins</source>
<translation>Anfon arian</translation>
</message>
<message>
- <location line="+50"/>
+ <location line="+76"/>
+ <source>Coin Control Features</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Inputs...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>automatically selected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Insufficient funds!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+89"/>
+ <source>Quantity:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+35"/>
+ <source>Bytes:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Amount:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Priority:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Low Output:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>After Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Change:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+44"/>
+ <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Custom change address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+115"/>
<source>Send to multiple recipients at once</source>
<translation>Anfon at pobl lluosog ar yr un pryd</translation>
</message>
@@ -1642,12 +2158,7 @@ Address: %4
<translation>Gweddill:</translation>
</message>
<message>
- <location line="+10"/>
- <source>123.456 BTC</source>
- <translation>123.456 BTC</translation>
- </message>
- <message>
- <location line="+31"/>
+ <location line="+41"/>
<source>Confirm the send action</source>
<translation>Cadarnhau&apos;r gweithrediad anfon</translation>
</message>
@@ -1657,69 +2168,135 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-154"/>
+ <location filename="../sendcoinsdialog.cpp" line="-228"/>
<source>Confirm send coins</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-90"/>
+ <location line="-74"/>
<location line="+5"/>
<location line="+5"/>
+ <location line="+4"/>
<source>%1 to %2</source>
<translation>%1 i %2</translation>
</message>
<message>
- <location line="+26"/>
+ <location line="-136"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Copy quantity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy after fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy bytes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy low output</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy change</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+170"/>
+ <source>Total Amount %1 (= %2)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>or</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+202"/>
<source>The recipient address is not valid, please recheck.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The amount to pay must be larger than 0.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The amount exceeds your balance.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The total exceeds your balance when the %1 transaction fee is included.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+3"/>
<source>Duplicate address found, can only send to each address once per send operation.</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="+3"/>
+ <source>Transaction creation failed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+4"/>
- <source>Error: Transaction creation failed!</source>
+ <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+15"/>
- <source>Are you sure you want to send?</source>
+ <location line="+112"/>
+ <source>Warning: Invalid Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+9"/>
- <source>added as transaction fee</source>
+ <location line="+21"/>
+ <source>(no label)</source>
+ <translation>(heb label)</translation>
+ </message>
+ <message>
+ <location line="-11"/>
+ <source>Warning: Unknown change address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
- <source>Total Amount %1</source>
+ <location line="-366"/>
+ <source>Are you sure you want to send?</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+20"/>
- <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>
+ <location line="+9"/>
+ <source>added as transaction fee</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+144"/>
+ <location line="+170"/>
<source>Payment request expired</source>
<translation type="unfinished"/>
</message>
@@ -1732,39 +2309,44 @@ Address: %4
<context>
<name>SendCoinsEntry</name>
<message>
- <location filename="../forms/sendcoinsentry.ui" line="+33"/>
- <location line="+585"/>
+ <location filename="../forms/sendcoinsentry.ui" line="+131"/>
+ <location line="+521"/>
+ <location line="+536"/>
<source>A&amp;mount:</source>
<translation>&amp;Maint</translation>
</message>
<message>
- <location line="-572"/>
- <location line="+585"/>
+ <location line="-1152"/>
<source>Pay &amp;To:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-551"/>
+ <location line="+18"/>
<source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../sendcoinsentry.cpp" line="+28"/>
+ <location filename="../sendcoinsentry.cpp" line="+30"/>
<source>Enter a label for this address to add it to your address book</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../forms/sendcoinsentry.ui" line="-18"/>
+ <location filename="../forms/sendcoinsentry.ui" line="+57"/>
<source>&amp;Label:</source>
<translation>&amp;Label:</translation>
</message>
<message>
- <location line="+28"/>
+ <location line="-50"/>
<source>Choose previously used address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
+ <location line="-40"/>
+ <source>This is a normal payment.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+50"/>
<source>Alt+A</source>
<translation>Alt+A</translation>
</message>
@@ -1780,16 +2362,45 @@ Address: %4
</message>
<message>
<location line="+7"/>
- <source>Remove this recipient</source>
+ <location line="+524"/>
+ <location line="+536"/>
+ <source>Remove this entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="-1008"/>
+ <source>Message:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+958"/>
+ <source>This is a verified payment request.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-991"/>
<source>Enter a label for this address to add it to the list of used addresses</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+465"/>
+ <location line="+459"/>
+ <source>This is an unverified payment request.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+18"/>
+ <location line="+532"/>
+ <source>Pay To:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-498"/>
+ <location line="+536"/>
<source>Memo:</source>
<translation type="unfinished"/>
</message>
@@ -1800,6 +2411,19 @@ Address: %4
</message>
</context>
<context>
+ <name>ShutdownWindow</name>
+ <message>
+ <location filename="../utilitydialog.cpp" line="+48"/>
+ <source>Bitcoin Core is shutting down...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Do not shut down the computer until this window disappears.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>SignVerifyMessageDialog</name>
<message>
<location filename="../forms/signverifymessagedialog.ui" line="+14"/>
@@ -1807,7 +2431,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+10"/>
<source>&amp;Sign Message</source>
<translation type="unfinished"/>
</message>
@@ -1910,7 +2534,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+27"/>
+ <location filename="../signverifymessagedialog.cpp" line="+29"/>
<location line="+3"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation type="unfinished"/>
@@ -1926,7 +2550,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+85"/>
+ <location line="+84"/>
<location line="+81"/>
<source>The entered address is invalid.</source>
<translation type="unfinished"/>
@@ -1995,8 +2619,13 @@ Address: %4
<context>
<name>SplashScreen</name>
<message>
- <location filename="../splashscreen.cpp" line="+23"/>
- <source>The Bitcoin developers</source>
+ <location filename="../splashscreen.cpp" line="+28"/>
+ <source>Bitcoin Core</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
<message>
@@ -2008,7 +2637,7 @@ Address: %4
<context>
<name>TrafficGraphWidget</name>
<message>
- <location filename="../trafficgraphwidget.cpp" line="+75"/>
+ <location filename="../trafficgraphwidget.cpp" line="+79"/>
<source>KB/s</source>
<translation type="unfinished"/>
</message>
@@ -2016,7 +2645,7 @@ Address: %4
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="+22"/>
+ <location filename="../transactiondesc.cpp" line="+28"/>
<source>Open until %1</source>
<translation>Agor tan %1</translation>
</message>
@@ -2089,12 +2718,12 @@ Address: %4
<location line="+12"/>
<location line="+45"/>
<location line="+17"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Credit</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="-120"/>
+ <location line="-125"/>
<source>matures in %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -2107,12 +2736,12 @@ Address: %4
<location line="+44"/>
<location line="+8"/>
<location line="+15"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Debit</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-57"/>
+ <location line="-62"/>
<source>Transaction fee</source>
<translation type="unfinished"/>
</message>
@@ -2123,11 +2752,12 @@ Address: %4
</message>
<message>
<location line="+6"/>
+ <location line="+9"/>
<source>Message</source>
<translation>Neges</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="-7"/>
<source>Comment</source>
<translation type="unfinished"/>
</message>
@@ -2137,7 +2767,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+18"/>
<source>Merchant</source>
<translation type="unfinished"/>
</message>
@@ -2177,7 +2807,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-227"/>
+ <location line="-232"/>
<source>, has not been successfully broadcast yet</source>
<translation type="unfinished"/>
</message>
@@ -2208,7 +2838,7 @@ Address: %4
<context>
<name>TransactionTableModel</name>
<message>
- <location filename="../transactiontablemodel.cpp" line="+227"/>
+ <location filename="../transactiontablemodel.cpp" line="+234"/>
<source>Date</source>
<translation>Dyddiad</translation>
</message>
@@ -2227,8 +2857,13 @@ Address: %4
<source>Amount</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+59"/>
+ <source>Immature (%1 confirmations, will be available after %2)</source>
+ <translation type="unfinished"/>
+ </message>
<message numerus="yes">
- <location line="+57"/>
+ <location line="+16"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -2248,17 +2883,13 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
+ <location line="-22"/>
+ <location line="+25"/>
<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"/>
+ <location line="-22"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation type="unfinished"/>
</message>
@@ -2268,7 +2899,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+43"/>
+ <location line="+62"/>
<source>Received with</source>
<translation type="unfinished"/>
</message>
@@ -2326,7 +2957,7 @@ Address: %4
<context>
<name>TransactionView</name>
<message>
- <location filename="../transactionview.cpp" line="+52"/>
+ <location filename="../transactionview.cpp" line="+57"/>
<location line="+16"/>
<source>All</source>
<translation type="unfinished"/>
@@ -2387,12 +3018,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="+6"/>
<source>Enter address or label to search</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="+6"/>
<source>Min amount</source>
<translation type="unfinished"/>
</message>
@@ -2427,17 +3058,37 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+143"/>
- <source>Export Transaction Data</source>
+ <location line="+142"/>
+ <source>Export Transaction History</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="+19"/>
+ <source>Exporting Failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>There was an error trying to save the transaction history to %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Exporting Successful</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The transaction history was successfully saved to %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-22"/>
<source>Comma separated file (*.csv)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+8"/>
+ <location line="+9"/>
<source>Confirmed</source>
<translation type="unfinished"/>
</message>
@@ -2472,17 +3123,7 @@ Address: %4
<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"/>
+ <location line="+107"/>
<source>Range:</source>
<translation type="unfinished"/>
</message>
@@ -2493,9 +3134,17 @@ Address: %4
</message>
</context>
<context>
+ <name>WalletFrame</name>
+ <message>
+ <location filename="../walletframe.cpp" line="+26"/>
+ <source>No wallet has been loaded.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>WalletModel</name>
<message>
- <location filename="../walletmodel.cpp" line="+218"/>
+ <location filename="../walletmodel.cpp" line="+245"/>
<source>Send Coins</source>
<translation type="unfinished"/>
</message>
@@ -2503,7 +3152,7 @@ Address: %4
<context>
<name>WalletView</name>
<message>
- <location filename="../walletview.cpp" line="+46"/>
+ <location filename="../walletview.cpp" line="+43"/>
<source>&amp;Export</source>
<translation type="unfinished"/>
</message>
@@ -2513,65 +3162,60 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+183"/>
+ <location line="+181"/>
<source>Backup Wallet</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
+ <location line="+1"/>
<source>Wallet Data (*.dat)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
+ <location line="+6"/>
<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>
+ <source>There was an error trying to save the wallet data to %1.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+4"/>
- <source>Backup Successful</source>
+ <source>The wallet data was successfully saved to %1.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+0"/>
- <source>The wallet data was successfully saved to the new location.</source>
+ <source>Backup Successful</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+102"/>
- <source>Bitcoin version</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+107"/>
+ <location filename="../bitcoinstrings.cpp" line="+221"/>
<source>Usage:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-55"/>
+ <location line="-54"/>
<source>List commands</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-13"/>
+ <location line="-14"/>
<source>Get help for a command</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+25"/>
+ <location line="+26"/>
<source>Options:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+24"/>
+ <location line="+22"/>
<source>Specify configuration file (default: bitcoin.conf)</source>
<translation type="unfinished"/>
</message>
@@ -2591,7 +3235,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-28"/>
+ <location line="-26"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
<translation type="unfinished"/>
</message>
@@ -2601,7 +3245,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-49"/>
+ <location line="-51"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation type="unfinished"/>
</message>
@@ -2611,37 +3255,37 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-142"/>
+ <location line="-148"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-33"/>
+ <location line="-36"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+40"/>
+ <location line="+45"/>
<source>Accept command line and JSON-RPC commands</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<source>Run in the background as a daemon and accept commands</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+40"/>
+ <location line="+39"/>
<source>Use the test network</source>
<translation type="unfinished"/>
</message>
@@ -2651,7 +3295,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-87"/>
+ <location line="-95"/>
<source>%s, you must set a rpcpassword in the configuration file:
%s
It is recommended you use the following random password:
@@ -2692,6 +3336,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+4"/>
+ <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</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>
@@ -2706,17 +3355,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+11"/>
- <source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source>
+ <location line="+18"/>
+ <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="+6"/>
- <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
+ <location line="+5"/>
+ <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+3"/>
<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>
@@ -2746,17 +3395,27 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
+ <location line="+9"/>
+ <source>&lt;category&gt; can be:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
<source>Attempt to recover private keys from a corrupt wallet.dat</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
+ <source>Bitcoin Core Daemon</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Bitcoin RPC client version</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
<source>Block creation options:</source>
<translation type="unfinished"/>
</message>
@@ -2766,7 +3425,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
+ <source>Connect through SOCKS proxy</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect to JSON-RPC on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation type="unfinished"/>
</message>
@@ -2782,6 +3446,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+1"/>
+ <source>Do not load the wallet and disable wallet RPC calls</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Do you want to rebuild the block database now?</source>
<translation type="unfinished"/>
</message>
@@ -2876,7 +3545,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
+ <source>Fee per kB to add to transactions you send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Find peers using DNS lookup (default: 1 unless -connect)</source>
<translation type="unfinished"/>
</message>
@@ -2896,6 +3570,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
+ <location line="+1"/>
+ <source>If &lt;category&gt; is not supplied, output all debugging information.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+2"/>
<source>Incorrect or no genesis block found. Wrong datadir for network?</source>
<translation type="unfinished"/>
@@ -2911,17 +3590,37 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+8"/>
+ <location line="+5"/>
+ <source>Prepend debug output with timestamp (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>RPC client options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Rebuild block chain index from current blk000??.dat files</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+5"/>
+ <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Send command to Bitcoin server</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
+ <location line="+7"/>
+ <source>Set maximum block size in bytes (default: %d)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Set the number of threads to service RPC calls (default: 4)</source>
<translation type="unfinished"/>
</message>
@@ -2936,12 +3635,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+12"/>
+ <location line="+3"/>
+ <source>This is intended for regression testing tools and app development.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Usage (deprecated, use bitcoin-cli):</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+8"/>
+ <location line="+7"/>
<source>Verifying blocks...</source>
<translation type="unfinished"/>
</message>
@@ -2952,31 +3656,56 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+1"/>
+ <source>Wait for RPC server to start</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Wallet %s resides outside data directory %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+2"/>
+ <source>Wallet options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>You need to rebuild the database using -reindex to change -txindex</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-78"/>
+ <location line="-79"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-98"/>
+ <location line="-105"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+17"/>
+ <location line="+14"/>
+ <source>Output debugging information (default: 0, supplying &lt;category&gt; is optional)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+83"/>
+ <location line="+89"/>
<source>Information</source>
<translation>Gwybodaeth</translation>
</message>
@@ -3016,47 +3745,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<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"/>
+ <location line="+9"/>
<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"/>
+ <location line="+4"/>
<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"/>
+ <location line="+6"/>
<source>Set minimum block size in bytes (default: 0)</source>
<translation type="unfinished"/>
</message>
@@ -3081,7 +3780,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Transaction amount too small</source>
<translation type="unfinished"/>
</message>
@@ -3106,32 +3805,32 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<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="+5"/>
+ <location line="+7"/>
<source>Warning</source>
<translation>Rhybudd</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Warning: This version is obsolete, upgrade required!</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+2"/>
+ <source>version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>wallet.dat corrupt, salvage failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-54"/>
+ <location line="-58"/>
<source>Password for JSON-RPC connections</source>
<translation type="unfinished"/>
</message>
@@ -3141,27 +3840,27 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-126"/>
+ <location line="-132"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+155"/>
+ <location line="+161"/>
<source>Upgrade wallet to latest format</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-12"/>
+ <location line="-11"/>
<source>Rescan the block chain for missing wallet transactions</source>
<translation type="unfinished"/>
</message>
@@ -3171,7 +3870,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-29"/>
+ <location line="-30"/>
<source>Server certificate file (default: server.cert)</source>
<translation type="unfinished"/>
</message>
@@ -3186,27 +3885,22 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Unable to bind to %s on this computer (bind returned error %d, %s)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-95"/>
- <source>Connect through socks proxy</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="-11"/>
+ <location line="-107"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+58"/>
+ <location line="+60"/>
<source>Loading addresses...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-36"/>
+ <location line="-37"/>
<source>Error loading wallet.dat: Wallet corrupted</source>
<translation type="unfinished"/>
</message>
@@ -3226,12 +3920,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+30"/>
+ <location line="+31"/>
<source>Invalid -proxy address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+57"/>
+ <location line="+56"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3241,7 +3935,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3251,7 +3945,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+46"/>
+ <location line="+48"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3271,27 +3965,22 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-60"/>
+ <location line="-62"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-28"/>
+ <location line="-32"/>
<source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+69"/>
- <source>Fee per KB to add to transactions you send</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+20"/>
+ <location line="+95"/>
<source>Loading wallet...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-54"/>
+ <location line="-56"/>
<source>Cannot downgrade wallet</source>
<translation type="unfinished"/>
</message>
@@ -3301,7 +3990,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+66"/>
+ <location line="+67"/>
<source>Rescanning...</source>
<translation type="unfinished"/>
</message>
@@ -3321,7 +4010,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Gwall</translation>
</message>
<message>
- <location line="-33"/>
+ <location line="-35"/>
<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_da.ts b/src/qt/locale/bitcoin_da.ts
index b038021839..56b4ebb3fe 100644
--- a/src/qt/locale/bitcoin_da.ts
+++ b/src/qt/locale/bitcoin_da.ts
@@ -3,13 +3,13 @@
<name>AboutDialog</name>
<message>
<location filename="../forms/aboutdialog.ui" line="+14"/>
- <source>About Bitcoin</source>
- <translation>Om Bitcoin</translation>
+ <source>About Bitcoin Core</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+39"/>
- <source>&lt;b&gt;Bitcoin&lt;/b&gt; version</source>
- <translation>&lt;b&gt;Bitcoin&lt;/b&gt; version</translation>
+ <source>&lt;b&gt;Bitcoin Core&lt;/b&gt; version</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+57"/>
@@ -27,14 +27,14 @@ Det er gjort tilgængeligt under MIT/X11-softwarelicensen. Se den medfølgende f
Produktet indeholder software som er udviklet af OpenSSL Project til brug i OpenSSL Toolkit (http://www.openssl.org/), kryptografisk software skrevet af Eric Young (eay@cryptsoft.com) og UPnP-software skrevet af Thomas Bernard.</translation>
</message>
<message>
- <location filename="../aboutdialog.cpp" line="+14"/>
+ <location filename="../utilitydialog.cpp" line="+29"/>
<source>Copyright</source>
<translation>Copyright</translation>
</message>
<message>
<location line="+0"/>
- <source>The Bitcoin developers</source>
- <translation>Bitcoin-udviklerne</translation>
+ <source>The Bitcoin Core developers</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -52,7 +52,7 @@ Produktet indeholder software som er udviklet af OpenSSL Project til brug i Open
<message>
<location line="+3"/>
<source>&amp;New</source>
- <translation type="unfinished"/>
+ <translation>&amp;Ny</translation>
</message>
<message>
<location line="+11"/>
@@ -62,7 +62,7 @@ Produktet indeholder software som er udviklet af OpenSSL Project til brug i Open
<message>
<location line="+3"/>
<source>&amp;Copy</source>
- <translation type="unfinished"/>
+ <translation>&amp;Kopiér</translation>
</message>
<message>
<location line="+52"/>
@@ -70,7 +70,7 @@ Produktet indeholder software som er udviklet af OpenSSL Project til brug i Open
<translation type="unfinished"/>
</message>
<message>
- <location filename="../addressbookpage.cpp" line="+72"/>
+ <location filename="../addressbookpage.cpp" line="+74"/>
<source>&amp;Copy Address</source>
<translation>Kopier adresse</translation>
</message>
@@ -140,7 +140,7 @@ Produktet indeholder software som er udviklet af OpenSSL Project til brug i Open
<translation>Rediger</translation>
</message>
<message>
- <location line="+197"/>
+ <location line="+194"/>
<source>Export Address List</source>
<translation type="unfinished"/>
</message>
@@ -151,19 +151,19 @@ Produktet indeholder software som er udviklet af OpenSSL Project til brug i Open
</message>
<message>
<location line="+13"/>
- <source>Error exporting</source>
- <translation>Fejl under eksport</translation>
+ <source>Exporting Failed</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation>Kunne ikke skrive til filen %1.</translation>
+ <location line="+1"/>
+ <source>There was an error trying to save the address list to %1.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<name>AddressTableModel</name>
<message>
- <location filename="../addresstablemodel.cpp" line="+164"/>
+ <location filename="../addresstablemodel.cpp" line="+168"/>
<source>Label</source>
<translation>Mærkat</translation>
</message>
@@ -201,7 +201,7 @@ Produktet indeholder software som er udviklet af OpenSSL Project til brug i Open
<translation>Gentag ny adgangskode</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="+34"/>
+ <location filename="../askpassphrasedialog.cpp" line="+40"/>
<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>Indtast den nye adgangskode til tegnebogen.&lt;br/&gt;Brug venligst en adgangskode på &lt;b&gt;10 eller flere tilfældige tegn&lt;/b&gt; eller &lt;b&gt;otte eller flere ord&lt;/b&gt;.</translation>
</message>
@@ -322,22 +322,27 @@ Produktet indeholder software som er udviklet af OpenSSL Project til brug i Open
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+250"/>
+ <location filename="../bitcoingui.cpp" line="+295"/>
<source>Sign &amp;message...</source>
<translation>Underskriv besked...</translation>
</message>
<message>
- <location line="+254"/>
+ <location line="+335"/>
<source>Synchronizing with network...</source>
<translation>Synkroniserer med netværk...</translation>
</message>
<message>
- <location line="-324"/>
+ <location line="-407"/>
<source>&amp;Overview</source>
<translation>Oversigt</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="-137"/>
+ <source>Node</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+138"/>
<source>Show general overview of wallet</source>
<translation>Vis generel oversigt over tegnebog</translation>
</message>
@@ -352,7 +357,7 @@ Produktet indeholder software som er udviklet af OpenSSL Project til brug i Open
<translation>Gennemse transaktionshistorik</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>E&amp;xit</source>
<translation>Luk</translation>
</message>
@@ -398,7 +403,22 @@ Produktet indeholder software som er udviklet af OpenSSL Project til brug i Open
<translation>Skift adgangskode...</translation>
</message>
<message>
- <location line="+259"/>
+ <location line="+10"/>
+ <source>&amp;Sending addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Receiving addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open &amp;URI...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+325"/>
<source>Importing blocks from disk...</source>
<translation>Importerer blokke fra disken...</translation>
</message>
@@ -408,12 +428,12 @@ Produktet indeholder software som er udviklet af OpenSSL Project til brug i Open
<translation>Genindekserer blokke på disken...</translation>
</message>
<message>
- <location line="-322"/>
+ <location line="-405"/>
<source>Send coins to a Bitcoin address</source>
<translation>Send bitcoins til en Bitcoin-adresse</translation>
</message>
<message>
- <location line="+47"/>
+ <location line="+49"/>
<source>Modify configuration options for Bitcoin</source>
<translation>Rediger konfigurationsindstillinger af Bitcoin</translation>
</message>
@@ -443,20 +463,17 @@ Produktet indeholder software som er udviklet af OpenSSL Project til brug i Open
<translation>Verificér besked...</translation>
</message>
<message>
- <location line="-180"/>
- <location line="+6"/>
- <location line="+513"/>
+ <location line="+430"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-519"/>
- <location line="+6"/>
+ <location line="-643"/>
<source>Wallet</source>
<translation>Tegnebog</translation>
</message>
<message>
- <location line="+109"/>
+ <location line="+146"/>
<source>&amp;Send</source>
<translation>Send</translation>
</message>
@@ -466,13 +483,7 @@ Produktet indeholder software som er udviklet af OpenSSL Project til brug i Open
<translation>Modtag</translation>
</message>
<message>
- <location line="+28"/>
- <location line="+2"/>
- <source>&amp;About Bitcoin</source>
- <translation>Om Bitcoin</translation>
- </message>
- <message>
- <location line="+14"/>
+ <location line="+46"/>
<location line="+2"/>
<source>&amp;Show / Hide</source>
<translation>Vis / skjul</translation>
@@ -498,64 +509,80 @@ Produktet indeholder software som er udviklet af OpenSSL Project til brug i Open
<translation>Verificér beskeder for at sikre, at de er underskrevet med de(n) angivne Bitcoin-adresse(r)</translation>
</message>
<message>
- <location line="+35"/>
+ <location line="+48"/>
<source>&amp;File</source>
<translation>Fil</translation>
</message>
<message>
- <location line="+10"/>
+ <location line="+14"/>
<source>&amp;Settings</source>
<translation>Indstillinger</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>&amp;Help</source>
<translation>Hjælp</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+15"/>
<source>Tabs toolbar</source>
<translation>Faneværktøjslinje</translation>
</message>
<message>
- <location line="-235"/>
- <location line="+294"/>
+ <location line="-284"/>
+ <location line="+376"/>
<source>[testnet]</source>
<translation>[testnetværk]</translation>
</message>
<message>
- <location line="-177"/>
+ <location line="-401"/>
+ <source>Bitcoin Core</source>
+ <translation>Bitcoin Core</translation>
+ </message>
+ <message>
+ <location line="+163"/>
<source>Request payments (generates QR codes and bitcoin: URIs)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+63"/>
- <source>&amp;Used sending addresses...</source>
+ <location line="+29"/>
+ <location line="+2"/>
+ <source>&amp;About Bitcoin Core</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="+35"/>
<source>Show the list of used sending addresses and labels</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Used &amp;receiving addresses...</source>
+ <location line="+2"/>
+ <source>Show the list of used receiving addresses and labels</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open a bitcoin: URI or payment request</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Command-line options</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
- <source>Show the list of used receiving addresses and labels</source>
+ <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+106"/>
+ <location line="+159"/>
<location line="+5"/>
<source>Bitcoin client</source>
<translation>Bitcoin-klient</translation>
</message>
<message numerus="yes">
- <location line="+120"/>
+ <location line="+142"/>
<source>%n active connection(s) to Bitcoin network</source>
<translation><numerusform>%n aktiv(e) forbindelse(r) til Bitcoin-netværket</numerusform><numerusform>%n aktiv(e) forbindelse(r) til Bitcoin-netværket</numerusform></translation>
</message>
@@ -575,7 +602,7 @@ Produktet indeholder software som er udviklet af OpenSSL Project til brug i Open
<translation>Behandlet %1 blokke af transaktionshistorikken.</translation>
</message>
<message numerus="yes">
- <location line="+20"/>
+ <location line="+23"/>
<source>%n hour(s)</source>
<translation><numerusform>%n time(r)</numerusform><numerusform>%n time(r)</numerusform></translation>
</message>
@@ -595,7 +622,7 @@ Produktet indeholder software som er udviklet af OpenSSL Project til brug i Open
<translation>%1 bagud</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="+21"/>
<source>Last received block was generated %1 ago.</source>
<translation>Senest modtagne blok blev genereret for %1 siden.</translation>
</message>
@@ -620,27 +647,17 @@ Produktet indeholder software som er udviklet af OpenSSL Project til brug i Open
<translation>Information</translation>
</message>
<message>
- <location line="+77"/>
- <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
- <translation>Transaktionen overskrider størrelsesgrænsen. Du kan stadig sende den for et gebyr på %1, hvilket går til de knuder, der behandler din transaktion og hjælper med at understøtte netværket. Vil du betale gebyret?</translation>
- </message>
- <message>
- <location line="-152"/>
+ <location line="-85"/>
<source>Up to date</source>
<translation>Opdateret</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Catching up...</source>
<translation>Indhenter...</translation>
</message>
<message>
- <location line="+124"/>
- <source>Confirm transaction fee</source>
- <translation>Bekræft transaktionsgebyr</translation>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+130"/>
<source>Sent transaction</source>
<translation>Afsendt transaktion</translation>
</message>
@@ -663,17 +680,7 @@ Adresse: %4
</translation>
</message>
<message>
- <location line="+34"/>
- <source>URI handling</source>
- <translation>URI-håndtering</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
- <translation>URI kan ikke fortolkes! Dette kan skyldes en ugyldig Bitcoin-adresse eller misdannede URI-parametre.</translation>
- </message>
- <message>
- <location line="+45"/>
+ <location line="+69"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation>Tegnebog er &lt;b&gt;krypteret&lt;/b&gt; og i øjeblikket &lt;b&gt;ulåst&lt;/b&gt;</translation>
</message>
@@ -683,7 +690,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 filename="../bitcoin.cpp" line="+110"/>
+ <location filename="../bitcoin.cpp" line="+438"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation>Der opstod en fatal fejl. Bitcoin kan ikke længere fortsætte sikkert og vil afslutte.</translation>
</message>
@@ -691,12 +698,304 @@ Adresse: %4
<context>
<name>ClientModel</name>
<message>
- <location filename="../clientmodel.cpp" line="+115"/>
+ <location filename="../clientmodel.cpp" line="+119"/>
<source>Network Alert</source>
<translation>Netværksadvarsel</translation>
</message>
</context>
<context>
+ <name>CoinControlDialog</name>
+ <message>
+ <location filename="../forms/coincontroldialog.ui" line="+14"/>
+ <source>Coin Control Address Selection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>Quantity:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Bytes:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>Amount:</source>
+ <translation>Beløb:</translation>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Priority:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Low Output:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>After Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Change:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+63"/>
+ <source>(un)select all</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Tree mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>List mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>Amount</source>
+ <translation>Beløb</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Address</source>
+ <translation>Adresse</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Date</source>
+ <translation>Dato</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Confirmations</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Confirmed</source>
+ <translation>Bekræftet</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../coincontroldialog.cpp" line="+42"/>
+ <source>Copy address</source>
+ <translation>Kopier adresse</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy label</source>
+ <translation>Kopier mærkat</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+26"/>
+ <source>Copy amount</source>
+ <translation>Kopier beløb</translation>
+ </message>
+ <message>
+ <location line="-25"/>
+ <source>Copy transaction ID</source>
+ <translation>Kopier transaktionens ID</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Lock unspent</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Unlock unspent</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+22"/>
+ <source>Copy quantity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Copy fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy after fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy bytes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy low output</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy change</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+323"/>
+ <source>highest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>higher</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>high</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>medium-high</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>medium</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>low-medium</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>low</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>lower</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>lowest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>(%1 locked)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+140"/>
+ <source>Dust</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>yes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>no</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>This label turns red, if the transaction size is greater than 1000 bytes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+5"/>
+ <source>This means a fee of at least %1 per kB is required.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-4"/>
+ <source>Can vary +/- 1 byte per input.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Transactions with higher priority are more likely to get included into a block.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>This label turns red, if the priority is smaller than &quot;medium&quot;.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>This label turns red, if any recipient receives an amount smaller than %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+4"/>
+ <source>This means a fee of at least %1 is required.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-3"/>
+ <source>Amounts below 0.546 times the minimum relay fee are shown as dust.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>This label turns red, if the change is smaller than %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
+ <location line="+66"/>
+ <source>(no label)</source>
+ <translation>(ingen mærkat)</translation>
+ </message>
+ <message>
+ <location line="-9"/>
+ <source>change from %1 (%2)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>(change)</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>EditAddressDialog</name>
<message>
<location filename="../forms/editaddressdialog.ui" line="+14"/>
@@ -724,7 +1023,7 @@ Adresse: %4
<translation>Adresse</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+21"/>
+ <location filename="../editaddressdialog.cpp" line="+28"/>
<source>New receiving address</source>
<translation>Ny modtagelsesadresse</translation>
</message>
@@ -767,14 +1066,14 @@ Adresse: %4
<context>
<name>FreespaceChecker</name>
<message>
- <location filename="../intro.cpp" line="+61"/>
+ <location filename="../intro.cpp" line="+65"/>
<source>A new data directory will be created.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+22"/>
<source>name</source>
- <translation type="unfinished"/>
+ <translation>navn</translation>
</message>
<message>
<location line="+2"/>
@@ -793,15 +1092,19 @@ Adresse: %4
</message>
</context>
<context>
- <name>GUIUtil::HelpMessageBox</name>
+ <name>HelpMessageDialog</name>
<message>
- <location filename="../guiutil.cpp" line="+558"/>
- <location line="+13"/>
- <source>Bitcoin-Qt</source>
- <translation>Bitcoin-Qt</translation>
+ <location filename="../forms/helpmessagedialog.ui" line="+19"/>
+ <source>Bitcoin Core - Command-line options</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="-13"/>
+ <location filename="../utilitydialog.cpp" line="+38"/>
+ <source>Bitcoin Core</source>
+ <translation>Bitcoin Core</translation>
+ </message>
+ <message>
+ <location line="+0"/>
<source>version</source>
<translation>version</translation>
</message>
@@ -850,17 +1153,17 @@ Adresse: %4
</message>
<message>
<location line="+9"/>
- <source>Welcome to Bitcoin-Qt.</source>
- <translation>Velkommen til Bitcoin-Qt.</translation>
+ <source>Welcome to Bitcoin Core.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+26"/>
- <source>As this is the first time the program is launched, you can choose where Bitcoin-Qt will store its data.</source>
+ <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+10"/>
- <source>Bitcoin-Qt will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
+ <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -874,7 +1177,17 @@ Adresse: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../intro.cpp" line="+105"/>
+ <location filename="../intro.cpp" line="+85"/>
+ <source>Bitcoin</source>
+ <translation>Bitcoin</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error: Specified data directory &quot;%1&quot; can not be created.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+19"/>
<source>Error</source>
<translation>Fejl</translation>
</message>
@@ -890,6 +1203,34 @@ Adresse: %4
</message>
</context>
<context>
+ <name>OpenURIDialog</name>
+ <message>
+ <location filename="../forms/openuridialog.ui" line="+14"/>
+ <source>Open URI</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Open payment request from URI or file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>URI:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Select payment request file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../openuridialog.cpp" line="+47"/>
+ <source>Select payment request file to open</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OptionsDialog</name>
<message>
<location filename="../forms/optionsdialog.ui" line="+14"/>
@@ -897,7 +1238,7 @@ Adresse: %4
<translation>Indstillinger</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+13"/>
<source>&amp;Main</source>
<translation>Generelt</translation>
</message>
@@ -922,7 +1263,52 @@ Adresse: %4
<translation>Start Bitcoin, når systemet startes</translation>
</message>
<message>
- <location line="+35"/>
+ <location line="+9"/>
+ <source>Size of &amp;database cache</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set database cache size in megabytes (default: 25)</source>
+ <translation>Angiv databasecachestørrelse i megabytes (standard: 25)</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>MB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Number of script &amp;verification threads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
+ <translation>Angiv nummeret af tråde til verificering af script (op til 16, 0 = automatisk, &lt;0 = efterlad det antal kerner tilgængelige, standard: 0)</translation>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Connect to the Bitcoin network through a SOCKS proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Connect through SOCKS proxy (default proxy):</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+224"/>
+ <source>Active command-line options that override above options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
<source>Reset all client options to default.</source>
<translation>Nulstil alle klientindstillinger til deres standard.</translation>
</message>
@@ -932,7 +1318,7 @@ Adresse: %4
<translation>Nulstil indstillinger</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="-323"/>
<source>&amp;Network</source>
<translation>Netværk</translation>
</message>
@@ -947,32 +1333,17 @@ Adresse: %4
<translation>Konfigurer port vha. 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>Opret forbindelse til Bitcoin-netværket via en SOCKS-proxy (f.eks. ved tilslutning gennem Tor)</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>&amp;Connect through SOCKS proxy:</source>
- <translation>Forbind gennem SOCKS-proxy:</translation>
- </message>
- <message>
- <location line="+9"/>
+ <location line="+19"/>
<source>Proxy &amp;IP:</source>
<translation>Proxy-IP:</translation>
</message>
<message>
- <location line="+19"/>
- <source>IP address of the proxy (e.g. 127.0.0.1)</source>
- <translation>IP-adressen på proxyen (f.eks. 127.0.0.1)</translation>
- </message>
- <message>
- <location line="+7"/>
+ <location line="+32"/>
<source>&amp;Port:</source>
<translation>Port:</translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+25"/>
<source>Port of the proxy (e.g. 9050)</source>
<translation>Porten på proxyen (f.eks. 9050)</translation>
</message>
@@ -1047,7 +1418,17 @@ Adresse: %4
<translation>Vis adresser i transaktionsliste</translation>
</message>
<message>
- <location line="+71"/>
+ <location line="+7"/>
+ <source>Whether to show coin control features or not.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Display coin &amp;control features (experts only)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+136"/>
<source>&amp;OK</source>
<translation>OK</translation>
</message>
@@ -1057,44 +1438,38 @@ Adresse: %4
<translation>Annuller</translation>
</message>
<message>
- <location line="+10"/>
- <source>&amp;Apply</source>
- <translation>Anvend</translation>
- </message>
- <message>
- <location filename="../optionsdialog.cpp" line="+58"/>
+ <location filename="../optionsdialog.cpp" line="+67"/>
<source>default</source>
<translation>standard</translation>
</message>
<message>
- <location line="+130"/>
+ <location line="+57"/>
+ <source>none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+75"/>
<source>Confirm options reset</source>
<translation>Bekræft nulstilling af indstillinger</translation>
</message>
<message>
<location line="+1"/>
- <source>Some settings may require a client restart to take effect.</source>
- <translation>Nogle indstillinger kan kræve, at klienten genstartes, før de træder i kraft.</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Do you want to proceed?</source>
- <translation>Ønsker du at fortsætte?</translation>
+ <location line="+29"/>
+ <source>Client restart required to activate changes.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
- <location line="+9"/>
- <source>Warning</source>
- <translation>Advarsel</translation>
+ <location line="-29"/>
+ <source>Client will be shutdown, do you want to proceed?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="-9"/>
- <location line="+9"/>
- <source>This setting will take effect after restarting Bitcoin.</source>
- <translation>Denne indstilling træder i kraft, efter Bitcoin genstartes.</translation>
+ <location line="+33"/>
+ <source>This change would require a client restart.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+29"/>
+ <location line="+34"/>
<source>The supplied proxy address is invalid.</source>
<translation>Ugyldig proxy-adresse</translation>
</message>
@@ -1108,22 +1483,22 @@ Adresse: %4
</message>
<message>
<location line="+50"/>
- <location line="+202"/>
+ <location line="+231"/>
<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 viste information kan være forældet. Din tegnebog synkroniserer automatisk med Bitcoin-netværket, når en forbindelse etableres, men denne proces er ikke gennemført endnu.</translation>
</message>
<message>
- <location line="-131"/>
+ <location line="-155"/>
<source>Unconfirmed:</source>
<translation>Ubekræftede:</translation>
</message>
<message>
- <location line="-78"/>
+ <location line="-83"/>
<source>Wallet</source>
<translation>Tegnebog</translation>
</message>
<message>
- <location line="+49"/>
+ <location line="+51"/>
<source>Confirmed:</source>
<translation>Bekræftede:</translation>
</message>
@@ -1133,12 +1508,12 @@ Adresse: %4
<translation>Din nuværende tilgængelige saldo</translation>
</message>
<message>
- <location line="+29"/>
+ <location line="+32"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+16"/>
<source>Immature:</source>
<translation>Umodne:</translation>
</message>
@@ -1148,7 +1523,7 @@ Adresse: %4
<translation>Udvunden saldo, som endnu ikke er modnet</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+16"/>
<source>Total:</source>
<translation>Total:</translation>
</message>
@@ -1158,12 +1533,12 @@ Adresse: %4
<translation>Din nuværende totale saldo</translation>
</message>
<message>
- <location line="+53"/>
+ <location line="+71"/>
<source>&lt;b&gt;Recent transactions&lt;/b&gt;</source>
<translation>&lt;b&gt;Nyeste transaktioner&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../overviewpage.cpp" line="+116"/>
+ <location filename="../overviewpage.cpp" line="+120"/>
<location line="+1"/>
<source>out of sync</source>
<translation>ikke synkroniseret</translation>
@@ -1172,7 +1547,8 @@ Adresse: %4
<context>
<name>PaymentServer</name>
<message>
- <location filename="../paymentserver.cpp" line="+392"/>
+ <location filename="../paymentserver.cpp" line="+403"/>
+ <location line="+13"/>
<source>URI handling</source>
<translation>URI-håndtering</translation>
</message>
@@ -1182,45 +1558,82 @@ Adresse: %4
<translation>URI kan ikke fortolkes! Dette kan skyldes en ugyldig Bitcoin-adresse eller misdannede URI-parametre.</translation>
</message>
<message>
- <location line="+69"/>
+ <location line="+96"/>
<source>Requested payment amount of %1 is too small (considered dust).</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
- <location line="+37"/>
+ <location line="-221"/>
+ <location line="+212"/>
+ <location line="+13"/>
+ <location line="+95"/>
+ <location line="+18"/>
+ <location line="+16"/>
<source>Payment request error</source>
+ <translation>Fejl i betalingsforespørgelse</translation>
+ </message>
+ <message>
+ <location line="-353"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
+ <translation>Kan ikke starte bitcoin: click-to-pay-håndtering</translation>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Net manager warning</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
- <source>Insecure requests to custom payment scripts unsupported</source>
+ <source>Your active proxy doesn&apos;t support SOCKS5, which is required for payment requests via proxy.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+38"/>
- <source>Refund from %1</source>
+ <location line="+52"/>
+ <source>Payment request fetch URL is invalid: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
+ <location line="+27"/>
+ <source>Payment request file handling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Payment request file can not be read or processed! This can be caused by an invalid payment request file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+73"/>
+ <source>Unverified payment requests to custom payment scripts are unsupported.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+59"/>
+ <source>Refund from %1</source>
+ <translation>Tilbagebetaling fra %1</translation>
+ </message>
+ <message>
+ <location line="+43"/>
<source>Error communicating with %1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+24"/>
+ <source>Payment request can not be parsed or processed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
<source>Bad response from server %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+32"/>
+ <location line="+33"/>
<source>Payment acknowledged</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-58"/>
- <location line="+30"/>
- <location line="+17"/>
+ <location line="-11"/>
<source>Network request error</source>
<translation type="unfinished"/>
</message>
@@ -1228,39 +1641,33 @@ Adresse: %4
<context>
<name>QObject</name>
<message>
- <location filename="../bitcoin.cpp" line="+114"/>
- <location line="+5"/>
- <location filename="../intro.cpp" line="-32"/>
+ <location filename="../bitcoin.cpp" line="+71"/>
+ <location line="+11"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-4"/>
+ <location line="+1"/>
<source>Error: Specified data directory &quot;%1&quot; does not exist.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="-12"/>
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../intro.cpp" line="+1"/>
- <source>Error: Specified data directory &quot;%1&quot; can not be created.</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>QRImageWidget</name>
<message>
- <location filename="../receiverequestdialog.cpp" line="+32"/>
+ <location filename="../receiverequestdialog.cpp" line="+36"/>
<source>&amp;Save Image...</source>
- <translation type="unfinished"/>
+ <translation>&amp;Gem foto...</translation>
</message>
<message>
<location line="+3"/>
<source>&amp;Copy Image</source>
- <translation type="unfinished"/>
+ <translation>&amp;Kopiér foto</translation>
</message>
<message>
<location line="+28"/>
@@ -1269,8 +1676,8 @@ Adresse: %4
</message>
<message>
<location line="+0"/>
- <source>PNG Images (*.png)</source>
- <translation>PNG-billeder (*.png)</translation>
+ <source>PNG Image (*.png)</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1287,15 +1694,16 @@ Adresse: %4
<location line="+23"/>
<location line="+23"/>
<location line="+36"/>
- <location line="+53"/>
+ <location line="+23"/>
+ <location line="+36"/>
<location line="+23"/>
<location line="+23"/>
- <location filename="../rpcconsole.cpp" line="+352"/>
+ <location filename="../rpcconsole.cpp" line="+359"/>
<source>N/A</source>
<translation>N/A</translation>
</message>
<message>
- <location line="-217"/>
+ <location line="-223"/>
<source>Client version</source>
<translation>Klientversion</translation>
</message>
@@ -1305,7 +1713,17 @@ Adresse: %4
<translation>Information</translation>
</message>
<message>
- <location line="+68"/>
+ <location line="-10"/>
+ <source>Debug window</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+25"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+53"/>
<source>Using OpenSSL version</source>
<translation>Anvender OpenSSL-version</translation>
</message>
@@ -1321,16 +1739,16 @@ Adresse: %4
</message>
<message>
<location line="+7"/>
- <source>Number of connections</source>
- <translation>Antal forbindelser</translation>
+ <source>Name</source>
+ <translation>Navn</translation>
</message>
<message>
<location line="+23"/>
- <source>On testnet</source>
- <translation>Tilsluttet testnetværk</translation>
+ <source>Number of connections</source>
+ <translation>Antal forbindelser</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+29"/>
<source>Block chain</source>
<translation>Blokkæde</translation>
</message>
@@ -1355,21 +1773,6 @@ Adresse: %4
<translation>Ã…bn</translation>
</message>
<message>
- <location line="+16"/>
- <source>Command-line options</source>
- <translation>Kommandolinjetilvalg</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>Vis Bitcoin-Qt-hjælpebeskeden for at få en liste over de tilgængelige Bitcoin-kommandolinjeindstillinger.</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>&amp;Show</source>
- <translation>Vis</translation>
- </message>
- <message>
<location line="+24"/>
<source>&amp;Console</source>
<translation>Konsol</translation>
@@ -1397,25 +1800,15 @@ Adresse: %4
<message>
<location line="+80"/>
<source>Out:</source>
- <translation type="unfinished"/>
+ <translation>Ud:</translation>
</message>
<message>
- <location line="-541"/>
+ <location line="-521"/>
<source>Build date</source>
<translation>Byggedato</translation>
</message>
<message>
- <location line="-104"/>
- <source>Bitcoin - Debug window</source>
- <translation>Bitcoin - Fejlsøgningsvindue</translation>
- </message>
- <message>
- <location line="+25"/>
- <source>Bitcoin Core</source>
- <translation>Bitcoin Core</translation>
- </message>
- <message>
- <location line="+279"/>
+ <location line="+206"/>
<source>Debug log file</source>
<translation>Fejlsøgningslogfil</translation>
</message>
@@ -1425,7 +1818,7 @@ Adresse: %4
<translation>Åbn Bitcoin-fejlsøgningslogfilen fra det nuværende datakatalog. Dette kan tage nogle få sekunder for en store logfiler.</translation>
</message>
<message>
- <location line="+102"/>
+ <location line="+76"/>
<source>Clear console</source>
<translation>Ryd konsol</translation>
</message>
@@ -1445,24 +1838,24 @@ Adresse: %4
<translation>Tast &lt;b&gt;help&lt;/b&gt; for en oversigt over de tilgængelige kommandoer.</translation>
</message>
<message>
- <location line="+128"/>
+ <location line="+122"/>
<source>%1 B</source>
- <translation type="unfinished"/>
+ <translation>%1 B</translation>
</message>
<message>
<location line="+2"/>
<source>%1 KB</source>
- <translation type="unfinished"/>
+ <translation>%1 KB</translation>
</message>
<message>
<location line="+2"/>
<source>%1 MB</source>
- <translation type="unfinished"/>
+ <translation>%1 MB</translation>
</message>
<message>
<location line="+2"/>
<source>%1 GB</source>
- <translation type="unfinished"/>
+ <translation>%1 GB</translation>
</message>
<message>
<location line="+7"/>
@@ -1483,63 +1876,88 @@ Adresse: %4
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+22"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
<source>&amp;Amount:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+16"/>
- <source>The amount to request</source>
- <translation type="unfinished"/>
+ <translation>&amp;Mængde:</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="-13"/>
<source>&amp;Label:</source>
<translation>Mærkat:</translation>
</message>
<message>
- <location line="+10"/>
- <source>The label to associate with the receiving address</source>
- <translation type="unfinished"/>
+ <location line="-34"/>
+ <source>&amp;Message:</source>
+ <translation>&amp;Besked:</translation>
</message>
<message>
- <location line="+7"/>
- <source>&amp;Message:</source>
+ <location line="-17"/>
+ <source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>The message to attach to payment request</source>
+ <location line="+3"/>
+ <source>R&amp;euse an existing receiving address (not recommended)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
- <source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
+ <location line="+27"/>
+ <source>An optional label to associate with the new receiving address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>R&amp;euse an existing receiving address (not recommended)</source>
+ <location line="+7"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+7"/>
- <source>Use this form to request payments. All fields are optional.</source>
+ <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+39"/>
+ <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+17"/>
<source>Clear all fields of the form.</source>
- <translation type="unfinished"/>
+ <translation>Ryd alle fælter af formen.</translation>
</message>
<message>
<location line="+3"/>
<source>Clear</source>
- <translation type="unfinished"/>
+ <translation>Ryd</translation>
</message>
<message>
<location line="+36"/>
<source>&amp;Request payment</source>
+ <translation>&amp;Anmod betaling</translation>
+ </message>
+ <message>
+ <location line="+47"/>
+ <source>Requested payments</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Show the selected request (does the same as double clicking an entry)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Show</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Remove the selected entries from the list</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Remove</source>
<translation type="unfinished"/>
</message>
</context>
@@ -1548,42 +1966,37 @@ Adresse: %4
<message>
<location filename="../forms/receiverequestdialog.ui" line="+29"/>
<source>QR Code</source>
- <translation type="unfinished"/>
+ <translation>QR Kode</translation>
</message>
<message>
<location line="+46"/>
<source>Copy &amp;URI</source>
- <translation type="unfinished"/>
+ <translation>Kopiér &amp;URL</translation>
</message>
<message>
<location line="+7"/>
<source>Copy &amp;Address</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+7"/>
- <source>&amp;Copy Image</source>
- <translation type="unfinished"/>
+ <translation>Kopiér &amp;Adresse</translation>
</message>
<message>
<location line="+7"/>
<source>&amp;Save Image...</source>
- <translation type="unfinished"/>
+ <translation>&amp;Gem foto...</translation>
</message>
<message>
- <location filename="../receiverequestdialog.cpp" line="+58"/>
+ <location filename="../receiverequestdialog.cpp" line="+56"/>
<source>Request payment to %1</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+6"/>
<source>Payment information</source>
- <translation type="unfinished"/>
+ <translation>Betalingsinformation</translation>
</message>
<message>
<location line="+1"/>
<source>URI</source>
- <translation type="unfinished"/>
+ <translation>URI</translation>
</message>
<message>
<location line="+2"/>
@@ -1617,16 +2030,119 @@ Adresse: %4
</message>
</context>
<context>
+ <name>RecentRequestsTableModel</name>
+ <message>
+ <location filename="../recentrequeststablemodel.cpp" line="+24"/>
+ <source>Date</source>
+ <translation>Dato</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Label</source>
+ <translation>Mærkat</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Message</source>
+ <translation>Besked</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Amount</source>
+ <translation>Beløb</translation>
+ </message>
+ <message>
+ <location line="+38"/>
+ <source>(no label)</source>
+ <translation>(ingen mærkat)</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>(no message)</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+140"/>
- <location line="+213"/>
+ <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location line="+80"/>
<source>Send Coins</source>
<translation>Send bitcoins</translation>
</message>
<message>
- <location line="+50"/>
+ <location line="+76"/>
+ <source>Coin Control Features</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Inputs...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>automatically selected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Insufficient funds!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+89"/>
+ <source>Quantity:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+35"/>
+ <source>Bytes:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Amount:</source>
+ <translation>Beløb:</translation>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Priority:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Low Output:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>After Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Change:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+44"/>
+ <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Custom change address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+115"/>
<source>Send to multiple recipients at once</source>
<translation>Send til flere modtagere på en gang</translation>
</message>
@@ -1638,7 +2154,7 @@ Adresse: %4
<message>
<location line="+20"/>
<source>Clear all fields of the form.</source>
- <translation type="unfinished"/>
+ <translation>Ryd alle fælter af formen.</translation>
</message>
<message>
<location line="+3"/>
@@ -1651,12 +2167,7 @@ Adresse: %4
<translation>Saldo:</translation>
</message>
<message>
- <location line="+10"/>
- <source>123.456 BTC</source>
- <translation>123,456 BTC</translation>
- </message>
- <message>
- <location line="+31"/>
+ <location line="+41"/>
<source>Confirm the send action</source>
<translation>Bekræft afsendelsen</translation>
</message>
@@ -1666,71 +2177,137 @@ Adresse: %4
<translation>Afsend</translation>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-154"/>
+ <location filename="../sendcoinsdialog.cpp" line="-228"/>
<source>Confirm send coins</source>
<translation>Bekræft afsendelse af bitcoins</translation>
</message>
<message>
- <location line="-90"/>
+ <location line="-74"/>
<location line="+5"/>
<location line="+5"/>
+ <location line="+4"/>
<source>%1 to %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+26"/>
+ <location line="-136"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation>Indtast en Bitcoin-adresse (f.eks. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Copy quantity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation>Kopier beløb</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy after fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy bytes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy low output</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy change</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+170"/>
+ <source>Total Amount %1 (= %2)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>or</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+202"/>
<source>The recipient address is not valid, please recheck.</source>
<translation>Modtagerens adresse er ikke gyldig. Tjek venligst adressen igen.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The amount to pay must be larger than 0.</source>
<translation>Beløbet til betaling skal være større end 0.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The amount exceeds your balance.</source>
<translation>Beløbet overstiger din saldo.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The total exceeds your balance when the %1 transaction fee is included.</source>
<translation>Totalen overstiger din saldo, når %1 transaktionsgebyr er inkluderet.</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+3"/>
<source>Duplicate address found, can only send to each address once per send operation.</source>
<translation>Duplikeret adresse fundet. Du kan kun sende til hver adresse en gang pr. afsendelse.</translation>
</message>
<message>
- <location line="+4"/>
- <source>Error: Transaction creation failed!</source>
- <translation>Fejl: Oprettelse af transaktionen mislykkedes!</translation>
+ <location line="+3"/>
+ <source>Transaction creation failed!</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+15"/>
- <source>Are you sure you want to send?</source>
+ <location line="+4"/>
+ <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+9"/>
- <source>added as transaction fee</source>
+ <location line="+112"/>
+ <source>Warning: Invalid Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
- <source>Total Amount %1</source>
+ <location line="+21"/>
+ <source>(no label)</source>
+ <translation>(ingen mærkat)</translation>
+ </message>
+ <message>
+ <location line="-11"/>
+ <source>Warning: Unknown change address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+20"/>
- <source>Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
- <translation>Fejl: Transaktionen blev afvist. Dette kan ske, hvis nogle af dine bitcoins i din tegnebog allerede er brugt, som hvis du brugte en kopi af wallet.dat og dine bitcoins er blevet brugt i kopien, men ikke er markeret som brugt her.</translation>
+ <location line="-366"/>
+ <source>Are you sure you want to send?</source>
+ <translation>Er du sikker på at du vil sende?</translation>
</message>
<message>
- <location line="+144"/>
+ <location line="+9"/>
+ <source>added as transaction fee</source>
+ <translation>tilføjet som transaktionsgebyr</translation>
+ </message>
+ <message>
+ <location line="+170"/>
<source>Payment request expired</source>
- <translation type="unfinished"/>
+ <translation>Betalingsforespørgsel udløb</translation>
</message>
<message>
<location line="+8"/>
@@ -1741,39 +2318,44 @@ Adresse: %4
<context>
<name>SendCoinsEntry</name>
<message>
- <location filename="../forms/sendcoinsentry.ui" line="+33"/>
- <location line="+585"/>
+ <location filename="../forms/sendcoinsentry.ui" line="+131"/>
+ <location line="+521"/>
+ <location line="+536"/>
<source>A&amp;mount:</source>
<translation>Beløb:</translation>
</message>
<message>
- <location line="-572"/>
- <location line="+585"/>
+ <location line="-1152"/>
<source>Pay &amp;To:</source>
<translation>Betal til:</translation>
</message>
<message>
- <location line="-551"/>
+ <location line="+18"/>
<source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>Bitcoin-adressen som betalingen skal sendes til (f.eks. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location filename="../sendcoinsentry.cpp" line="+28"/>
+ <location filename="../sendcoinsentry.cpp" line="+30"/>
<source>Enter a label for this address to add it to your address book</source>
<translation>Indtast en mærkat for denne adresse for at føje den til din adressebog</translation>
</message>
<message>
- <location filename="../forms/sendcoinsentry.ui" line="-18"/>
+ <location filename="../forms/sendcoinsentry.ui" line="+57"/>
<source>&amp;Label:</source>
<translation>Mærkat:</translation>
</message>
<message>
- <location line="+28"/>
+ <location line="-50"/>
<source>Choose previously used address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
+ <location line="-40"/>
+ <source>This is a normal payment.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+50"/>
<source>Alt+A</source>
<translation>Alt+A</translation>
</message>
@@ -1789,16 +2371,45 @@ Adresse: %4
</message>
<message>
<location line="+7"/>
- <source>Remove this recipient</source>
- <translation>Fjern denne modtager</translation>
+ <location line="+524"/>
+ <location line="+536"/>
+ <source>Remove this entry</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="-1008"/>
+ <source>Message:</source>
+ <translation>Besked:</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+958"/>
+ <source>This is a verified payment request.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-991"/>
<source>Enter a label for this address to add it to the list of used addresses</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+465"/>
+ <location line="+459"/>
+ <source>This is an unverified payment request.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+18"/>
+ <location line="+532"/>
+ <source>Pay To:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-498"/>
+ <location line="+536"/>
<source>Memo:</source>
<translation type="unfinished"/>
</message>
@@ -1809,6 +2420,19 @@ Adresse: %4
</message>
</context>
<context>
+ <name>ShutdownWindow</name>
+ <message>
+ <location filename="../utilitydialog.cpp" line="+48"/>
+ <source>Bitcoin Core is shutting down...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Do not shut down the computer until this window disappears.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>SignVerifyMessageDialog</name>
<message>
<location filename="../forms/signverifymessagedialog.ui" line="+14"/>
@@ -1816,7 +2440,7 @@ Adresse: %4
<translation>Signature - Underskriv/verificér en besked</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+10"/>
<source>&amp;Sign Message</source>
<translation>Underskriv besked</translation>
</message>
@@ -1919,7 +2543,7 @@ Adresse: %4
<translation>Nulstil alle &quot;verificér besked&quot;-felter</translation>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+27"/>
+ <location filename="../signverifymessagedialog.cpp" line="+29"/>
<location line="+3"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>Indtast en Bitcoin-adresse (f.eks. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
@@ -1935,7 +2559,7 @@ Adresse: %4
<translation>Indtast Bitcoin-underskriften</translation>
</message>
<message>
- <location line="+85"/>
+ <location line="+84"/>
<location line="+81"/>
<source>The entered address is invalid.</source>
<translation>Den indtastede adresse er ugyldig.</translation>
@@ -2004,9 +2628,14 @@ Adresse: %4
<context>
<name>SplashScreen</name>
<message>
- <location filename="../splashscreen.cpp" line="+23"/>
- <source>The Bitcoin developers</source>
- <translation>Bitcoin-udviklerne</translation>
+ <location filename="../splashscreen.cpp" line="+28"/>
+ <source>Bitcoin Core</source>
+ <translation>Bitcoin Core</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>The Bitcoin Core developers</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
@@ -2017,15 +2646,15 @@ Adresse: %4
<context>
<name>TrafficGraphWidget</name>
<message>
- <location filename="../trafficgraphwidget.cpp" line="+75"/>
+ <location filename="../trafficgraphwidget.cpp" line="+79"/>
<source>KB/s</source>
- <translation type="unfinished"/>
+ <translation>KB/s</translation>
</message>
</context>
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="+22"/>
+ <location filename="../transactiondesc.cpp" line="+28"/>
<source>Open until %1</source>
<translation>Ã…ben indtil %1</translation>
</message>
@@ -2098,12 +2727,12 @@ Adresse: %4
<location line="+12"/>
<location line="+45"/>
<location line="+17"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Credit</source>
<translation>Kredit</translation>
</message>
<message numerus="yes">
- <location line="-120"/>
+ <location line="-125"/>
<source>matures in %n more block(s)</source>
<translation><numerusform>modner efter yderligere %n blok(ke)</numerusform><numerusform>modner efter yderligere %n blok(ke)</numerusform></translation>
</message>
@@ -2116,12 +2745,12 @@ Adresse: %4
<location line="+44"/>
<location line="+8"/>
<location line="+15"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Debit</source>
<translation>Debet</translation>
</message>
<message>
- <location line="-57"/>
+ <location line="-62"/>
<source>Transaction fee</source>
<translation>Transaktionsgebyr</translation>
</message>
@@ -2132,11 +2761,12 @@ Adresse: %4
</message>
<message>
<location line="+6"/>
+ <location line="+9"/>
<source>Message</source>
<translation>Besked</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="-7"/>
<source>Comment</source>
<translation>Kommentar</translation>
</message>
@@ -2146,7 +2776,7 @@ Adresse: %4
<translation>Transaktionens ID</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+18"/>
<source>Merchant</source>
<translation type="unfinished"/>
</message>
@@ -2186,7 +2816,7 @@ Adresse: %4
<translation>falsk</translation>
</message>
<message>
- <location line="-227"/>
+ <location line="-232"/>
<source>, has not been successfully broadcast yet</source>
<translation>, er ikke blevet transmitteret endnu</translation>
</message>
@@ -2217,7 +2847,7 @@ Adresse: %4
<context>
<name>TransactionTableModel</name>
<message>
- <location filename="../transactiontablemodel.cpp" line="+227"/>
+ <location filename="../transactiontablemodel.cpp" line="+234"/>
<source>Date</source>
<translation>Dato</translation>
</message>
@@ -2236,8 +2866,13 @@ Adresse: %4
<source>Amount</source>
<translation>Beløb</translation>
</message>
+ <message>
+ <location line="+59"/>
+ <source>Immature (%1 confirmations, will be available after %2)</source>
+ <translation type="unfinished"/>
+ </message>
<message numerus="yes">
- <location line="+57"/>
+ <location line="+16"/>
<source>Open for %n more block(s)</source>
<translation><numerusform>Ã…ben %n blok(ke) yderligere</numerusform><numerusform>Ã…ben %n blok(ke) yderligere</numerusform></translation>
</message>
@@ -2257,17 +2892,13 @@ Adresse: %4
<translation>Ubekræftet (%1 af %2 bekræftelser)</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="-22"/>
+ <location line="+25"/>
<source>Confirmed (%1 confirmations)</source>
<translation>Bekræftet (%1 bekræftelser)</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>Udvunden saldo, som vil være tilgængelig, når den modner efter yderligere %n blok(ke)</numerusform><numerusform>Udvunden saldo, som vil være tilgængelig, når den modner efter yderligere %n blok(ke)</numerusform></translation>
- </message>
<message>
- <location line="+5"/>
+ <location line="-22"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation>Denne blok blev ikke modtaget af nogen andre knuder og vil formentlig ikke blive accepteret!</translation>
</message>
@@ -2277,7 +2908,7 @@ Adresse: %4
<translation>Genereret, men ikke accepteret</translation>
</message>
<message>
- <location line="+43"/>
+ <location line="+62"/>
<source>Received with</source>
<translation>Modtaget med</translation>
</message>
@@ -2335,7 +2966,7 @@ Adresse: %4
<context>
<name>TransactionView</name>
<message>
- <location filename="../transactionview.cpp" line="+52"/>
+ <location filename="../transactionview.cpp" line="+57"/>
<location line="+16"/>
<source>All</source>
<translation>Alle</translation>
@@ -2396,12 +3027,12 @@ Adresse: %4
<translation>Andet</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+6"/>
<source>Enter address or label to search</source>
<translation>Indtast adresse eller mærkat for at søge</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+6"/>
<source>Min amount</source>
<translation>Minimumsbeløb</translation>
</message>
@@ -2436,17 +3067,37 @@ Adresse: %4
<translation>Vis transaktionsdetaljer</translation>
</message>
<message>
- <location line="+143"/>
- <source>Export Transaction Data</source>
- <translation>Eksporter transaktionsdata</translation>
+ <location line="+142"/>
+ <source>Export Transaction History</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="+19"/>
+ <source>Exporting Failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>There was an error trying to save the transaction history to %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Exporting Successful</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The transaction history was successfully saved to %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-22"/>
<source>Comma separated file (*.csv)</source>
<translation>Kommasepareret fil (*.csv)</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+9"/>
<source>Confirmed</source>
<translation>Bekræftet</translation>
</message>
@@ -2481,17 +3132,7 @@ Adresse: %4
<translation>ID</translation>
</message>
<message>
- <location line="+4"/>
- <source>Error exporting</source>
- <translation>Fejl under eksport</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation>Kunne ikke skrive til filen %1.</translation>
- </message>
- <message>
- <location line="+100"/>
+ <location line="+107"/>
<source>Range:</source>
<translation>Interval:</translation>
</message>
@@ -2502,9 +3143,17 @@ Adresse: %4
</message>
</context>
<context>
+ <name>WalletFrame</name>
+ <message>
+ <location filename="../walletframe.cpp" line="+26"/>
+ <source>No wallet has been loaded.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>WalletModel</name>
<message>
- <location filename="../walletmodel.cpp" line="+218"/>
+ <location filename="../walletmodel.cpp" line="+245"/>
<source>Send Coins</source>
<translation>Send bitcoins</translation>
</message>
@@ -2512,7 +3161,7 @@ Adresse: %4
<context>
<name>WalletView</name>
<message>
- <location filename="../walletview.cpp" line="+46"/>
+ <location filename="../walletview.cpp" line="+43"/>
<source>&amp;Export</source>
<translation>Eksporter</translation>
</message>
@@ -2522,65 +3171,60 @@ Adresse: %4
<translation>Eksportér den aktuelle visning til en fil</translation>
</message>
<message>
- <location line="+183"/>
+ <location line="+181"/>
<source>Backup Wallet</source>
<translation>Sikkerhedskopier tegnebog</translation>
</message>
<message>
- <location line="+0"/>
+ <location line="+1"/>
<source>Wallet Data (*.dat)</source>
<translation>Tegnebogsdata (*.dat)</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="+6"/>
<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 med at gemme tegnebogsdata til det nye sted</translation>
+ <source>There was an error trying to save the wallet data to %1.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+4"/>
- <source>Backup Successful</source>
- <translation>Sikkerhedskopieret problemfri</translation>
+ <source>The wallet data was successfully saved to %1.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+0"/>
- <source>The wallet data was successfully saved to the new location.</source>
- <translation>Tegnebogsdata blev problemfrit gemt til det nye sted.</translation>
+ <source>Backup Successful</source>
+ <translation>Sikkerhedskopieret problemfri</translation>
</message>
</context>
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+102"/>
- <source>Bitcoin version</source>
- <translation>Bitcoin-version</translation>
- </message>
- <message>
- <location line="+107"/>
+ <location filename="../bitcoinstrings.cpp" line="+221"/>
<source>Usage:</source>
<translation>Anvendelse:</translation>
</message>
<message>
- <location line="-55"/>
+ <location line="-54"/>
<source>List commands</source>
<translation>Liste over kommandoer</translation>
</message>
<message>
- <location line="-13"/>
+ <location line="-14"/>
<source>Get help for a command</source>
<translation>Få hjælp til en kommando</translation>
</message>
<message>
- <location line="+25"/>
+ <location line="+26"/>
<source>Options:</source>
<translation>Indstillinger:</translation>
</message>
<message>
- <location line="+24"/>
+ <location line="+22"/>
<source>Specify configuration file (default: bitcoin.conf)</source>
<translation>Angiv konfigurationsfil (standard: bitcoin.conf)</translation>
</message>
@@ -2600,7 +3244,7 @@ Adresse: %4
<translation>Angiv databasecachestørrelse i megabytes (standard: 25)</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-26"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
<translation>Lyt til forbindelser på &lt;port&gt; (standard: 8333 eller testnetværk: 18333)</translation>
</message>
@@ -2610,7 +3254,7 @@ Adresse: %4
<translation>Oprethold højest &lt;n&gt; forbindelser til andre i netværket (standard: 125)</translation>
</message>
<message>
- <location line="-49"/>
+ <location line="-51"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation>Forbind til en knude for at modtage adresse, og afbryd</translation>
</message>
@@ -2620,37 +3264,37 @@ Adresse: %4
<translation>Angiv din egen offentlige adresse</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation>Grænse for afbrydelse til dårlige forbindelser (standard: 100)</translation>
</message>
<message>
- <location line="-142"/>
+ <location line="-148"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation>Antal sekunder dårlige forbindelser skal vente før reetablering (standard: 86400)</translation>
</message>
<message>
- <location line="-33"/>
+ <location line="-36"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
<translation>Der opstod en fejl ved angivelse af RPC-porten %u til at lytte på IPv4: %s</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<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 eller testnetværk: 18332)</translation>
</message>
<message>
- <location line="+40"/>
+ <location line="+45"/>
<source>Accept command line and JSON-RPC commands</source>
<translation>Accepter kommandolinje- og JSON-RPC-kommandoer</translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>Kør i baggrunden som en service, og accepter kommandoer</translation>
</message>
<message>
- <location line="+40"/>
+ <location line="+39"/>
<source>Use the test network</source>
<translation>Brug testnetværket</translation>
</message>
@@ -2660,7 +3304,7 @@ Adresse: %4
<translation>Accepter forbindelser udefra (standard: 1 hvis hverken -proxy eller -connect)</translation>
</message>
<message>
- <location line="-87"/>
+ <location line="-95"/>
<source>%s, you must set a rpcpassword in the configuration file:
%s
It is recommended you use the following random password:
@@ -2711,6 +3355,11 @@ f.eks.: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
</message>
<message>
<location line="+4"/>
+ <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</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>Fejl: Transaktionen blev afvist. Dette kan ske, hvis nogle af dine bitcoins i din tegnebog allerede er brugt, som hvis du brugte en kopi af wallet.dat og dine bitcoins er blevet brugt i kopien, men ikke er markeret som brugt her.</translation>
</message>
@@ -2725,17 +3374,17 @@ f.eks.: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Udfør kommando, når en transaktion i tegnebogen ændres (%s i kommandoen erstattes med TxID)</translation>
</message>
<message>
- <location line="+11"/>
- <source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source>
- <translation>Angiv maksimumstørrelse for høj prioritet/lavt gebyr-transaktioner i bytes (standard: 27000)</translation>
- </message>
- <message>
- <location line="+6"/>
+ <location line="+18"/>
<source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
<translation>Dette er en foreløbig testudgivelse - brug på eget ansvar - brug ikke til udvinding eller handelsprogrammer</translation>
</message>
<message>
<location line="+5"/>
+ <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
<source>Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source>
<translation>Advarsel: -paytxfee er sat meget højt! Dette er det gebyr du vil betale, hvis du sender en transaktion.</translation>
</message>
@@ -2765,17 +3414,27 @@ f.eks.: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Advarsel: wallet.dat ødelagt, data reddet! Oprindelig wallet.net gemt som wallet.{timestamp}.bak i %s; hvis din saldo eller dine transaktioner er forkert, bør du genskabe fra en sikkerhedskopi.</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="+9"/>
+ <source>&lt;category&gt; can be:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
<source>Attempt to recover private keys from a corrupt wallet.dat</source>
<translation>Forsøg at genskabe private nøgler fra ødelagt wallet.dat</translation>
</message>
<message>
<location line="+1"/>
+ <source>Bitcoin Core Daemon</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Bitcoin RPC client version</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
<source>Block creation options:</source>
<translation>Blokoprettelsestilvalg:</translation>
</message>
@@ -2785,7 +3444,12 @@ f.eks.: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Tilslut kun til de(n) angivne knude(r)</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
+ <source>Connect through SOCKS proxy</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect to JSON-RPC on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation type="unfinished"/>
</message>
@@ -2801,6 +3465,11 @@ f.eks.: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
</message>
<message>
<location line="+1"/>
+ <source>Do not load the wallet and disable wallet RPC calls</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Do you want to rebuild the block database now?</source>
<translation>Ønsker du at genbygge blokdatabasen nu?</translation>
</message>
@@ -2895,7 +3564,12 @@ f.eks.: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Skrivning af genskabelsesdata mislykkedes</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
+ <source>Fee per kB to add to transactions you send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Find peers using DNS lookup (default: 1 unless -connect)</source>
<translation>Find ligeværdige ved DNS-opslag (standard: 1 hvis ikke -connect)</translation>
</message>
@@ -2915,6 +3589,11 @@ f.eks.: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Grundighed af verificéring af blokke (0-4, standard: 3)</translation>
</message>
<message>
+ <location line="+1"/>
+ <source>If &lt;category&gt; is not supplied, output all debugging information.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+2"/>
<source>Incorrect or no genesis block found. Wrong datadir for network?</source>
<translation type="unfinished"/>
@@ -2930,17 +3609,37 @@ f.eks.: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>For få tilgængelige fildeskriptorer.</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+5"/>
+ <source>Prepend debug output with timestamp (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>RPC client options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Rebuild block chain index from current blk000??.dat files</source>
<translation>Genbyg blokkædeindeks fra nuværende blk000??.dat filer</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+5"/>
+ <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Send command to Bitcoin server</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
+ <location line="+7"/>
+ <source>Set maximum block size in bytes (default: %d)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Set the number of threads to service RPC calls (default: 4)</source>
<translation>Angiv antallet af tråde til at håndtere RPC-kald (standard: 4)</translation>
</message>
@@ -2952,15 +3651,20 @@ f.eks.: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
<message>
<location line="+2"/>
<source>Start Bitcoin server</source>
+ <translation>Start Bitcoin server</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>This is intended for regression testing tools and app development.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+12"/>
+ <location line="+10"/>
<source>Usage (deprecated, use bitcoin-cli):</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+8"/>
+ <location line="+7"/>
<source>Verifying blocks...</source>
<translation>Verificere blokke...</translation>
</message>
@@ -2971,31 +3675,56 @@ f.eks.: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
</message>
<message>
<location line="+1"/>
+ <source>Wait for RPC server to start</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Wallet %s resides outside data directory %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+2"/>
+ <source>Wallet options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>You need to rebuild the database using -reindex to change -txindex</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-78"/>
+ <location line="-79"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation>Importerer blokke fra ekstern blk000??.dat fil</translation>
</message>
<message>
- <location line="-98"/>
+ <location line="-105"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+17"/>
+ <location line="+14"/>
+ <source>Output debugging information (default: 0, supplying &lt;category&gt; is optional)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
<translation>Angiv nummeret af tråde til verificering af script (op til 16, 0 = automatisk, &lt;0 = efterlad det antal kerner tilgængelige, standard: 0)</translation>
</message>
<message>
- <location line="+83"/>
+ <location line="+89"/>
<source>Information</source>
<translation>Information</translation>
</message>
@@ -3035,47 +3764,17 @@ f.eks.: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Tilslut kun til knuder i netværk &lt;net&gt; (IPv4, IPv6 eller Tor)</translation>
</message>
<message>
- <location line="+2"/>
- <source>Output extra debugging information. Implies all other -debug* options</source>
- <translation>Skriv ekstra fejlsøgningsinformation. Indebærer alle andre -debug* tilvalg</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Output extra network debugging information</source>
- <translation>Skriv ekstra netværksfejlsøgningsinformation</translation>
- </message>
- <message>
- <location line="+2"/>
- <source>Prepend debug output with timestamp</source>
- <translation>Tilføj fejlsøgningsoutput med tidsstempel</translation>
- </message>
- <message>
- <location line="+5"/>
+ <location line="+9"/>
<source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
<translation>SSL-indstillinger: (se Bitcoin Wiki for SSL-opsætningsinstruktioner)</translation>
</message>
<message>
- <location line="+1"/>
- <source>Select the version of socks proxy to use (4-5, default: 5)</source>
- <translation>Angiv version af SOCKS-proxyen (4-5, standard: 5)</translation>
- </message>
- <message>
- <location line="+3"/>
+ <location line="+4"/>
<source>Send trace/debug info to console instead of debug.log file</source>
<translation>Send sporings-/fejlsøgningsinformation til konsollen i stedet for debug.log filen</translation>
</message>
<message>
- <location line="+1"/>
- <source>Send trace/debug info to debugger</source>
- <translation>Send sporings-/fejlsøgningsinformation til fejlsøgningprogrammet</translation>
- </message>
- <message>
- <location line="+5"/>
- <source>Set maximum block size in bytes (default: 250000)</source>
- <translation>Angiv maksimumblokstørrelse i bytes (standard: 250000)</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+6"/>
<source>Set minimum block size in bytes (default: 0)</source>
<translation>Angiv minimumsblokstørrelse i bytes (standard: 0)</translation>
</message>
@@ -3100,7 +3799,7 @@ f.eks.: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Systemfejl: </translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Transaction amount too small</source>
<translation>Transaktionsbeløb er for lavt</translation>
</message>
@@ -3125,32 +3824,32 @@ f.eks.: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Forsøg at bruge UPnP til at konfigurere den lyttende port (standard: 1 når lytter)</translation>
</message>
<message>
- <location line="+1"/>
- <source>Use proxy to reach tor hidden services (default: same as -proxy)</source>
- <translation>Brug proxy til at tilgå Tor Hidden Services (standard: som -proxy)</translation>
- </message>
- <message>
<location line="+2"/>
<source>Username for JSON-RPC connections</source>
<translation>Brugernavn til JSON-RPC-forbindelser</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+7"/>
<source>Warning</source>
<translation>Advarsel</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Warning: This version is obsolete, upgrade required!</source>
<translation>Advarsel: Denne version er forældet, opgradering påkrævet!</translation>
</message>
<message>
<location line="+2"/>
+ <source>version</source>
+ <translation>version</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>wallet.dat corrupt, salvage failed</source>
<translation>wallet.dat ødelagt, redning af data mislykkedes</translation>
</message>
<message>
- <location line="-54"/>
+ <location line="-58"/>
<source>Password for JSON-RPC connections</source>
<translation>Adgangskode til JSON-RPC-forbindelser</translation>
</message>
@@ -3160,27 +3859,27 @@ f.eks.: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Tillad JSON-RPC-forbindelser fra bestemt IP-adresse</translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation>Send kommandoer til knude, der kører på &lt;ip&gt; (standard: 127.0.0.1)</translation>
</message>
<message>
- <location line="-126"/>
+ <location line="-132"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation>Udfør kommando, når den bedste blok ændres (%s i kommandoen erstattes med blokhash)</translation>
</message>
<message>
- <location line="+155"/>
+ <location line="+161"/>
<source>Upgrade wallet to latest format</source>
<translation>Opgrader tegnebog til seneste format</translation>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation>Angiv nøglepoolstørrelse til &lt;n&gt; (standard: 100)</translation>
</message>
<message>
- <location line="-12"/>
+ <location line="-11"/>
<source>Rescan the block chain for missing wallet transactions</source>
<translation>Gennemsøg blokkæden for manglende tegnebogstransaktioner</translation>
</message>
@@ -3190,7 +3889,7 @@ f.eks.: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Brug OpenSSL (https) for JSON-RPC-forbindelser</translation>
</message>
<message>
- <location line="-29"/>
+ <location line="-30"/>
<source>Server certificate file (default: server.cert)</source>
<translation>Servercertifikat-fil (standard: server.cert)</translation>
</message>
@@ -3205,27 +3904,22 @@ f.eks.: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Denne hjælpebesked</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Unable to bind to %s on this computer (bind returned error %d, %s)</source>
<translation>Kunne ikke tildele %s på denne computer (bind returnerede fejl %d, %s)</translation>
</message>
<message>
- <location line="-95"/>
- <source>Connect through socks proxy</source>
- <translation>Tilslut via SOCKS-proxy</translation>
- </message>
- <message>
- <location line="-11"/>
+ <location line="-107"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation>Tillad DNS-opslag for -addnode, -seednode og -connect</translation>
</message>
<message>
- <location line="+58"/>
+ <location line="+60"/>
<source>Loading addresses...</source>
<translation>Indlæser adresser...</translation>
</message>
<message>
- <location line="-36"/>
+ <location line="-37"/>
<source>Error loading wallet.dat: Wallet corrupted</source>
<translation>Fejl ved indlæsning af wallet.dat: Tegnebog ødelagt</translation>
</message>
@@ -3245,12 +3939,12 @@ f.eks.: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Fejl ved indlæsning af wallet.dat</translation>
</message>
<message>
- <location line="+30"/>
+ <location line="+31"/>
<source>Invalid -proxy address: &apos;%s&apos;</source>
<translation>Ugyldig -proxy adresse: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+57"/>
+ <location line="+56"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation>Ukendt netværk anført i -onlynet: &apos;%s&apos;</translation>
</message>
@@ -3260,7 +3954,7 @@ f.eks.: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Ukendt -socks proxy-version: %i</translation>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation>Kan ikke finde -bind adressen: &apos;%s&apos;</translation>
</message>
@@ -3270,7 +3964,7 @@ f.eks.: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Kan ikke finde -externalip adressen: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+46"/>
+ <location line="+48"/>
<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>
@@ -3290,27 +3984,22 @@ f.eks.: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Indlæser blokindeks...</translation>
</message>
<message>
- <location line="-60"/>
+ <location line="-62"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation>Tilføj en knude til at forbinde til og forsøg at holde forbindelsen åben</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-32"/>
<source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source>
<translation>Kunne ikke tildele %s på denne computer. Bitcoin kører sikkert allerede.</translation>
</message>
<message>
- <location line="+69"/>
- <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="+20"/>
+ <location line="+95"/>
<source>Loading wallet...</source>
<translation>Indlæser tegnebog...</translation>
</message>
<message>
- <location line="-54"/>
+ <location line="-56"/>
<source>Cannot downgrade wallet</source>
<translation>Kan ikke nedgradere tegnebog</translation>
</message>
@@ -3320,7 +4009,7 @@ f.eks.: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Kan ikke skrive standardadresse</translation>
</message>
<message>
- <location line="+66"/>
+ <location line="+67"/>
<source>Rescanning...</source>
<translation>Genindlæser...</translation>
</message>
@@ -3340,7 +4029,7 @@ f.eks.: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Fejl</translation>
</message>
<message>
- <location line="-33"/>
+ <location line="-35"/>
<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 a6c105f60e..d8ba1e2c44 100644
--- a/src/qt/locale/bitcoin_de.ts
+++ b/src/qt/locale/bitcoin_de.ts
@@ -3,13 +3,13 @@
<name>AboutDialog</name>
<message>
<location filename="../forms/aboutdialog.ui" line="+14"/>
- <source>About Bitcoin</source>
- <translation>Ãœber Bitcoin</translation>
+ <source>About Bitcoin Core</source>
+ <translation>Ãœber Bitcoin Core</translation>
</message>
<message>
<location line="+39"/>
- <source>&lt;b&gt;Bitcoin&lt;/b&gt; version</source>
- <translation>&lt;b&gt;Bitcoin&lt;/b&gt;-Version</translation>
+ <source>&lt;b&gt;Bitcoin Core&lt;/b&gt; version</source>
+ <translation>&lt;b&gt;&quot;Bitcoin Core&quot;&lt;/b&gt;-Version</translation>
</message>
<message>
<location line="+57"/>
@@ -27,14 +27,14 @@ Veröffentlicht unter der MIT/X11-Softwarelizenz, siehe beiligende Datei COPYING
Dieses Produkt enthält Software, die vom OpenSSL-Projekt zur Verwendung im OpenSSL-Toolkit (http://www.openssl.org/) entwickelt wurde, sowie kryptographische Software geschrieben von Eric Young (eay@cryptsoft.com) und UPnP-Software geschrieben von Thomas Bernard.</translation>
</message>
<message>
- <location filename="../aboutdialog.cpp" line="+14"/>
+ <location filename="../utilitydialog.cpp" line="+29"/>
<source>Copyright</source>
<translation>Copyright</translation>
</message>
<message>
<location line="+0"/>
- <source>The Bitcoin developers</source>
- <translation>Die Bitcoinentwickler</translation>
+ <source>The Bitcoin Core developers</source>
+ <translation>Die &quot;Bitcoin Core&quot;-Entwickler</translation>
</message>
</context>
<context>
@@ -70,7 +70,7 @@ Dieses Produkt enthält Software, die vom OpenSSL-Projekt zur Verwendung im Open
<translation>&amp;Schließen</translation>
</message>
<message>
- <location filename="../addressbookpage.cpp" line="+72"/>
+ <location filename="../addressbookpage.cpp" line="+74"/>
<source>&amp;Copy Address</source>
<translation>Adresse &amp;kopieren</translation>
</message>
@@ -140,7 +140,7 @@ Dieses Produkt enthält Software, die vom OpenSSL-Projekt zur Verwendung im Open
<translation>&amp;Editieren</translation>
</message>
<message>
- <location line="+197"/>
+ <location line="+194"/>
<source>Export Address List</source>
<translation>Addressliste exportieren</translation>
</message>
@@ -151,19 +151,19 @@ Dieses Produkt enthält Software, die vom OpenSSL-Projekt zur Verwendung im Open
</message>
<message>
<location line="+13"/>
- <source>Error exporting</source>
- <translation>Fehler beim Exportieren</translation>
+ <source>Exporting Failed</source>
+ <translation>Exportieren fehlgeschlagen</translation>
</message>
<message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation>Konnte nicht in Datei %1 schreiben.</translation>
+ <location line="+1"/>
+ <source>There was an error trying to save the address list to %1.</source>
+ <translation>Beim Speichern der Adressliste nach %1 ist ein Fehler aufgetreten.</translation>
</message>
</context>
<context>
<name>AddressTableModel</name>
<message>
- <location filename="../addresstablemodel.cpp" line="+164"/>
+ <location filename="../addresstablemodel.cpp" line="+168"/>
<source>Label</source>
<translation>Bezeichnung</translation>
</message>
@@ -201,7 +201,7 @@ Dieses Produkt enthält Software, die vom OpenSSL-Projekt zur Verwendung im Open
<translation>Neue Passphrase wiederholen</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="+34"/>
+ <location filename="../askpassphrasedialog.cpp" line="+40"/>
<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>Geben Sie die neue Passphrase für die Wallet ein.&lt;br&gt;Bitte benutzen Sie eine Passphrase bestehend aus &lt;b&gt;10 oder mehr zufälligen Zeichen&lt;/b&gt; oder &lt;b&gt;8 oder mehr Wörtern&lt;/b&gt;.</translation>
</message>
@@ -322,22 +322,27 @@ Dieses Produkt enthält Software, die vom OpenSSL-Projekt zur Verwendung im Open
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+250"/>
+ <location filename="../bitcoingui.cpp" line="+295"/>
<source>Sign &amp;message...</source>
<translation>Nachricht s&amp;ignieren...</translation>
</message>
<message>
- <location line="+254"/>
+ <location line="+335"/>
<source>Synchronizing with network...</source>
<translation>Synchronisiere mit Netzwerk...</translation>
</message>
<message>
- <location line="-324"/>
+ <location line="-407"/>
<source>&amp;Overview</source>
<translation>&amp;Ãœbersicht</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="-137"/>
+ <source>Node</source>
+ <translation>Knoten</translation>
+ </message>
+ <message>
+ <location line="+138"/>
<source>Show general overview of wallet</source>
<translation>Allgemeine Wallet-Ãœbersicht anzeigen</translation>
</message>
@@ -352,7 +357,7 @@ Dieses Produkt enthält Software, die vom OpenSSL-Projekt zur Verwendung im Open
<translation>Transaktionsverlauf durchsehen</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>E&amp;xit</source>
<translation>&amp;Beenden</translation>
</message>
@@ -398,7 +403,22 @@ 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="+10"/>
+ <source>&amp;Sending addresses...</source>
+ <translation>&amp;Zahlungsadressen...</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Receiving addresses...</source>
+ <translation>&amp;Empfangsadressen...</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open &amp;URI...</source>
+ <translation>&amp;URI öffnen...</translation>
+ </message>
+ <message>
+ <location line="+325"/>
<source>Importing blocks from disk...</source>
<translation>Importiere Blöcke von Laufwerk...</translation>
</message>
@@ -408,12 +428,12 @@ Dieses Produkt enthält Software, die vom OpenSSL-Projekt zur Verwendung im Open
<translation>Reindiziere Blöcke auf Laufwerk...</translation>
</message>
<message>
- <location line="-322"/>
+ <location line="-405"/>
<source>Send coins to a Bitcoin address</source>
<translation>Bitcoins an eine Bitcoin-Adresse überweisen</translation>
</message>
<message>
- <location line="+47"/>
+ <location line="+49"/>
<source>Modify configuration options for Bitcoin</source>
<translation>Die Konfiguration des Clients bearbeiten</translation>
</message>
@@ -443,20 +463,17 @@ Dieses Produkt enthält Software, die vom OpenSSL-Projekt zur Verwendung im Open
<translation>Nachricht &amp;verifizieren...</translation>
</message>
<message>
- <location line="-180"/>
- <location line="+6"/>
- <location line="+513"/>
+ <location line="+430"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-519"/>
- <location line="+6"/>
+ <location line="-643"/>
<source>Wallet</source>
<translation>Wallet</translation>
</message>
<message>
- <location line="+109"/>
+ <location line="+146"/>
<source>&amp;Send</source>
<translation>Ãœberweisen</translation>
</message>
@@ -466,13 +483,7 @@ Dieses Produkt enthält Software, die vom OpenSSL-Projekt zur Verwendung im Open
<translation>&amp;Empfangen</translation>
</message>
<message>
- <location line="+28"/>
- <location line="+2"/>
- <source>&amp;About Bitcoin</source>
- <translation>&amp;Ãœber Bitcoin</translation>
- </message>
- <message>
- <location line="+14"/>
+ <location line="+46"/>
<location line="+2"/>
<source>&amp;Show / Hide</source>
<translation>&amp;Anzeigen / Verstecken</translation>
@@ -498,64 +509,80 @@ Dieses Produkt enthält Software, die vom OpenSSL-Projekt zur Verwendung im Open
<translation>Nachrichten verifizieren, um sicherzustellen, dass diese mit den angegebenen Bitcoin-Adressen signiert wurden</translation>
</message>
<message>
- <location line="+35"/>
+ <location line="+48"/>
<source>&amp;File</source>
<translation>&amp;Datei</translation>
</message>
<message>
- <location line="+10"/>
+ <location line="+14"/>
<source>&amp;Settings</source>
<translation>&amp;Einstellungen</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>&amp;Help</source>
<translation>&amp;Hilfe</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+15"/>
<source>Tabs toolbar</source>
<translation>Registerkartenleiste</translation>
</message>
<message>
- <location line="-235"/>
- <location line="+294"/>
+ <location line="-284"/>
+ <location line="+376"/>
<source>[testnet]</source>
<translation>[Testnetz]</translation>
</message>
<message>
- <location line="-177"/>
+ <location line="-401"/>
+ <source>Bitcoin Core</source>
+ <translation>Bitcoin-Kern</translation>
+ </message>
+ <message>
+ <location line="+163"/>
<source>Request payments (generates QR codes and bitcoin: URIs)</source>
<translation>Zahlungen anfordern (erzeugt QR-Codes und bitcoin: URIs)</translation>
</message>
<message>
- <location line="+63"/>
- <source>&amp;Used sending addresses...</source>
- <translation>Verwendete &amp;Zahlungsadressen...</translation>
+ <location line="+29"/>
+ <location line="+2"/>
+ <source>&amp;About Bitcoin Core</source>
+ <translation>&amp;Ãœber Bitcoin Core</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+35"/>
<source>Show the list of used sending addresses and labels</source>
<translation>Liste verwendeter Zahlungsadressen und Bezeichnungen anzeigen</translation>
</message>
<message>
- <location line="+1"/>
- <source>Used &amp;receiving addresses...</source>
- <translation>Verwendete &amp;Empfangsadressen...</translation>
+ <location line="+2"/>
+ <source>Show the list of used receiving addresses and labels</source>
+ <translation>Liste verwendeter Empfangsadressen und Bezeichnungen anzeigen</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open a bitcoin: URI or payment request</source>
+ <translation>Eine &quot;bitcoin:&quot;-URI oder Zahlungsanforderung öffnen</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Command-line options</source>
+ <translation>&amp;Kommandozeilenoptionen</translation>
</message>
<message>
<location line="+1"/>
- <source>Show the list of used receiving addresses and labels</source>
- <translation>Liste verwendeter Empfangsadressen und Bezeichnungen anzeigen</translation>
+ <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
+ <translation>Zeige die &quot;Bitcoin Core&quot;-Hilfsnachricht, um eine Liste mit möglichen Kommandozeilenoptionen zu erhalten</translation>
</message>
<message>
- <location line="+106"/>
+ <location line="+159"/>
<location line="+5"/>
<source>Bitcoin client</source>
<translation>Bitcoin-Client</translation>
</message>
<message numerus="yes">
- <location line="+120"/>
+ <location line="+142"/>
<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>
@@ -575,7 +602,7 @@ Dieses Produkt enthält Software, die vom OpenSSL-Projekt zur Verwendung im Open
<translation>%1 Blöcke des Transaktionsverlaufs verarbeitet.</translation>
</message>
<message numerus="yes">
- <location line="+20"/>
+ <location line="+23"/>
<source>%n hour(s)</source>
<translation><numerusform>%n Stunde</numerusform><numerusform>%n Stunden</numerusform></translation>
</message>
@@ -595,7 +622,7 @@ Dieses Produkt enthält Software, die vom OpenSSL-Projekt zur Verwendung im Open
<translation>%1 im Rückstand</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="+21"/>
<source>Last received block was generated %1 ago.</source>
<translation>Der letzte empfangene Block ist %1 alt.</translation>
</message>
@@ -620,27 +647,17 @@ Dieses Produkt enthält Software, die vom OpenSSL-Projekt zur Verwendung im Open
<translation>Hinweis</translation>
</message>
<message>
- <location line="+77"/>
- <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="-152"/>
+ <location line="-85"/>
<source>Up to date</source>
<translation>Auf aktuellem Stand</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Catching up...</source>
<translation>Hole auf...</translation>
</message>
<message>
- <location line="+124"/>
- <source>Confirm transaction fee</source>
- <translation>Transaktionsgebühr bestätigen</translation>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+130"/>
<source>Sent transaction</source>
<translation>Gesendete Transaktion</translation>
</message>
@@ -662,17 +679,7 @@ Typ: %3
Adresse: %4</translation>
</message>
<message>
- <location line="+34"/>
- <source>URI handling</source>
- <translation>URI Verarbeitung</translation>
- </message>
- <message>
- <location line="+0"/>
- <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>
- <message>
- <location line="+45"/>
+ <location line="+69"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation>Wallet ist &lt;b&gt;verschlüsselt&lt;/b&gt; und aktuell &lt;b&gt;entsperrt&lt;/b&gt;</translation>
</message>
@@ -682,7 +689,7 @@ Adresse: %4</translation>
<translation>Wallet ist &lt;b&gt;verschlüsselt&lt;/b&gt; und aktuell &lt;b&gt;gesperrt&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+110"/>
+ <location filename="../bitcoin.cpp" line="+438"/>
<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>
@@ -690,12 +697,304 @@ Adresse: %4</translation>
<context>
<name>ClientModel</name>
<message>
- <location filename="../clientmodel.cpp" line="+115"/>
+ <location filename="../clientmodel.cpp" line="+119"/>
<source>Network Alert</source>
<translation>Netzwerkalarm</translation>
</message>
</context>
<context>
+ <name>CoinControlDialog</name>
+ <message>
+ <location filename="../forms/coincontroldialog.ui" line="+14"/>
+ <source>Coin Control Address Selection</source>
+ <translation>&quot;Coin Control&quot;-Adressauswahl</translation>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>Quantity:</source>
+ <translation>Anzahl:</translation>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Bytes:</source>
+ <translation>Byte:</translation>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>Amount:</source>
+ <translation>Betrag:</translation>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Priority:</source>
+ <translation>Priorität:</translation>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>Fee:</source>
+ <translation>Gebühr:</translation>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Low Output:</source>
+ <translation>Zu geringer Ausgabebetrag:</translation>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>After Fee:</source>
+ <translation>Abzüglich Gebühr:</translation>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Change:</source>
+ <translation>Wechselgeld:</translation>
+ </message>
+ <message>
+ <location line="+63"/>
+ <source>(un)select all</source>
+ <translation>Alles (de)selektieren</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Tree mode</source>
+ <translation>Baumansicht</translation>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>List mode</source>
+ <translation>Listenansicht</translation>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>Amount</source>
+ <translation>Betrag</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Address</source>
+ <translation>Adresse</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Date</source>
+ <translation>Datum</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Confirmations</source>
+ <translation>Bestätigungen</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Confirmed</source>
+ <translation>Bestätigt</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Priority</source>
+ <translation>Priorität</translation>
+ </message>
+ <message>
+ <location filename="../coincontroldialog.cpp" line="+42"/>
+ <source>Copy address</source>
+ <translation>Adresse kopieren</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy label</source>
+ <translation>Bezeichnung kopieren</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+26"/>
+ <source>Copy amount</source>
+ <translation>Betrag kopieren</translation>
+ </message>
+ <message>
+ <location line="-25"/>
+ <source>Copy transaction ID</source>
+ <translation>Transaktions-ID kopieren</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Lock unspent</source>
+ <translation>Nicht ausgegebenen Betrag sperren</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Unlock unspent</source>
+ <translation>Nicht ausgegebenen Betrag entsperren</translation>
+ </message>
+ <message>
+ <location line="+22"/>
+ <source>Copy quantity</source>
+ <translation>Anzahl kopieren</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Copy fee</source>
+ <translation>Gebühr kopieren</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy after fee</source>
+ <translation>Abzüglich Gebühr kopieren</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy bytes</source>
+ <translation>Byte kopieren</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy priority</source>
+ <translation>Priorität kopieren</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy low output</source>
+ <translation>Zu geringen Ausgabebetrag kopieren</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy change</source>
+ <translation>Wechselgeld kopieren</translation>
+ </message>
+ <message>
+ <location line="+323"/>
+ <source>highest</source>
+ <translation>am höchsten</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>higher</source>
+ <translation>höher</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>high</source>
+ <translation>hoch</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>medium-high</source>
+ <translation>mittel-hoch</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>medium</source>
+ <translation>mittel</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>low-medium</source>
+ <translation>niedrig-mittel</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>low</source>
+ <translation>niedrig</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>lower</source>
+ <translation>niedriger</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>lowest</source>
+ <translation>am niedrigsten</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>(%1 locked)</source>
+ <translation>(%1 gesperrt)</translation>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>none</source>
+ <translation>keine</translation>
+ </message>
+ <message>
+ <location line="+140"/>
+ <source>Dust</source>
+ <translation>Dust</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>yes</source>
+ <translation>ja</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>no</source>
+ <translation>nein</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>This label turns red, if the transaction size is greater than 1000 bytes.</source>
+ <translation>Diese Bezeichnung wird rot, wenn die Transaktion größer als 1000 Byte ist.</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+5"/>
+ <source>This means a fee of at least %1 per kB is required.</source>
+ <translation>Das bedeutet, dass eine Gebühr von mindestens %1 pro kB erforderlich ist.</translation>
+ </message>
+ <message>
+ <location line="-4"/>
+ <source>Can vary +/- 1 byte per input.</source>
+ <translation>Kann um +/- 1 Byte pro Eingabe variieren.</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Transactions with higher priority are more likely to get included into a block.</source>
+ <translation>Transaktionen mit höherer Priorität haben eine größere Chance in einen Block aufgenommen zu werden.</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>This label turns red, if the priority is smaller than &quot;medium&quot;.</source>
+ <translation>Diese Bezeichnung wird rot, wenn die Priorität niedriger als &quot;mittel&quot; ist.</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>This label turns red, if any recipient receives an amount smaller than %1.</source>
+ <translation>Diese Bezeichnung wird rot, wenn irgendein Empfänger einen Betrag kleiner als %1 erhält.</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+4"/>
+ <source>This means a fee of at least %1 is required.</source>
+ <translation>Das bedeutet, dass eine Gebühr von mindestens %1 erforderlich ist.</translation>
+ </message>
+ <message>
+ <location line="-3"/>
+ <source>Amounts below 0.546 times the minimum relay fee are shown as dust.</source>
+ <translation>Beträge kleiner als das 0,546-fache der niedrigsten Vermittlungsgebühr werden als Dust angezeigt.</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>This label turns red, if the change is smaller than %1.</source>
+ <translation>Diese Bezeichnung wird rot, wenn das Wechselgeld weniger als %1 beträgt.</translation>
+ </message>
+ <message>
+ <location line="+43"/>
+ <location line="+66"/>
+ <source>(no label)</source>
+ <translation>(keine Bezeichnung)</translation>
+ </message>
+ <message>
+ <location line="-9"/>
+ <source>change from %1 (%2)</source>
+ <translation>Wechselgeld von %1 (%2)</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>(change)</source>
+ <translation>(Wechselgeld)</translation>
+ </message>
+</context>
+<context>
<name>EditAddressDialog</name>
<message>
<location filename="../forms/editaddressdialog.ui" line="+14"/>
@@ -723,7 +1022,7 @@ Adresse: %4</translation>
<translation>&amp;Adresse</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+21"/>
+ <location filename="../editaddressdialog.cpp" line="+28"/>
<source>New receiving address</source>
<translation>Neue Empfangsadresse</translation>
</message>
@@ -766,7 +1065,7 @@ Adresse: %4</translation>
<context>
<name>FreespaceChecker</name>
<message>
- <location filename="../intro.cpp" line="+61"/>
+ <location filename="../intro.cpp" line="+65"/>
<source>A new data directory will be created.</source>
<translation>Es wird ein neues Datenverzeichnis angelegt.</translation>
</message>
@@ -792,15 +1091,19 @@ Adresse: %4</translation>
</message>
</context>
<context>
- <name>GUIUtil::HelpMessageBox</name>
+ <name>HelpMessageDialog</name>
<message>
- <location filename="../guiutil.cpp" line="+558"/>
- <location line="+13"/>
- <source>Bitcoin-Qt</source>
- <translation>Bitcoin-Qt</translation>
+ <location filename="../forms/helpmessagedialog.ui" line="+19"/>
+ <source>Bitcoin Core - Command-line options</source>
+ <translation>Bitcoin Core - Kommandozeilenoptionen</translation>
</message>
<message>
- <location line="-13"/>
+ <location filename="../utilitydialog.cpp" line="+38"/>
+ <source>Bitcoin Core</source>
+ <translation>Bitcoin-Kern</translation>
+ </message>
+ <message>
+ <location line="+0"/>
<source>version</source>
<translation>Version</translation>
</message>
@@ -849,18 +1152,18 @@ Adresse: %4</translation>
</message>
<message>
<location line="+9"/>
- <source>Welcome to Bitcoin-Qt.</source>
- <translation>Willkommen zu Bitcoin-Qt.</translation>
+ <source>Welcome to Bitcoin Core.</source>
+ <translation>Willkommen zu Bitcoin Core.</translation>
</message>
<message>
<location line="+26"/>
- <source>As this is the first time the program is launched, you can choose where Bitcoin-Qt will store its data.</source>
- <translation>Da Sie das Programm gerade zum ersten Mal starten, können Sie nun auswählen wo Bitcoin-Qt seine Daten ablegen wird.</translation>
+ <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
+ <translation>Da Sie das Programm gerade zum ersten Mal starten, können Sie nun auswählen wo Bitcoin Core seine Daten ablegen wird.</translation>
</message>
<message>
<location line="+10"/>
- <source>Bitcoin-Qt will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
- <translation>Bitcoin-Qt wird eine Kopie der Blockkette herunterladen und speichern. Mindestens %1GB Daten werden in diesem Verzeichnis abgelegt und die Datenmenge wächst über die Zeit an. Auch die Wallet wird in diesem Verzeichnis abgelegt.</translation>
+ <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
+ <translation>Bitcoin Core wird eine Kopie der Blockkette herunterladen und speichern. Mindestens %1GB Daten werden in diesem Verzeichnis abgelegt und die Datenmenge wächst über die Zeit an. Auch die Wallet wird in diesem Verzeichnis abgelegt.</translation>
</message>
<message>
<location line="+10"/>
@@ -873,7 +1176,17 @@ Adresse: %4</translation>
<translation>Ein benutzerdefiniertes Datenverzeichnis verwenden:</translation>
</message>
<message>
- <location filename="../intro.cpp" line="+105"/>
+ <location filename="../intro.cpp" line="+85"/>
+ <source>Bitcoin</source>
+ <translation>Bitcoin</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error: Specified data directory &quot;%1&quot; can not be created.</source>
+ <translation>Fehler: Angegebenes Datenverzeichnis &quot;%1&quot; kann nicht angelegt werden.</translation>
+ </message>
+ <message>
+ <location line="+19"/>
<source>Error</source>
<translation>Fehler</translation>
</message>
@@ -889,6 +1202,34 @@ Adresse: %4</translation>
</message>
</context>
<context>
+ <name>OpenURIDialog</name>
+ <message>
+ <location filename="../forms/openuridialog.ui" line="+14"/>
+ <source>Open URI</source>
+ <translation>URI öffnen</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Open payment request from URI or file</source>
+ <translation>Zahlungsanforderung über URI oder aus Datei öffnen</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>URI:</source>
+ <translation>URI:</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Select payment request file</source>
+ <translation>Zahlungsanforderungsdatei auswählen</translation>
+ </message>
+ <message>
+ <location filename="../openuridialog.cpp" line="+47"/>
+ <source>Select payment request file to open</source>
+ <translation>Zu öffnende Zahlungsanforderungsdatei auswählen</translation>
+ </message>
+</context>
+<context>
<name>OptionsDialog</name>
<message>
<location filename="../forms/optionsdialog.ui" line="+14"/>
@@ -896,14 +1237,14 @@ Adresse: %4</translation>
<translation>Erweiterte Einstellungen</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+13"/>
<source>&amp;Main</source>
<translation>&amp;Allgemein</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.</source>
- <translation>Optionale Transaktionsgebühr pro KB, die sicherstellt, dass ihre Transaktionen schnell bearbeitet werden. Die meisten Transaktionen sind 1 KB groß.</translation>
+ <translation>Optionale Transaktionsgebühr pro kB, die sicherstellt, dass ihre Transaktionen schnell bearbeitet werden. Die meisten Transaktionen sind 1 kB groß.</translation>
</message>
<message>
<location line="+15"/>
@@ -921,7 +1262,52 @@ Adresse: %4</translation>
<translation>&amp;Starte Bitcoin nach Systemanmeldung</translation>
</message>
<message>
- <location line="+35"/>
+ <location line="+9"/>
+ <source>Size of &amp;database cache</source>
+ <translation>Größe des &amp;Datenbankcaches</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set database cache size in megabytes (default: 25)</source>
+ <translation>Größe des Datenbankcaches in MB festlegen (Standard: 25)</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>MB</source>
+ <translation>MB</translation>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Number of script &amp;verification threads</source>
+ <translation>Anzahl an Skript-&amp;Verifizierungs-Threads</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
+ <translation>Maximale Anzahl an Skript-Verifizierungs-Threads festlegen (bis zu 16, 0 = automatisch, &lt;0 = soviele Kerne frei lassen, Standard: 0)</translation>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Connect to the Bitcoin network through a SOCKS proxy.</source>
+ <translation>Ãœber einen SOCKS-Proxy mit dem Bitcoin-Netzwerk verbinden.</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Connect through SOCKS proxy (default proxy):</source>
+ <translation>Ãœber einen SOCKS-Proxy &amp;verbinden (Standardproxy):</translation>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
+ <translation>IP-Adresse des Proxies (z.B. IPv4: 127.0.0.1 / IPv6: ::1)</translation>
+ </message>
+ <message>
+ <location line="+224"/>
+ <source>Active command-line options that override above options:</source>
+ <translation>Aktive Kommandozeilenoptionen, die obige Konfiguration überschreiben:</translation>
+ </message>
+ <message>
+ <location line="+43"/>
<source>Reset all client options to default.</source>
<translation>Setzt die Clientkonfiguration auf Standardwerte zurück.</translation>
</message>
@@ -931,7 +1317,7 @@ Adresse: %4</translation>
<translation>Konfiguration &amp;zurücksetzen</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="-323"/>
<source>&amp;Network</source>
<translation>&amp;Netzwerk</translation>
</message>
@@ -946,32 +1332,17 @@ Adresse: %4</translation>
<translation>Portweiterleitung via &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>Über einen SOCKS-Proxy mit dem Bitcoin-Netzwerk verbinden (z.B. beim Verbinden über Tor).</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>&amp;Connect through SOCKS proxy:</source>
- <translation>Ãœber einen SOCKS-Proxy &amp;verbinden:</translation>
- </message>
- <message>
- <location line="+9"/>
+ <location line="+19"/>
<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>IP-Adresse des Proxies (z.B. 127.0.0.1)</translation>
- </message>
- <message>
- <location line="+7"/>
+ <location line="+32"/>
<source>&amp;Port:</source>
<translation>&amp;Port:</translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+25"/>
<source>Port of the proxy (e.g. 9050)</source>
<translation>Port des Proxies (z.B. 9050)</translation>
</message>
@@ -1046,7 +1417,17 @@ Adresse: %4</translation>
<translation>Adressen in der Transaktionsliste &amp;anzeigen</translation>
</message>
<message>
- <location line="+71"/>
+ <location line="+7"/>
+ <source>Whether to show coin control features or not.</source>
+ <translation>Legt fest, ob die &quot;Coin Control&quot;-Funktionen angezeigt werden.</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Display coin &amp;control features (experts only)</source>
+ <translation>&quot;&amp;Coin Control&quot;-Funktionen anzeigen (nur für Experten)</translation>
+ </message>
+ <message>
+ <location line="+136"/>
<source>&amp;OK</source>
<translation>&amp;OK</translation>
</message>
@@ -1056,44 +1437,38 @@ Adresse: %4</translation>
<translation>&amp;Abbrechen</translation>
</message>
<message>
- <location line="+10"/>
- <source>&amp;Apply</source>
- <translation>&amp;Ãœbernehmen</translation>
- </message>
- <message>
- <location filename="../optionsdialog.cpp" line="+58"/>
+ <location filename="../optionsdialog.cpp" line="+67"/>
<source>default</source>
<translation>Standard</translation>
</message>
<message>
- <location line="+130"/>
+ <location line="+57"/>
+ <source>none</source>
+ <translation>keine</translation>
+ </message>
+ <message>
+ <location line="+75"/>
<source>Confirm options reset</source>
<translation>Zurücksetzen der Konfiguration bestätigen</translation>
</message>
<message>
<location line="+1"/>
- <source>Some settings may require a client restart to take effect.</source>
- <translation>Einige Einstellungen benötigen möglicherweise einen Clientneustart, um aktiv zu werden.</translation>
+ <location line="+29"/>
+ <source>Client restart required to activate changes.</source>
+ <translation>Clientneustart nötig, um die Änderungen zu aktivieren.</translation>
</message>
<message>
- <location line="+0"/>
- <source>Do you want to proceed?</source>
- <translation>Wollen Sie fortfahren?</translation>
+ <location line="-29"/>
+ <source>Client will be shutdown, do you want to proceed?</source>
+ <translation>Client wird beendet, wollen Sie fortfahren?</translation>
</message>
<message>
- <location line="+42"/>
- <location line="+9"/>
- <source>Warning</source>
- <translation>Warnung</translation>
+ <location line="+33"/>
+ <source>This change would require a client restart.</source>
+ <translation>Diese Änderung würde einen Clientneustart benötigen.</translation>
</message>
<message>
- <location line="-9"/>
- <location line="+9"/>
- <source>This setting will take effect after restarting Bitcoin.</source>
- <translation>Diese Einstellung wird erst nach einem Neustart von Bitcoin aktiv.</translation>
- </message>
- <message>
- <location line="+29"/>
+ <location line="+34"/>
<source>The supplied proxy address is invalid.</source>
<translation>Die eingegebene Proxyadresse ist ungültig.</translation>
</message>
@@ -1107,22 +1482,22 @@ Adresse: %4</translation>
</message>
<message>
<location line="+50"/>
- <location line="+202"/>
+ <location line="+231"/>
<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 Wallet wird automatisch synchronisiert, nachdem eine Verbindung zum Bitcoin-Netzwerk hergestellt wurde. Dieser Prozess ist jedoch derzeit noch nicht abgeschlossen.</translation>
</message>
<message>
- <location line="-131"/>
+ <location line="-155"/>
<source>Unconfirmed:</source>
<translation>Unbestätigt:</translation>
</message>
<message>
- <location line="-78"/>
+ <location line="-83"/>
<source>Wallet</source>
<translation>Wallet</translation>
</message>
<message>
- <location line="+49"/>
+ <location line="+51"/>
<source>Confirmed:</source>
<translation>Bestätigt:</translation>
</message>
@@ -1132,12 +1507,12 @@ Adresse: %4</translation>
<translation>Ihr aktuell verfügbarer Kontostand</translation>
</message>
<message>
- <location line="+29"/>
+ <location line="+32"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation>Betrag aus unbestätigten Transaktionen, der noch nicht im aktuell verfügbaren Kontostand enthalten ist</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+16"/>
<source>Immature:</source>
<translation>Unreif:</translation>
</message>
@@ -1147,7 +1522,7 @@ Adresse: %4</translation>
<translation>Erarbeiteter Betrag der noch nicht gereift ist</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+16"/>
<source>Total:</source>
<translation>Gesamtbetrag:</translation>
</message>
@@ -1157,12 +1532,12 @@ Adresse: %4</translation>
<translation>Aktueller Gesamtbetrag aus obigen Kategorien</translation>
</message>
<message>
- <location line="+53"/>
+ <location line="+71"/>
<source>&lt;b&gt;Recent transactions&lt;/b&gt;</source>
<translation>&lt;b&gt;Letzte Transaktionen&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../overviewpage.cpp" line="+116"/>
+ <location filename="../overviewpage.cpp" line="+120"/>
<location line="+1"/>
<source>out of sync</source>
<translation>nicht synchron</translation>
@@ -1171,7 +1546,8 @@ Adresse: %4</translation>
<context>
<name>PaymentServer</name>
<message>
- <location filename="../paymentserver.cpp" line="+392"/>
+ <location filename="../paymentserver.cpp" line="+403"/>
+ <location line="+13"/>
<source>URI handling</source>
<translation>URI Verarbeitung</translation>
</message>
@@ -1181,45 +1557,82 @@ Adresse: %4</translation>
<translation>URI kann nicht analysiert werden! Dies kann durch eine ungültige Bitcoin-Adresse oder fehlerhafte URI-Parameter verursacht werden.</translation>
</message>
<message>
- <location line="+69"/>
+ <location line="+96"/>
<source>Requested payment amount of %1 is too small (considered dust).</source>
<translation>Angeforderter Zahlungsbetrag in Höhe von %1 ist zu niedrig (als Dust eingestuft).</translation>
</message>
<message>
- <location line="+4"/>
- <location line="+37"/>
+ <location line="-221"/>
+ <location line="+212"/>
+ <location line="+13"/>
+ <location line="+95"/>
+ <location line="+18"/>
+ <location line="+16"/>
<source>Payment request error</source>
<translation>fehlerhafte Zahlungsanforderung</translation>
</message>
<message>
+ <location line="-353"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
+ <translation>&quot;bitcoin: Klicken-zum-Bezahlen&quot;-Handler konnte nicht gestartet werden</translation>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Net manager warning</source>
+ <translation>Netzwerkmanager-Warnung</translation>
+ </message>
+ <message>
<location line="+1"/>
- <source>Insecure requests to custom payment scripts unsupported</source>
- <translation>Unsichere Anforderungen an eigene Zahlungsskripte werden nicht unterstützt</translation>
+ <source>Your active proxy doesn&apos;t support SOCKS5, which is required for payment requests via proxy.</source>
+ <translation>Ihr aktiver Proxy unterstützt kein SOCKS5, dies wird jedoch für Zahlungsanforderungen über einen Proxy benötigt.</translation>
</message>
<message>
- <location line="+38"/>
+ <location line="+52"/>
+ <source>Payment request fetch URL is invalid: %1</source>
+ <translation>Abruf-URL der Zahlungsanforderung ist ungültig: %1</translation>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Payment request file handling</source>
+ <translation>Zahlungsanforderungsdatei-Verarbeitung</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Payment request file can not be read or processed! This can be caused by an invalid payment request file.</source>
+ <translation>Zahlungsanforderungsdatei kann nicht gelesen oder verarbeitet werden! Dies kann durch eine ungültige Zahlungsanforderungsdatei verursacht werden.</translation>
+ </message>
+ <message>
+ <location line="+73"/>
+ <source>Unverified payment requests to custom payment scripts are unsupported.</source>
+ <translation>Unverifizierte Zahlungsanforderungen an benutzerdefinierte Zahlungsskripte werden nicht unterstützt.</translation>
+ </message>
+ <message>
+ <location line="+59"/>
<source>Refund from %1</source>
<translation>Rücküberweisung von %1</translation>
</message>
<message>
- <location line="+42"/>
+ <location line="+43"/>
<source>Error communicating with %1: %2</source>
<translation>Kommunikationsfehler mit %1: %2</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+24"/>
+ <source>Payment request can not be parsed or processed!</source>
+ <translation>Zahlungsanforderung kann nicht analysiert oder verarbeitet werden!</translation>
+ </message>
+ <message>
+ <location line="+11"/>
<source>Bad response from server %1</source>
<translation>Fehlerhafte Antwort vom Server: %1</translation>
</message>
<message>
- <location line="+32"/>
+ <location line="+33"/>
<source>Payment acknowledged</source>
<translation>Zahlung bestätigt</translation>
</message>
<message>
- <location line="-58"/>
- <location line="+30"/>
- <location line="+17"/>
+ <location line="-11"/>
<source>Network request error</source>
<translation>fehlerhafte Netzwerkanfrage</translation>
</message>
@@ -1227,32 +1640,26 @@ Adresse: %4</translation>
<context>
<name>QObject</name>
<message>
- <location filename="../bitcoin.cpp" line="+114"/>
- <location line="+5"/>
- <location filename="../intro.cpp" line="-32"/>
+ <location filename="../bitcoin.cpp" line="+71"/>
+ <location line="+11"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-4"/>
+ <location line="+1"/>
<source>Error: Specified data directory &quot;%1&quot; does not exist.</source>
<translation>Fehler: Angegebenes Datenverzeichnis &quot;%1&quot; existiert nicht.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="-12"/>
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation>Fehler: Ungültige Kombination von -regtest und -testnet.</translation>
</message>
- <message>
- <location filename="../intro.cpp" line="+1"/>
- <source>Error: Specified data directory &quot;%1&quot; can not be created.</source>
- <translation>Fehler: Angegebenes Datenverzeichnis &quot;%1&quot; kann nicht angelegt werden.</translation>
- </message>
</context>
<context>
<name>QRImageWidget</name>
<message>
- <location filename="../receiverequestdialog.cpp" line="+32"/>
+ <location filename="../receiverequestdialog.cpp" line="+36"/>
<source>&amp;Save Image...</source>
<translation>Grafik &amp;speichern...</translation>
</message>
@@ -1268,8 +1675,8 @@ Adresse: %4</translation>
</message>
<message>
<location line="+0"/>
- <source>PNG Images (*.png)</source>
- <translation>PNG-Bild (*.png)</translation>
+ <source>PNG Image (*.png)</source>
+ <translation>PNG-Grafik (*.png)</translation>
</message>
</context>
<context>
@@ -1286,15 +1693,16 @@ Adresse: %4</translation>
<location line="+23"/>
<location line="+23"/>
<location line="+36"/>
- <location line="+53"/>
+ <location line="+23"/>
+ <location line="+36"/>
<location line="+23"/>
<location line="+23"/>
- <location filename="../rpcconsole.cpp" line="+352"/>
+ <location filename="../rpcconsole.cpp" line="+359"/>
<source>N/A</source>
- <translation>n.v.</translation>
+ <translation>k.A.</translation>
</message>
<message>
- <location line="-217"/>
+ <location line="-223"/>
<source>Client version</source>
<translation>Clientversion</translation>
</message>
@@ -1304,7 +1712,17 @@ Adresse: %4</translation>
<translation>&amp;Information</translation>
</message>
<message>
- <location line="+68"/>
+ <location line="-10"/>
+ <source>Debug window</source>
+ <translation>Debugfenster</translation>
+ </message>
+ <message>
+ <location line="+25"/>
+ <source>General</source>
+ <translation>Allgemein</translation>
+ </message>
+ <message>
+ <location line="+53"/>
<source>Using OpenSSL version</source>
<translation>Verwendete OpenSSL-Version</translation>
</message>
@@ -1320,16 +1738,16 @@ Adresse: %4</translation>
</message>
<message>
<location line="+7"/>
- <source>Number of connections</source>
- <translation>Anzahl Verbindungen</translation>
+ <source>Name</source>
+ <translation>Name</translation>
</message>
<message>
<location line="+23"/>
- <source>On testnet</source>
- <translation>Im Testnetz</translation>
+ <source>Number of connections</source>
+ <translation>Anzahl Verbindungen</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+29"/>
<source>Block chain</source>
<translation>Blockkette</translation>
</message>
@@ -1354,21 +1772,6 @@ Adresse: %4</translation>
<translation>&amp;Öffnen</translation>
</message>
<message>
- <location line="+16"/>
- <source>Command-line options</source>
- <translation>Kommandozeilenoptionen</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>Zeige die Bitcoin-Qt-Hilfsnachricht, um eine Liste mit möglichen Kommandozeilenoptionen zu erhalten.</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>&amp;Show</source>
- <translation>&amp;Anzeigen</translation>
- </message>
- <message>
<location line="+24"/>
<source>&amp;Console</source>
<translation>&amp;Konsole</translation>
@@ -1399,22 +1802,12 @@ Adresse: %4</translation>
<translation>ausgehend:</translation>
</message>
<message>
- <location line="-541"/>
+ <location line="-521"/>
<source>Build date</source>
<translation>Erstellungsdatum</translation>
</message>
<message>
- <location line="-104"/>
- <source>Bitcoin - Debug window</source>
- <translation>Bitcoin - Debugfenster</translation>
- </message>
- <message>
- <location line="+25"/>
- <source>Bitcoin Core</source>
- <translation>Bitcoin-Kern</translation>
- </message>
- <message>
- <location line="+279"/>
+ <location line="+206"/>
<source>Debug log file</source>
<translation>Debugprotokolldatei</translation>
</message>
@@ -1424,7 +1817,7 @@ Adresse: %4</translation>
<translation>Öffnet die Bitcoin-Debugprotokolldatei aus dem aktuellen Datenverzeichnis. Dies kann bei großen Protokolldateien einige Sekunden dauern.</translation>
</message>
<message>
- <location line="+102"/>
+ <location line="+76"/>
<source>Clear console</source>
<translation>Konsole zurücksetzen</translation>
</message>
@@ -1444,7 +1837,7 @@ Adresse: %4</translation>
<translation>Bitte &lt;b&gt;help&lt;/b&gt; eingeben, um eine Übersicht verfügbarer Befehle zu erhalten.</translation>
</message>
<message>
- <location line="+128"/>
+ <location line="+122"/>
<source>%1 B</source>
<translation>%1 B</translation>
</message>
@@ -1482,37 +1875,22 @@ Adresse: %4</translation>
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+22"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
<source>&amp;Amount:</source>
<translation>&amp;Betrag:</translation>
</message>
<message>
- <location line="+16"/>
- <source>The amount to request</source>
- <translation>Höhe des angeforderten Betrags.</translation>
- </message>
- <message>
- <location line="+7"/>
+ <location line="-13"/>
<source>&amp;Label:</source>
<translation>&amp;Bezeichnung:</translation>
</message>
<message>
- <location line="+10"/>
- <source>The label to associate with the receiving address</source>
- <translation>Bezeichnung, die der Empfangsadresse zugeordnet wird.</translation>
- </message>
- <message>
- <location line="+7"/>
+ <location line="-34"/>
<source>&amp;Message:</source>
<translation>&amp;Nachricht:</translation>
</message>
<message>
- <location line="+10"/>
- <source>The message to attach to payment request</source>
- <translation>Nachricht, die an die Zahlungsanforderung angehängt wird.</translation>
- </message>
- <message>
- <location line="+14"/>
+ <location line="-17"/>
<source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation>Eine der bereits verwendeten Empfangsadressen wiederverwenden. Addressen wiederzuverwenden birgt Sicherheits- und Datenschutzrisiken. Außer zum Neuerstellen einer bereits erzeugten Zahlungsanforderung sollten Sie dies nicht nutzen.</translation>
</message>
@@ -1522,9 +1900,24 @@ Adresse: %4</translation>
<translation>Vorhandene Empfangsadresse &amp;wiederverwenden (nicht empfohlen)</translation>
</message>
<message>
+ <location line="+27"/>
+ <source>An optional label to associate with the new receiving address</source>
+ <translation>Eine optionale Bezeichnung, die der neuen Empfangsadresse zugeordnet wird</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
+ <translation>Eine optionale Nachricht, die an die Zahlungsanforderung angehängt wird. Sie wird angezeigt, wenn die Anforderung geöffnet wird. Hinweis: Diese Nachricht wird nicht mit der Zahlung über das Bitcoin-Netzwerk gesendet.</translation>
+ </message>
+ <message>
<location line="+7"/>
- <source>Use this form to request payments. All fields are optional.</source>
- <translation>Verwenden Sie dieses Formular um Zahlungen anzufordern. Alle Felder sind optional.</translation>
+ <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
+ <translation>Verwenden Sie dieses Formular um Zahlungen anzufordern. Alle Felder sind &lt;b&gt;optional&lt;/b&gt;.</translation>
+ </message>
+ <message>
+ <location line="+39"/>
+ <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
+ <translation>Ein optional angeforderte Betrag. Lassen Sie dieses Feld leer oder setzen Sie es auf 0, um keinen spezifischen Betrag anzufordern.</translation>
</message>
<message>
<location line="+17"/>
@@ -1541,6 +1934,31 @@ Adresse: %4</translation>
<source>&amp;Request payment</source>
<translation>&amp;Zahlung anfordern</translation>
</message>
+ <message>
+ <location line="+47"/>
+ <source>Requested payments</source>
+ <translation>Angeforderte Zahlungen</translation>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Show the selected request (does the same as double clicking an entry)</source>
+ <translation>Die ausgewählten Anforderungen anzeigen (entspricht einem Doppelklick auf einen Eintrag)</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Show</source>
+ <translation>Anzeigen</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Remove the selected entries from the list</source>
+ <translation>Die ausgewählten Einträge aus der Liste entfernen</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Remove</source>
+ <translation>Entfernen</translation>
+ </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
@@ -1561,16 +1979,11 @@ Adresse: %4</translation>
</message>
<message>
<location line="+7"/>
- <source>&amp;Copy Image</source>
- <translation>Grafik &amp;kopieren</translation>
- </message>
- <message>
- <location line="+7"/>
<source>&amp;Save Image...</source>
<translation>Grafik &amp;speichern...</translation>
</message>
<message>
- <location filename="../receiverequestdialog.cpp" line="+58"/>
+ <location filename="../receiverequestdialog.cpp" line="+56"/>
<source>Request payment to %1</source>
<translation>Zahlung anfordern an %1</translation>
</message>
@@ -1616,16 +2029,119 @@ Adresse: %4</translation>
</message>
</context>
<context>
+ <name>RecentRequestsTableModel</name>
+ <message>
+ <location filename="../recentrequeststablemodel.cpp" line="+24"/>
+ <source>Date</source>
+ <translation>Datum</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Label</source>
+ <translation>Bezeichnung</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Message</source>
+ <translation>Nachricht signieren</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Amount</source>
+ <translation>Betrag</translation>
+ </message>
+ <message>
+ <location line="+38"/>
+ <source>(no label)</source>
+ <translation>(keine Bezeichnung)</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>(no message)</source>
+ <translation>(keine Nachricht)</translation>
+ </message>
+</context>
+<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+140"/>
- <location line="+213"/>
+ <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location line="+80"/>
<source>Send Coins</source>
<translation>Bitcoins überweisen</translation>
</message>
<message>
- <location line="+50"/>
+ <location line="+76"/>
+ <source>Coin Control Features</source>
+ <translation>&quot;Coin Control&quot;-Funktionen</translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Inputs...</source>
+ <translation>Eingaben...</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>automatically selected</source>
+ <translation>automatisch ausgewählt</translation>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Insufficient funds!</source>
+ <translation>Unzureichender Kontostand!</translation>
+ </message>
+ <message>
+ <location line="+89"/>
+ <source>Quantity:</source>
+ <translation>Anzahl:</translation>
+ </message>
+ <message>
+ <location line="+35"/>
+ <source>Bytes:</source>
+ <translation>Byte:</translation>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Amount:</source>
+ <translation>Betrag:</translation>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Priority:</source>
+ <translation>Priorität:</translation>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Fee:</source>
+ <translation>Gebühr:</translation>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Low Output:</source>
+ <translation>Zu geringer Ausgabebetrag:</translation>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>After Fee:</source>
+ <translation>Abzüglich Gebühr:</translation>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Change:</source>
+ <translation>Wechselgeld:</translation>
+ </message>
+ <message>
+ <location line="+44"/>
+ <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source>
+ <translation>Wenn dies aktivert ist und die Wechselgeld-Adresse leer oder ungültig ist, wird das Wechselgeld an eine neu erzeugte Adresse überwiesen.</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Custom change address</source>
+ <translation>Benutzerdefinierte Wechselgeld-Adresse</translation>
+ </message>
+ <message>
+ <location line="+115"/>
<source>Send to multiple recipients at once</source>
<translation>In einer Transaktion an mehrere Empfänger auf einmal überweisen</translation>
</message>
@@ -1650,12 +2166,7 @@ Adresse: %4</translation>
<translation>Kontostand:</translation>
</message>
<message>
- <location line="+10"/>
- <source>123.456 BTC</source>
- <translation>123.456 BTC</translation>
- </message>
- <message>
- <location line="+31"/>
+ <location line="+41"/>
<source>Confirm the send action</source>
<translation>Überweisung bestätigen</translation>
</message>
@@ -1665,49 +2176,125 @@ Adresse: %4</translation>
<translation>&amp;Ãœberweisen</translation>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-154"/>
+ <location filename="../sendcoinsdialog.cpp" line="-228"/>
<source>Confirm send coins</source>
<translation>Überweisung bestätigen</translation>
</message>
<message>
- <location line="-90"/>
+ <location line="-74"/>
<location line="+5"/>
<location line="+5"/>
+ <location line="+4"/>
<source>%1 to %2</source>
<translation>%1 an %2</translation>
</message>
<message>
- <location line="+26"/>
+ <location line="-136"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation>Bitcoin-Adresse eingeben (z.B. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Copy quantity</source>
+ <translation>Anzahl kopieren</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation>Betrag kopieren</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy fee</source>
+ <translation>Gebühr kopieren</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy after fee</source>
+ <translation>Abzüglich Gebühr kopieren</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy bytes</source>
+ <translation>Byte kopieren</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy priority</source>
+ <translation>Priorität kopieren</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy low output</source>
+ <translation>Zu geringen Ausgabebetrag kopieren</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy change</source>
+ <translation>Wechselgeld kopieren</translation>
+ </message>
+ <message>
+ <location line="+170"/>
+ <source>Total Amount %1 (= %2)</source>
+ <translation>Gesamtbetrag %1 (= %2)</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>or</source>
+ <translation>oder</translation>
+ </message>
+ <message>
+ <location line="+202"/>
<source>The recipient address is not valid, please recheck.</source>
<translation>Die Zahlungsadresse ist ungültig, bitte nochmals überprüfen.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The amount to pay must be larger than 0.</source>
<translation>Der zu zahlende Betrag muss größer als 0 sein.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The amount exceeds your balance.</source>
<translation>Der angegebene Betrag übersteigt ihren Kontostand.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The total exceeds your balance when the %1 transaction fee is included.</source>
<translation>Der angegebene Betrag übersteigt aufgrund der Transaktionsgebühr in Höhe von %1 ihren Kontostand.</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+3"/>
<source>Duplicate address found, can only send to each address once per send operation.</source>
<translation>Doppelte Adresse gefunden, pro Überweisung kann an jede Adresse nur einmalig etwas überwiesen werden.</translation>
</message>
<message>
+ <location line="+3"/>
+ <source>Transaction creation failed!</source>
+ <translation>Transaktionserstellung fehlgeschlagen!</translation>
+ </message>
+ <message>
<location line="+4"/>
- <source>Error: Transaction creation failed!</source>
- <translation>Fehler: Transaktionserstellung fehlgeschlagen!</translation>
+ <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
+ <translation>Die Transaktion wurde abgelehnt! Dies kann passieren, wenn einige Bitcoins aus ihrer Wallet bereits ausgegeben wurden. Beispielsweise weil Sie eine Kopie ihrer wallet.dat genutzt, die Bitcoins dort ausgegeben haben und dies daher in der derzeit aktiven Wallet nicht vermerkt ist.</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+112"/>
+ <source>Warning: Invalid Bitcoin address</source>
+ <translation>Warnung: Ungültige Bitcoin-Adresse</translation>
+ </message>
+ <message>
+ <location line="+21"/>
+ <source>(no label)</source>
+ <translation>(keine Bezeichnung)</translation>
+ </message>
+ <message>
+ <location line="-11"/>
+ <source>Warning: Unknown change address</source>
+ <translation>Warnung: Unbekannte Wechselgeld-Adresse</translation>
+ </message>
+ <message>
+ <location line="-366"/>
<source>Are you sure you want to send?</source>
<translation>Wollen Sie die Überweisung ausführen?</translation>
</message>
@@ -1717,17 +2304,7 @@ Adresse: %4</translation>
<translation>als Transaktionsgebühr hinzugefügt</translation>
</message>
<message>
- <location line="+6"/>
- <source>Total Amount %1</source>
- <translation>Gesamtbetrag %1</translation>
- </message>
- <message>
- <location line="+20"/>
- <source>Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
- <translation>Fehler: Die Transaktion wurde abgelehnt. Dies kann passieren, wenn einige Bitcoins aus ihrer Wallet bereits ausgegeben wurden. Beispielsweise weil Sie eine Kopie ihrer wallet.dat genutzt, die Bitcoins dort ausgegeben haben und dies daher in der derzeit aktiven Wallet nicht vermerkt ist.</translation>
- </message>
- <message>
- <location line="+144"/>
+ <location line="+170"/>
<source>Payment request expired</source>
<translation>Zahlungsanforderung abgelaufen</translation>
</message>
@@ -1740,39 +2317,44 @@ Adresse: %4</translation>
<context>
<name>SendCoinsEntry</name>
<message>
- <location filename="../forms/sendcoinsentry.ui" line="+33"/>
- <location line="+585"/>
+ <location filename="../forms/sendcoinsentry.ui" line="+131"/>
+ <location line="+521"/>
+ <location line="+536"/>
<source>A&amp;mount:</source>
<translation>&amp;Betrag:</translation>
</message>
<message>
- <location line="-572"/>
- <location line="+585"/>
+ <location line="-1152"/>
<source>Pay &amp;To:</source>
<translation>&amp;Empfänger:</translation>
</message>
<message>
- <location line="-551"/>
+ <location line="+18"/>
<source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>Die Zahlungsadresse der Ãœberweisung (z.B. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location filename="../sendcoinsentry.cpp" line="+28"/>
+ <location filename="../sendcoinsentry.cpp" line="+30"/>
<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>
<message>
- <location filename="../forms/sendcoinsentry.ui" line="-18"/>
+ <location filename="../forms/sendcoinsentry.ui" line="+57"/>
<source>&amp;Label:</source>
<translation>&amp;Bezeichnung:</translation>
</message>
<message>
- <location line="+28"/>
+ <location line="-50"/>
<source>Choose previously used address</source>
<translation>Bereits verwendeten Adresse auswählen</translation>
</message>
<message>
- <location line="+10"/>
+ <location line="-40"/>
+ <source>This is a normal payment.</source>
+ <translation>Dies ist eine normale Ãœberweisung.</translation>
+ </message>
+ <message>
+ <location line="+50"/>
<source>Alt+A</source>
<translation>Alt+A</translation>
</message>
@@ -1788,16 +2370,45 @@ Adresse: %4</translation>
</message>
<message>
<location line="+7"/>
- <source>Remove this recipient</source>
- <translation>Diesen Empfänger entfernen</translation>
+ <location line="+524"/>
+ <location line="+536"/>
+ <source>Remove this entry</source>
+ <translation>Diesen Eintrag entfernen</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="-1008"/>
+ <source>Message:</source>
+ <translation>Nachricht:</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation>Eine an die &quot;bitcoin:&quot;-URI angefügte Nachricht, die zusammen mit der Transaktion gespeichert wird. Hinweis: Diese Nachricht wird nicht über das Bitcoin-Netzwerk gesendet.</translation>
+ </message>
+ <message>
+ <location line="+958"/>
+ <source>This is a verified payment request.</source>
+ <translation>Dies is eine verifizierte Zahlungsanforderung.</translation>
+ </message>
+ <message>
+ <location line="-991"/>
<source>Enter a label for this address to add it to the list of used addresses</source>
<translation>Adressbezeichnung eingeben, die dann zusammen mit der Adresse der Liste bereits verwendeter Adressen hinzugefügt wird.</translation>
</message>
<message>
- <location line="+465"/>
+ <location line="+459"/>
+ <source>This is an unverified payment request.</source>
+ <translation>Dies is eine unverifizierte Zahlungsanforderung.</translation>
+ </message>
+ <message>
+ <location line="+18"/>
+ <location line="+532"/>
+ <source>Pay To:</source>
+ <translation>Empfänger:</translation>
+ </message>
+ <message>
+ <location line="-498"/>
+ <location line="+536"/>
<source>Memo:</source>
<translation>Memo:</translation>
</message>
@@ -1808,6 +2419,19 @@ Adresse: %4</translation>
</message>
</context>
<context>
+ <name>ShutdownWindow</name>
+ <message>
+ <location filename="../utilitydialog.cpp" line="+48"/>
+ <source>Bitcoin Core is shutting down...</source>
+ <translation>Bitcoin Core wird beendet...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Do not shut down the computer until this window disappears.</source>
+ <translation>Fahren Sie den Computer nicht herunter, bevor dieses Fenster verschwindet.</translation>
+ </message>
+</context>
+<context>
<name>SignVerifyMessageDialog</name>
<message>
<location filename="../forms/signverifymessagedialog.ui" line="+14"/>
@@ -1815,7 +2439,7 @@ Adresse: %4</translation>
<translation>Signaturen - eine Nachricht signieren / verifizieren</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+10"/>
<source>&amp;Sign Message</source>
<translation>Nachricht &amp;signieren</translation>
</message>
@@ -1918,7 +2542,7 @@ Adresse: %4</translation>
<translation>Alle &quot;Nachricht verifizieren&quot;-Felder zurücksetzen</translation>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+27"/>
+ <location filename="../signverifymessagedialog.cpp" line="+29"/>
<location line="+3"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>Bitcoin-Adresse eingeben (z.B. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
@@ -1934,7 +2558,7 @@ Adresse: %4</translation>
<translation>Bitcoin-Signatur eingeben</translation>
</message>
<message>
- <location line="+85"/>
+ <location line="+84"/>
<location line="+81"/>
<source>The entered address is invalid.</source>
<translation>Die eingegebene Adresse ist ungültig.</translation>
@@ -2003,9 +2627,14 @@ Adresse: %4</translation>
<context>
<name>SplashScreen</name>
<message>
- <location filename="../splashscreen.cpp" line="+23"/>
- <source>The Bitcoin developers</source>
- <translation>Die Bitcoinentwickler</translation>
+ <location filename="../splashscreen.cpp" line="+28"/>
+ <source>Bitcoin Core</source>
+ <translation>Bitcoin-Kern</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>The Bitcoin Core developers</source>
+ <translation>Die &quot;Bitcoin Core&quot;-Entwickler</translation>
</message>
<message>
<location line="+1"/>
@@ -2016,7 +2645,7 @@ Adresse: %4</translation>
<context>
<name>TrafficGraphWidget</name>
<message>
- <location filename="../trafficgraphwidget.cpp" line="+75"/>
+ <location filename="../trafficgraphwidget.cpp" line="+79"/>
<source>KB/s</source>
<translation>KB/s</translation>
</message>
@@ -2024,7 +2653,7 @@ Adresse: %4</translation>
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="+22"/>
+ <location filename="../transactiondesc.cpp" line="+28"/>
<source>Open until %1</source>
<translation>Offen bis %1</translation>
</message>
@@ -2097,12 +2726,12 @@ Adresse: %4</translation>
<location line="+12"/>
<location line="+45"/>
<location line="+17"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Credit</source>
<translation>Gutschrift</translation>
</message>
<message numerus="yes">
- <location line="-120"/>
+ <location line="-125"/>
<source>matures in %n more block(s)</source>
<translation><numerusform>reift noch %n weiteren Block</numerusform><numerusform>reift noch %n weitere Blöcke</numerusform></translation>
</message>
@@ -2115,12 +2744,12 @@ Adresse: %4</translation>
<location line="+44"/>
<location line="+8"/>
<location line="+15"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Debit</source>
<translation>Belastung</translation>
</message>
<message>
- <location line="-57"/>
+ <location line="-62"/>
<source>Transaction fee</source>
<translation>Transaktionsgebühr</translation>
</message>
@@ -2131,11 +2760,12 @@ Adresse: %4</translation>
</message>
<message>
<location line="+6"/>
+ <location line="+9"/>
<source>Message</source>
<translation>Nachricht signieren</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="-7"/>
<source>Comment</source>
<translation>Kommentar</translation>
</message>
@@ -2145,7 +2775,7 @@ Adresse: %4</translation>
<translation>Transaktions-ID</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+18"/>
<source>Merchant</source>
<translation>Händler</translation>
</message>
@@ -2185,7 +2815,7 @@ Adresse: %4</translation>
<translation>falsch</translation>
</message>
<message>
- <location line="-227"/>
+ <location line="-232"/>
<source>, has not been successfully broadcast yet</source>
<translation>, wurde noch nicht erfolgreich übertragen</translation>
</message>
@@ -2216,7 +2846,7 @@ Adresse: %4</translation>
<context>
<name>TransactionTableModel</name>
<message>
- <location filename="../transactiontablemodel.cpp" line="+227"/>
+ <location filename="../transactiontablemodel.cpp" line="+234"/>
<source>Date</source>
<translation>Datum</translation>
</message>
@@ -2235,8 +2865,13 @@ Adresse: %4</translation>
<source>Amount</source>
<translation>Betrag</translation>
</message>
+ <message>
+ <location line="+59"/>
+ <source>Immature (%1 confirmations, will be available after %2)</source>
+ <translation>Unreif (%1 Bestätigungen, wird verfügbar sein nach %2)</translation>
+ </message>
<message numerus="yes">
- <location line="+57"/>
+ <location line="+16"/>
<source>Open for %n more block(s)</source>
<translation><numerusform>Offen für %n weiteren Block</numerusform><numerusform>Offen für %n weitere Blöcke</numerusform></translation>
</message>
@@ -2256,17 +2891,13 @@ Adresse: %4</translation>
<translation>Unbestätigt (%1 von %2 Bestätigungen)</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="-22"/>
+ <location line="+25"/>
<source>Confirmed (%1 confirmations)</source>
<translation>Bestätigt (%1 Bestätigungen)</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>Erarbeiteter Betrag wird verfügbar sein, nachdem er noch %n weiteren Block reift</numerusform><numerusform>Erarbeiteter Betrag wird verfügbar sein, nachdem er noch %n weitere Blöcke reift</numerusform></translation>
- </message>
<message>
- <location line="+5"/>
+ <location line="-22"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation>Dieser Block wurde von keinem anderen Knoten empfangen und wird wahrscheinlich nicht angenommen werden!</translation>
</message>
@@ -2276,7 +2907,7 @@ Adresse: %4</translation>
<translation>Generiert, jedoch nicht angenommen</translation>
</message>
<message>
- <location line="+43"/>
+ <location line="+62"/>
<source>Received with</source>
<translation>Empfangen über</translation>
</message>
@@ -2334,7 +2965,7 @@ Adresse: %4</translation>
<context>
<name>TransactionView</name>
<message>
- <location filename="../transactionview.cpp" line="+52"/>
+ <location filename="../transactionview.cpp" line="+57"/>
<location line="+16"/>
<source>All</source>
<translation>Alle</translation>
@@ -2395,12 +3026,12 @@ Adresse: %4</translation>
<translation>Andere</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+6"/>
<source>Enter address or label to search</source>
<translation>Zu suchende Adresse oder Bezeichnung eingeben</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+6"/>
<source>Min amount</source>
<translation>Minimaler Betrag</translation>
</message>
@@ -2435,17 +3066,37 @@ Adresse: %4</translation>
<translation>Transaktionsdetails anzeigen</translation>
</message>
<message>
- <location line="+143"/>
- <source>Export Transaction Data</source>
- <translation>Transaktionen exportieren</translation>
+ <location line="+142"/>
+ <source>Export Transaction History</source>
+ <translation>Transaktionsverlauf exportieren</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+19"/>
+ <source>Exporting Failed</source>
+ <translation>Exportieren fehlgeschlagen</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>There was an error trying to save the transaction history to %1.</source>
+ <translation>Beim Speichern des Transaktionsverlaufs nach %1 ist ein Fehler aufgetreten.</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Exporting Successful</source>
+ <translation>Exportieren erfolgreich</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The transaction history was successfully saved to %1.</source>
+ <translation>Speichern des Transaktionsverlaufs nach %1 war erfolgreich.</translation>
+ </message>
+ <message>
+ <location line="-22"/>
<source>Comma separated file (*.csv)</source>
<translation>Kommagetrennte-Datei (*.csv)</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+9"/>
<source>Confirmed</source>
<translation>Bestätigt</translation>
</message>
@@ -2480,17 +3131,7 @@ Adresse: %4</translation>
<translation>ID</translation>
</message>
<message>
- <location line="+4"/>
- <source>Error exporting</source>
- <translation>Fehler beim Exportieren</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation>Konnte nicht in Datei %1 schreiben.</translation>
- </message>
- <message>
- <location line="+100"/>
+ <location line="+107"/>
<source>Range:</source>
<translation>Zeitraum:</translation>
</message>
@@ -2501,9 +3142,17 @@ Adresse: %4</translation>
</message>
</context>
<context>
+ <name>WalletFrame</name>
+ <message>
+ <location filename="../walletframe.cpp" line="+26"/>
+ <source>No wallet has been loaded.</source>
+ <translation>Es wurde keine Wallet geladen.</translation>
+ </message>
+</context>
+<context>
<name>WalletModel</name>
<message>
- <location filename="../walletmodel.cpp" line="+218"/>
+ <location filename="../walletmodel.cpp" line="+245"/>
<source>Send Coins</source>
<translation>Bitcoins überweisen</translation>
</message>
@@ -2511,7 +3160,7 @@ Adresse: %4</translation>
<context>
<name>WalletView</name>
<message>
- <location filename="../walletview.cpp" line="+46"/>
+ <location filename="../walletview.cpp" line="+43"/>
<source>&amp;Export</source>
<translation>E&amp;xportieren</translation>
</message>
@@ -2521,65 +3170,60 @@ Adresse: %4</translation>
<translation>Daten der aktuellen Ansicht in eine Datei exportieren</translation>
</message>
<message>
- <location line="+183"/>
+ <location line="+181"/>
<source>Backup Wallet</source>
<translation>Wallet sichern</translation>
</message>
<message>
- <location line="+0"/>
+ <location line="+1"/>
<source>Wallet Data (*.dat)</source>
<translation>Wallet-Daten (*.dat)</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="+6"/>
<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 Wallet-Daten an die neue Position ist ein Fehler aufgetreten.</translation>
+ <source>There was an error trying to save the wallet data to %1.</source>
+ <translation>Beim Speichern der Wallet-Daten nach %1 ist ein Fehler aufgetreten.</translation>
</message>
<message>
<location line="+4"/>
- <source>Backup Successful</source>
- <translation>Sicherung erfolgreich</translation>
+ <source>The wallet data was successfully saved to %1.</source>
+ <translation>Speichern der Wallet-Daten nach %1 war erfolgreich.</translation>
</message>
<message>
<location line="+0"/>
- <source>The wallet data was successfully saved to the new location.</source>
- <translation>Speichern der Wallet-Daten an die neue Position war erfolgreich.</translation>
+ <source>Backup Successful</source>
+ <translation>Sicherung erfolgreich</translation>
</message>
</context>
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+102"/>
- <source>Bitcoin version</source>
- <translation>Bitcoin-Version</translation>
- </message>
- <message>
- <location line="+107"/>
+ <location filename="../bitcoinstrings.cpp" line="+221"/>
<source>Usage:</source>
<translation>Benutzung:</translation>
</message>
<message>
- <location line="-55"/>
+ <location line="-54"/>
<source>List commands</source>
<translation>Befehle auflisten</translation>
</message>
<message>
- <location line="-13"/>
+ <location line="-14"/>
<source>Get help for a command</source>
<translation>Hilfe zu einem Befehl erhalten</translation>
</message>
<message>
- <location line="+25"/>
+ <location line="+26"/>
<source>Options:</source>
<translation>Optionen:</translation>
</message>
<message>
- <location line="+24"/>
+ <location line="+22"/>
<source>Specify configuration file (default: bitcoin.conf)</source>
<translation>Konfigurationsdatei festlegen (Standard: bitcoin.conf)</translation>
</message>
@@ -2599,7 +3243,7 @@ Adresse: %4</translation>
<translation>Größe des Datenbankcaches in MB festlegen (Standard: 25)</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-26"/>
<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>
@@ -2609,7 +3253,7 @@ Adresse: %4</translation>
<translation>Maximal &lt;n&gt; Verbindungen zu Gegenstellen aufrechterhalten (Standard: 125)</translation>
</message>
<message>
- <location line="-49"/>
+ <location line="-51"/>
<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>
@@ -2619,37 +3263,37 @@ Adresse: %4</translation>
<translation>Die eigene öffentliche Adresse angeben</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<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="-142"/>
+ <location line="-148"/>
<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="-33"/>
+ <location line="-36"/>
<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="+31"/>
+ <location line="+34"/>
<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="+40"/>
+ <location line="+45"/>
<source>Accept command line and JSON-RPC commands</source>
<translation>Kommandozeilenbefehle und JSON-RPC-Befehle annehmen</translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>Als Hintergrunddienst starten und Befehle annehmen</translation>
</message>
<message>
- <location line="+40"/>
+ <location line="+39"/>
<source>Use the test network</source>
<translation>Das Testnetz verwenden</translation>
</message>
@@ -2659,7 +3303,7 @@ Adresse: %4</translation>
<translation>Eingehende Verbindungen annehmen (Standard: 1, wenn nicht -proxy oder -connect)</translation>
</message>
<message>
- <location line="-87"/>
+ <location line="-95"/>
<source>%s, you must set a rpcpassword in the configuration file:
%s
It is recommended you use the following random password:
@@ -2710,6 +3354,11 @@ zum Beispiel: alertnotify=echo %%s | mail -s \&quot;Bitcoin Alert\&quot; admin@f
</message>
<message>
<location line="+4"/>
+ <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</source>
+ <translation>Regressionstest-Modus aktivieren, welcher eine spezielle Kette nutzt, in der Blöcke sofort gelöst werden.</translation>
+ </message>
+ <message>
+ <location line="+3"/>
<source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
<translation>Fehler: Die Transaktion wurde abgelehnt! Dies kann passieren, wenn einige Bitcoins aus ihrer Wallet bereits ausgegeben wurden. Beispielsweise weil Sie eine Kopie ihrer wallet.dat genutzt, die Bitcoins dort ausgegeben haben und dies daher in der derzeit aktiven Wallet nicht vermerkt ist.</translation>
</message>
@@ -2724,17 +3373,17 @@ zum Beispiel: alertnotify=echo %%s | mail -s \&quot;Bitcoin Alert\&quot; admin@f
<translation>Kommando ausführen wenn sich eine Wallet-Transaktion 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="+6"/>
+ <location line="+18"/>
<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>
<message>
<location line="+5"/>
+ <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source>
+ <translation>Separaten SOCKS5-Proxy verwenden, um Gegenstellen über versteckte Tor-Dienste zu erreichen (Standard: -proxy)</translation>
+ </message>
+ <message>
+ <location line="+3"/>
<source>Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source>
<translation>Warnung: -paytxfee ist auf einen sehr hohen Wert festgelegt! Dies ist die Gebühr die beim Senden einer Transaktion fällig wird.</translation>
</message>
@@ -2764,17 +3413,27 @@ zum Beispiel: alertnotify=echo %%s | mail -s \&quot;Bitcoin Alert\&quot; admin@f
<translation>Warnung: wallet.dat beschädigt, Rettung erfolgreich! Original wallet.dat wurde als wallet.{Zeitstempel}.dat in %s gespeichert. Falls ihr Kontostand oder Transaktionen nicht korrekt sind, sollten Sie von einer Datensicherung wiederherstellen.</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="+9"/>
+ <source>&lt;category&gt; can be:</source>
+ <translation>&lt;category&gt; kann sein:</translation>
+ </message>
+ <message>
+ <location line="+6"/>
<source>Attempt to recover private keys from a corrupt wallet.dat</source>
<translation>Versucht private Schlüssel aus einer beschädigten wallet.dat wiederherzustellen</translation>
</message>
<message>
<location line="+1"/>
+ <source>Bitcoin Core Daemon</source>
+ <translation>&quot;Bitcoin Core&quot;-Daemon</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Bitcoin RPC client version</source>
<translation>Bitcoin-RPC-Clientversion</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
<source>Block creation options:</source>
<translation>Blockerzeugungsoptionen:</translation>
</message>
@@ -2784,7 +3443,12 @@ zum Beispiel: alertnotify=echo %%s | mail -s \&quot;Bitcoin Alert\&quot; admin@f
<translation>Nur mit dem/den angegebenen Knoten verbinden</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
+ <source>Connect through SOCKS proxy</source>
+ <translation>Ãœber einen SOCKS-Proxy verbinden</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect to JSON-RPC on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation>Mit JSON-RPC über &lt;port&gt; verbinden (Standard: 8332 oder Testnetz: 18332)</translation>
</message>
@@ -2800,6 +3464,11 @@ zum Beispiel: alertnotify=echo %%s | mail -s \&quot;Bitcoin Alert\&quot; admin@f
</message>
<message>
<location line="+1"/>
+ <source>Do not load the wallet and disable wallet RPC calls</source>
+ <translation>Die Wallet nicht laden und Wallet-RPC-Aufrufe deaktivieren</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Do you want to rebuild the block database now?</source>
<translation>Möchten Sie die Blockdatenbank nun neu aufbauen?</translation>
</message>
@@ -2894,7 +3563,12 @@ zum Beispiel: alertnotify=echo %%s | mail -s \&quot;Bitcoin Alert\&quot; admin@f
<translation>Schreiben der Rücksetzdaten fehlgeschlagen</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
+ <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="+1"/>
<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>
@@ -2914,6 +3588,11 @@ zum Beispiel: alertnotify=echo %%s | mail -s \&quot;Bitcoin Alert\&quot; admin@f
<translation>Wie gründlich soll die Blockprüfung sein (0-4, Standard: 3)</translation>
</message>
<message>
+ <location line="+1"/>
+ <source>If &lt;category&gt; is not supplied, output all debugging information.</source>
+ <translation>Wenn &lt;category&gt; nicht angegeben wird, jegliche Debugginginformationen ausgeben.</translation>
+ </message>
+ <message>
<location line="+2"/>
<source>Incorrect or no genesis block found. Wrong datadir for network?</source>
<translation>Fehlerhafter oder kein Genesis-Block gefunden. Falsches Datenverzeichnis für das Netzwerk?</translation>
@@ -2929,17 +3608,37 @@ zum Beispiel: alertnotify=echo %%s | mail -s \&quot;Bitcoin Alert\&quot; admin@f
<translation>Nicht genügend File-Deskriptoren verfügbar.</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+5"/>
+ <source>Prepend debug output with timestamp (default: 1)</source>
+ <translation>Der Debugausgabe einen Zeitstempel voranstellen (Standard: 1)</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>RPC client options:</source>
+ <translation>RPC-Client-Optionen:</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Rebuild block chain index from current blk000??.dat files</source>
<translation>Blockkettenindex aus aktuellen Dateien blk000??.dat wiederaufbauen</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+5"/>
+ <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source>
+ <translation>SOCKS-Version des Proxies wählen (4 oder 5, Standard: 5)</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Send command to Bitcoin server</source>
<translation>Befehl an Bitcoin-Server senden</translation>
</message>
<message>
- <location line="+10"/>
+ <location line="+7"/>
+ <source>Set maximum block size in bytes (default: %d)</source>
+ <translation>Maximale Blockgröße in Byte festlegen (Standard: %d)</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Set the number of threads to service RPC calls (default: 4)</source>
<translation>Maximale Anzahl an Threads zur Verarbeitung von RPC-Anfragen festlegen (Standard: 4)</translation>
</message>
@@ -2954,12 +3653,17 @@ zum Beispiel: alertnotify=echo %%s | mail -s \&quot;Bitcoin Alert\&quot; admin@f
<translation>Bitcoin-Server starten</translation>
</message>
<message>
- <location line="+12"/>
+ <location line="+3"/>
+ <source>This is intended for regression testing tools and app development.</source>
+ <translation>Dies ist für Regressionstest-Tools und Anwendungsentwicklung gedacht.</translation>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Usage (deprecated, use bitcoin-cli):</source>
<translation>Benutzung (veraltet, bitte bitcoin-cli verwenden):</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+7"/>
<source>Verifying blocks...</source>
<translation>Verifiziere Blöcke...</translation>
</message>
@@ -2970,31 +3674,56 @@ zum Beispiel: alertnotify=echo %%s | mail -s \&quot;Bitcoin Alert\&quot; admin@f
</message>
<message>
<location line="+1"/>
+ <source>Wait for RPC server to start</source>
+ <translation>Warten, bis der RPC-Server gestartet ist</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Wallet %s resides outside data directory %s</source>
<translation>Wallet %s liegt außerhalb des Datenverzeichnisses %s</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+2"/>
+ <source>Wallet options:</source>
+ <translation>Wallet-Optionen:</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source>
+ <translation>Warnung: Veraltetes Argument -debugnet gefunden, bitte -debug=net verwenden</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>You need to rebuild the database using -reindex to change -txindex</source>
<translation>Sie müssen die Datenbank mit Hilfe von -reindex neu aufbauen, um -txindex zu verändern</translation>
</message>
<message>
- <location line="-78"/>
+ <location line="-79"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation>Blöcke aus externer Datei blk000??.dat importieren</translation>
</message>
<message>
- <location line="-98"/>
+ <location line="-105"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation>Kommando ausführen wenn ein relevanter Alarm empfangen wird oder wir einen wirklich langen Fork entdecken (%s im Kommando wird durch die Nachricht ersetzt)</translation>
</message>
<message>
- <location line="+17"/>
+ <location line="+14"/>
+ <source>Output debugging information (default: 0, supplying &lt;category&gt; is optional)</source>
+ <translation>Debugginginformationen ausgeben (Standard: 0, &lt;category&gt; anzugeben ist optional)</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
+ <translation>Maximale Größe von &quot;high-priority/low-fee&quot;-Transaktionen in Byte festlegen (Standard: %d)</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
<translation>Maximale Anzahl an Skript-Verifizierungs-Threads festlegen (bis zu 16, 0 = automatisch, &lt;0 = soviele Kerne frei lassen, Standard: 0)</translation>
</message>
<message>
- <location line="+83"/>
+ <location line="+89"/>
<source>Information</source>
<translation>Hinweis</translation>
</message>
@@ -3034,47 +3763,17 @@ zum Beispiel: alertnotify=echo %%s | mail -s \&quot;Bitcoin Alert\&quot; admin@f
<translation>Verbinde nur zu Knoten des Netztyps &lt;net&gt; (IPv4, IPv6 oder Tor)</translation>
</message>
<message>
- <location line="+2"/>
- <source>Output extra debugging information. Implies all other -debug* options</source>
- <translation>Zusätzliche Debugginginformationen ausgeben. Beinhaltet alle anderen &quot;-debug*&quot;-Parameter</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Output extra network debugging information</source>
- <translation>Zusätzliche Netzwerk-Debugginginformationen ausgeben</translation>
- </message>
- <message>
- <location line="+2"/>
- <source>Prepend debug output with timestamp</source>
- <translation>Der Debugausgabe einen Zeitstempel voranstellen</translation>
- </message>
- <message>
- <location line="+5"/>
+ <location line="+9"/>
<source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
<translation>SSL-Optionen: (siehe Bitcoin-Wiki für SSL-Installationsanweisungen)</translation>
</message>
<message>
- <location line="+1"/>
- <source>Select the version of socks proxy to use (4-5, default: 5)</source>
- <translation>SOCKS-Version des Proxies festlegen (4-5, Standard: 5)</translation>
- </message>
- <message>
- <location line="+3"/>
+ <location line="+4"/>
<source>Send trace/debug info to console instead of debug.log file</source>
<translation>Rückverfolgungs- und Debuginformationen an die Konsole senden anstatt sie in die Datei debug.log zu schreiben</translation>
</message>
<message>
- <location line="+1"/>
- <source>Send trace/debug info to debugger</source>
- <translation>Rückverfolgungs- und Debuginformationen an den Debugger senden</translation>
- </message>
- <message>
- <location line="+5"/>
- <source>Set maximum block size in bytes (default: 250000)</source>
- <translation>Maximale Blockgröße in Byte festlegen (Standard: 250000)</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+6"/>
<source>Set minimum block size in bytes (default: 0)</source>
<translation>Minimale Blockgröße in Byte festlegen (Standard: 0)</translation>
</message>
@@ -3099,7 +3798,7 @@ zum Beispiel: alertnotify=echo %%s | mail -s \&quot;Bitcoin Alert\&quot; admin@f
<translation>Systemfehler: </translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Transaction amount too small</source>
<translation>Transaktionsbetrag zu niedrig</translation>
</message>
@@ -3124,32 +3823,32 @@ zum Beispiel: alertnotify=echo %%s | mail -s \&quot;Bitcoin Alert\&quot; admin@f
<translation>UPnP verwenden, um die Portweiterleitung einzurichten (Standard: 1, wenn abgehört wird)</translation>
</message>
<message>
- <location line="+1"/>
- <source>Use proxy to reach tor hidden services (default: same as -proxy)</source>
- <translation>Proxy verwenden, um versteckte Tor-Dienste zu erreichen (Standard: identisch mit -proxy)</translation>
- </message>
- <message>
<location line="+2"/>
<source>Username for JSON-RPC connections</source>
<translation>Benutzername für JSON-RPC-Verbindungen</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+7"/>
<source>Warning</source>
<translation>Warnung</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Warning: This version is obsolete, upgrade required!</source>
<translation>Warnung: Diese Version is veraltet, Aktualisierung erforderlich!</translation>
</message>
<message>
<location line="+2"/>
+ <source>version</source>
+ <translation>Version</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="-54"/>
+ <location line="-58"/>
<source>Password for JSON-RPC connections</source>
<translation>Passwort für JSON-RPC-Verbindungen</translation>
</message>
@@ -3159,27 +3858,27 @@ zum Beispiel: alertnotify=echo %%s | mail -s \&quot;Bitcoin Alert\&quot; admin@f
<translation>JSON-RPC-Verbindungen von der angegebenen IP-Adresse erlauben</translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<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="-126"/>
+ <location line="-132"/>
<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="+155"/>
+ <location line="+161"/>
<source>Upgrade wallet to latest format</source>
<translation>Wallet auf das neueste Format aktualisieren</translation>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<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>
<message>
- <location line="-12"/>
+ <location line="-11"/>
<source>Rescan the block chain for missing wallet transactions</source>
<translation>Blockkette erneut nach fehlenden Wallet-Transaktionen durchsuchen</translation>
</message>
@@ -3189,7 +3888,7 @@ zum Beispiel: alertnotify=echo %%s | mail -s \&quot;Bitcoin Alert\&quot; admin@f
<translation>OpenSSL (https) für JSON-RPC-Verbindungen verwenden</translation>
</message>
<message>
- <location line="-29"/>
+ <location line="-30"/>
<source>Server certificate file (default: server.cert)</source>
<translation>Serverzertifikat (Standard: server.cert)</translation>
</message>
@@ -3204,27 +3903,22 @@ zum Beispiel: alertnotify=echo %%s | mail -s \&quot;Bitcoin Alert\&quot; admin@f
<translation>Dieser Hilfetext</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Unable to bind to %s on this computer (bind returned error %d, %s)</source>
<translation>Kann auf diesem Computer nicht an %s binden (von bind zurückgegebener Fehler %d, %s)</translation>
</message>
<message>
- <location line="-95"/>
- <source>Connect through socks proxy</source>
- <translation>Verbindung über SOCKS-Proxy herstellen</translation>
- </message>
- <message>
- <location line="-11"/>
+ <location line="-107"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation>Erlaube DNS-Namensauflösung für -addnode, -seednode und -connect</translation>
</message>
<message>
- <location line="+58"/>
+ <location line="+60"/>
<source>Loading addresses...</source>
<translation>Lade Adressen...</translation>
</message>
<message>
- <location line="-36"/>
+ <location line="-37"/>
<source>Error loading wallet.dat: Wallet corrupted</source>
<translation>Fehler beim Laden von wallet.dat: Wallet beschädigt</translation>
</message>
@@ -3244,12 +3938,12 @@ zum Beispiel: alertnotify=echo %%s | mail -s \&quot;Bitcoin Alert\&quot; admin@f
<translation>Fehler beim Laden von wallet.dat</translation>
</message>
<message>
- <location line="+30"/>
+ <location line="+31"/>
<source>Invalid -proxy address: &apos;%s&apos;</source>
<translation>Ungültige Adresse in -proxy: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+57"/>
+ <location line="+56"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation>Unbekannter Netztyp in -onlynet angegeben: &apos;%s&apos;</translation>
</message>
@@ -3259,7 +3953,7 @@ zum Beispiel: alertnotify=echo %%s | mail -s \&quot;Bitcoin Alert\&quot; admin@f
<translation>Unbekannte Proxyversion in -socks angefordert: %i</translation>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation>Kann Adresse in -bind nicht auflösen: &apos;%s&apos;</translation>
</message>
@@ -3269,7 +3963,7 @@ zum Beispiel: alertnotify=echo %%s | mail -s \&quot;Bitcoin Alert\&quot; admin@f
<translation>Kann Adresse in -externalip nicht auflösen: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+46"/>
+ <location line="+48"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation>Ungültiger Betrag für -paytxfee=&lt;amount&gt;: &apos;%s&apos;</translation>
</message>
@@ -3289,27 +3983,22 @@ zum Beispiel: alertnotify=echo %%s | mail -s \&quot;Bitcoin Alert\&quot; admin@f
<translation>Lade Blockindex...</translation>
</message>
<message>
- <location line="-60"/>
+ <location line="-62"/>
<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>
<message>
- <location line="-28"/>
+ <location line="-32"/>
<source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source>
<translation>Kann auf diesem Computer nicht an %s binden. Evtl. wurde Bitcoin bereits gestartet.</translation>
</message>
<message>
- <location line="+69"/>
- <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="+20"/>
+ <location line="+95"/>
<source>Loading wallet...</source>
<translation>Lade Wallet...</translation>
</message>
<message>
- <location line="-54"/>
+ <location line="-56"/>
<source>Cannot downgrade wallet</source>
<translation>Wallet kann nicht auf eine ältere Version herabgestuft werden</translation>
</message>
@@ -3319,7 +4008,7 @@ zum Beispiel: alertnotify=echo %%s | mail -s \&quot;Bitcoin Alert\&quot; admin@f
<translation>Standardadresse kann nicht geschrieben werden</translation>
</message>
<message>
- <location line="+66"/>
+ <location line="+67"/>
<source>Rescanning...</source>
<translation>Durchsuche erneut...</translation>
</message>
@@ -3339,7 +4028,7 @@ zum Beispiel: alertnotify=echo %%s | mail -s \&quot;Bitcoin Alert\&quot; admin@f
<translation>Fehler</translation>
</message>
<message>
- <location line="-33"/>
+ <location line="-35"/>
<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_AT.ts b/src/qt/locale/bitcoin_de_AT.ts
index c26dbb1985..5dd65e0de4 100644
--- a/src/qt/locale/bitcoin_de_AT.ts
+++ b/src/qt/locale/bitcoin_de_AT.ts
@@ -22,13 +22,13 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location filename="../aboutdialog.cpp" line="+19"/>
+ <location filename="../utilitydialog.cpp" line="+29"/>
<source>Copyright</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+0"/>
- <source>The Bitcoin developers</source>
+ <source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
</context>
@@ -146,13 +146,13 @@ This product includes software developed by the OpenSSL Project for use in the O
</message>
<message>
<location line="+13"/>
- <source>Error exporting</source>
- <translation>Föhla beim Speichan</translation>
+ <source>Exporting Failed</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation>Hob ned in de Datei %1 einespeichan kennan.</translation>
+ <location line="+1"/>
+ <source>There was an error trying to save the address list to %1.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -317,22 +317,27 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+260"/>
+ <location filename="../bitcoingui.cpp" line="+295"/>
<source>Sign &amp;message...</source>
<translation>A Mödung untaschreim...</translation>
</message>
<message>
- <location line="+290"/>
+ <location line="+335"/>
<source>Synchronizing with network...</source>
<translation>Obgleichn midm Netz...</translation>
</message>
<message>
- <location line="-360"/>
+ <location line="-407"/>
<source>&amp;Overview</source>
<translation>&amp;Iwasicht</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="-137"/>
+ <source>Node</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+138"/>
<source>Show general overview of wallet</source>
<translation>Zeig de Gesaumt-Iwasicht iwa&apos;s Beasl</translation>
</message>
@@ -347,7 +352,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Oite Iwaweisungen tscheckn</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>E&amp;xit</source>
<translation>&amp;baba</translation>
</message>
@@ -393,7 +398,22 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>&amp;Geheimwuat ändan...</translation>
</message>
<message>
- <location line="+295"/>
+ <location line="+10"/>
+ <source>&amp;Sending addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Receiving addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open &amp;URI...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+325"/>
<source>Importing blocks from disk...</source>
<translation type="unfinished"/>
</message>
@@ -403,12 +423,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="-358"/>
+ <location line="-405"/>
<source>Send coins to a Bitcoin address</source>
<translation>Schick Zasta aun a Bitcoin Adress</translation>
</message>
<message>
- <location line="+47"/>
+ <location line="+49"/>
<source>Modify configuration options for Bitcoin</source>
<translation>Ända de Eistöllungen fia Bitcoin</translation>
</message>
@@ -438,18 +458,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>&amp;Untaschrift tscheckn...</translation>
</message>
<message>
- <location line="+375"/>
+ <location line="+430"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-563"/>
- <location line="+10"/>
+ <location line="-643"/>
<source>Wallet</source>
<translation>Beasl</translation>
</message>
<message>
- <location line="+113"/>
+ <location line="+146"/>
<source>&amp;Send</source>
<translation type="unfinished"/>
</message>
@@ -459,7 +478,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+44"/>
+ <location line="+46"/>
<location line="+2"/>
<source>&amp;Show / Hide</source>
<translation type="unfinished"/>
@@ -485,86 +504,80 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+39"/>
+ <location line="+48"/>
<source>&amp;File</source>
<translation>&amp;Datei</translation>
</message>
<message>
- <location line="+11"/>
+ <location line="+14"/>
<source>&amp;Settings</source>
<translation>&amp;Eistöllungen</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>&amp;Help</source>
<translation>&amp;Hüfe</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+15"/>
<source>Tabs toolbar</source>
<translation>Karteireita Werkzeigleistn</translation>
</message>
<message>
- <location line="-244"/>
- <location line="+321"/>
+ <location line="-284"/>
+ <location line="+376"/>
<source>[testnet]</source>
<translation>[testnetz]</translation>
</message>
<message>
- <location line="-331"/>
- <location line="+10"/>
+ <location line="-401"/>
<source>Bitcoin Core</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+121"/>
+ <location line="+163"/>
<source>Request payments (generates QR codes and bitcoin: URIs)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+27"/>
+ <location line="+29"/>
<location line="+2"/>
<source>&amp;About Bitcoin Core</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+34"/>
- <source>&amp;Used sending addresses...</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+35"/>
<source>Show the list of used sending addresses and labels</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Used &amp;receiving addresses...</source>
+ <location line="+2"/>
+ <source>Show the list of used receiving addresses and labels</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Show the list of used receiving addresses and labels</source>
+ <location line="+3"/>
+ <source>Open a bitcoin: URI or payment request</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+2"/>
- <source>Open URI...</source>
+ <source>&amp;Command-line options</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
- <source>Open a bitcoin: URI or payment request</source>
+ <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+126"/>
+ <location line="+159"/>
<location line="+5"/>
<source>Bitcoin client</source>
<translation>Bitcoin Klient</translation>
</message>
<message numerus="yes">
- <location line="+133"/>
+ <location line="+142"/>
<source>%n active connection(s) to Bitcoin network</source>
<translation><numerusform>%n aktive Vabindung zum Netz</numerusform><numerusform>%n aktive Vabindungen zum Netz</numerusform></translation>
</message>
@@ -584,7 +597,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+20"/>
+ <location line="+23"/>
<source>%n hour(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -604,7 +617,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
+ <location line="+21"/>
<source>Last received block was generated %1 ago.</source>
<translation type="unfinished"/>
</message>
@@ -629,27 +642,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+77"/>
- <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="-152"/>
+ <location line="-85"/>
<source>Up to date</source>
<translation>Aktuö</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Catching up...</source>
<translation>Aufhoin...</translation>
</message>
<message>
- <location line="+124"/>
- <source>Confirm transaction fee</source>
- <translation>Iwaweisungs-Gebühr bschtätign</translation>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+130"/>
<source>Sent transaction</source>
<translation>Iwaweisung oogschickt</translation>
</message>
@@ -672,7 +675,7 @@ Wohin: %4
</translation>
</message>
<message>
- <location line="+67"/>
+ <location line="+69"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation>&apos;s Beasl is &lt;b&gt;vaschlisslt&lt;/b&gt; und deazeit grod &lt;b&gt;aufgschpeat&lt;/b&gt;</translation>
</message>
@@ -682,7 +685,7 @@ Wohin: %4
<translation>&apos;s Beasl is &lt;b&gt;vaschlisslt&lt;/b&gt; und deazeit grod &lt;b&gt;zuagschpeat&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+116"/>
+ <location filename="../bitcoin.cpp" line="+438"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation type="unfinished"/>
</message>
@@ -904,7 +907,12 @@ Wohin: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+171"/>
+ <location line="+31"/>
+ <source>none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+140"/>
<source>Dust</source>
<translation type="unfinished"/>
</message>
@@ -941,7 +949,7 @@ Wohin: %4
</message>
<message>
<location line="+1"/>
- <source>This label turns red, if the priority is smaller than &quot;medium&quot;</source>
+ <source>This label turns red, if the priority is smaller than &quot;medium&quot;.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1010,7 +1018,7 @@ Wohin: %4
<translation>&amp;Adress</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+25"/>
+ <location filename="../editaddressdialog.cpp" line="+28"/>
<source>New receiving address</source>
<translation>Neiche Empfaungsadress</translation>
</message>
@@ -1079,20 +1087,24 @@ Wohin: %4
</message>
</context>
<context>
- <name>GUIUtil::HelpMessageBox</name>
+ <name>HelpMessageDialog</name>
<message>
- <location filename="../guiutil.cpp" line="+597"/>
- <source>version</source>
- <translation>veasion</translation>
+ <location filename="../forms/helpmessagedialog.ui" line="+19"/>
+ <source>Bitcoin Core - Command-line options</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <location line="+13"/>
+ <location filename="../utilitydialog.cpp" line="+38"/>
<source>Bitcoin Core</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-11"/>
+ <location line="+0"/>
+ <source>version</source>
+ <translation>veasion</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Usage:</source>
<translation>Vawendung:</translation>
</message>
@@ -1221,7 +1233,7 @@ Wohin: %4
<translation>Eistöllungen</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+13"/>
<source>&amp;Main</source>
<translation>&amp;Masta</translation>
</message>
@@ -1246,7 +1258,52 @@ Wohin: %4
<translation>Bitcoin beim System-Einloggen starten</translation>
</message>
<message>
- <location line="+35"/>
+ <location line="+9"/>
+ <source>Size of &amp;database cache</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set database cache size in megabytes (default: 25)</source>
+ <translation>Zwischnspeichagreß fia de Datenbank in megabeits (sunsta: 25)</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>MB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Number of script &amp;verification threads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Connect to the Bitcoin network through a SOCKS proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Connect through SOCKS proxy (default proxy):</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+224"/>
+ <source>Active command-line options that override above options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
<source>Reset all client options to default.</source>
<translation type="unfinished"/>
</message>
@@ -1256,7 +1313,7 @@ Wohin: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="-323"/>
<source>&amp;Network</source>
<translation>&amp;Netzwerk</translation>
</message>
@@ -1271,32 +1328,17 @@ Wohin: %4
<translation>Port mit UPnP zuweisen</translation>
</message>
<message>
- <location line="+7"/>
- <source>Connect to the Bitcoin network through a SOCKS proxy (e.g. when connecting through Tor).</source>
- <translation>Ins Bitcoin-Netz iwa an Sockn-Proxy vabindn (z.B., wennst TOR vawendst)</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>&amp;Connect through SOCKS proxy:</source>
- <translation>Mit an Sockn-Proxy vabindn:</translation>
- </message>
- <message>
- <location line="+9"/>
+ <location line="+19"/>
<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>IP Adress vom Proxy (z.B. 127.0.0.1)</translation>
- </message>
- <message>
- <location line="+7"/>
+ <location line="+32"/>
<source>&amp;Port:</source>
<translation>&amp;Port:</translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+25"/>
<source>Port of the proxy (e.g. 9050)</source>
<translation>Port vom Proxy (z.B. 9050)</translation>
</message>
@@ -1381,7 +1423,7 @@ Wohin: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+71"/>
+ <location line="+136"/>
<source>&amp;OK</source>
<translation>&amp;Passt!</translation>
</message>
@@ -1391,44 +1433,38 @@ Wohin: %4
<translation>&amp;Na Ned!</translation>
</message>
<message>
- <location line="+10"/>
- <source>&amp;Apply</source>
- <translation>&amp;Jo, genau!</translation>
- </message>
- <message>
- <location filename="../optionsdialog.cpp" line="+63"/>
+ <location filename="../optionsdialog.cpp" line="+67"/>
<source>default</source>
<translation>sunsta</translation>
</message>
<message>
- <location line="+131"/>
- <source>Confirm options reset</source>
+ <location line="+57"/>
+ <source>none</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Some settings may require a client restart to take effect.</source>
+ <location line="+75"/>
+ <source>Confirm options reset</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>Do you want to proceed?</source>
+ <location line="+1"/>
+ <location line="+29"/>
+ <source>Client restart required to activate changes.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
- <location line="+9"/>
- <source>Warning</source>
- <translation>Pass auf</translation>
+ <location line="-29"/>
+ <source>Client will be shutdown, do you want to proceed?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="-9"/>
- <location line="+9"/>
- <source>This setting will take effect after restarting Bitcoin.</source>
- <translation>De Eistöllung wiakt eascht beim nächstn moi.</translation>
+ <location line="+33"/>
+ <source>This change would require a client restart.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+29"/>
+ <location line="+34"/>
<source>The supplied proxy address is invalid.</source>
<translation>De aungebane Proxy-Adress is a Kas.</translation>
</message>
@@ -1442,22 +1478,22 @@ Wohin: %4
</message>
<message>
<location line="+50"/>
- <location line="+214"/>
+ <location line="+231"/>
<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 aunzeigtn Datn san meglichaweis ned aktuö. Dei Beasl gleicht si automatisch mitm Netz au, soboid a Vabindung aufrecht is, owa soweit samma no ned.</translation>
</message>
<message>
- <location line="-140"/>
+ <location line="-155"/>
<source>Unconfirmed:</source>
<translation>Gerüchteweis:</translation>
</message>
<message>
- <location line="-81"/>
+ <location line="-83"/>
<source>Wallet</source>
<translation>Beasl</translation>
</message>
<message>
- <location line="+49"/>
+ <location line="+51"/>
<source>Confirmed:</source>
<translation type="unfinished"/>
</message>
@@ -1492,7 +1528,7 @@ Wohin: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+56"/>
+ <location line="+71"/>
<source>&lt;b&gt;Recent transactions&lt;/b&gt;</source>
<translation>&lt;b&gt;unlängste Iwaweisungen&lt;/b&gt;</translation>
</message>
@@ -1506,7 +1542,8 @@ Wohin: %4
<context>
<name>PaymentServer</name>
<message>
- <location filename="../paymentserver.cpp" line="+397"/>
+ <location filename="../paymentserver.cpp" line="+403"/>
+ <location line="+13"/>
<source>URI handling</source>
<translation>URI Behaundlung</translation>
</message>
@@ -1516,24 +1553,52 @@ Wohin: %4
<translation>De URI is a Kas! Meglichaweis is de Bitcoin Adress foisch, oda hoit sunst wos vamuakst.</translation>
</message>
<message>
- <location line="+91"/>
+ <location line="+96"/>
<source>Requested payment amount of %1 is too small (considered dust).</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-204"/>
- <location line="+195"/>
+ <location line="-221"/>
+ <location line="+212"/>
<location line="+13"/>
+ <location line="+95"/>
+ <location line="+18"/>
+ <location line="+16"/>
<source>Payment request error</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-207"/>
+ <location line="-353"/>
<source>Cannot start bitcoin: click-to-pay handler</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+195"/>
+ <location line="+58"/>
+ <source>Net manager warning</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Your active proxy doesn&apos;t support SOCKS5, which is required for payment requests via proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>Payment request fetch URL is invalid: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Payment request file handling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Payment request file can not be read or processed! This can be caused by an invalid payment request file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+73"/>
<source>Unverified payment requests to custom payment scripts are unsupported.</source>
<translation type="unfinished"/>
</message>
@@ -1543,24 +1608,27 @@ Wohin: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
+ <location line="+43"/>
<source>Error communicating with %1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+28"/>
+ <location line="+24"/>
+ <source>Payment request can not be parsed or processed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
<source>Bad response from server %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+32"/>
+ <location line="+33"/>
<source>Payment acknowledged</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-55"/>
- <location line="+27"/>
- <location line="+17"/>
+ <location line="-11"/>
<source>Network request error</source>
<translation type="unfinished"/>
</message>
@@ -1568,18 +1636,18 @@ Wohin: %4
<context>
<name>QObject</name>
<message>
- <location filename="../bitcoin.cpp" line="+119"/>
- <location line="+5"/>
+ <location filename="../bitcoin.cpp" line="+71"/>
+ <location line="+11"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-4"/>
+ <location line="+1"/>
<source>Error: Specified data directory &quot;%1&quot; does not exist.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="-12"/>
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation type="unfinished"/>
</message>
@@ -1621,15 +1689,16 @@ Wohin: %4
<location line="+23"/>
<location line="+23"/>
<location line="+36"/>
- <location line="+53"/>
+ <location line="+23"/>
+ <location line="+36"/>
<location line="+23"/>
<location line="+23"/>
- <location filename="../rpcconsole.cpp" line="+360"/>
+ <location filename="../rpcconsole.cpp" line="+359"/>
<source>N/A</source>
<translation>Nix</translation>
</message>
<message>
- <location line="-217"/>
+ <location line="-223"/>
<source>Client version</source>
<translation>Klient Veasion</translation>
</message>
@@ -1644,7 +1713,12 @@ Wohin: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+78"/>
+ <location line="+25"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+53"/>
<source>Using OpenSSL version</source>
<translation>Vawend OpenSSL in a Version</translation>
</message>
@@ -1660,16 +1734,16 @@ Wohin: %4
</message>
<message>
<location line="+7"/>
- <source>Number of connections</source>
- <translation>Aunzoi von Vabindungen</translation>
+ <source>Name</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+23"/>
- <source>On testnet</source>
- <translation>Am Test-Netz</translation>
+ <source>Number of connections</source>
+ <translation>Aunzoi von Vabindungen</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+29"/>
<source>Block chain</source>
<translation>Block-Kettn</translation>
</message>
@@ -1694,16 +1768,6 @@ Wohin: %4
<translation>&amp;Lodn</translation>
</message>
<message>
- <location line="+16"/>
- <source>Command-line options</source>
- <translation>Kommandozeilen Optionen</translation>
- </message>
- <message>
- <location line="+10"/>
- <source>&amp;Show</source>
- <translation>&amp;Zeig</translation>
- </message>
- <message>
<location line="+24"/>
<source>&amp;Console</source>
<translation>&amp;Konsole</translation>
@@ -1734,17 +1798,12 @@ Wohin: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-541"/>
+ <location line="-521"/>
<source>Build date</source>
<translation>Programm-Iwasetzunszeitpunkt</translation>
</message>
<message>
- <location line="-79"/>
- <source>Bitcoin Core</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+279"/>
+ <location line="+206"/>
<source>Debug log file</source>
<translation type="unfinished"/>
</message>
@@ -1754,11 +1813,6 @@ Wohin: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+26"/>
- <source>Show the Bitcoin-Core help message to get a list with possible Bitcoin command-line options.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location line="+76"/>
<source>Clear console</source>
<translation>Konsole leermochn</translation>
@@ -1779,7 +1833,7 @@ Wohin: %4
<translation>Gib &lt;b&gt;help&lt;/b&gt; ein fiara Iwasicht iwa olle Kommandos.</translation>
</message>
<message>
- <location line="+128"/>
+ <location line="+122"/>
<source>%1 B</source>
<translation type="unfinished"/>
</message>
@@ -1822,12 +1876,7 @@ Wohin: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+19"/>
- <source>The amount to request</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="-32"/>
+ <location line="-13"/>
<source>&amp;Label:</source>
<translation>&amp;Titl:</translation>
</message>
@@ -1837,12 +1886,7 @@ Wohin: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+20"/>
- <source>The message to attach to payment request</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="-37"/>
+ <location line="-17"/>
<source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
@@ -1853,16 +1897,26 @@ Wohin: %4
</message>
<message>
<location line="+27"/>
- <source>The label to associate with the new receiving address</source>
+ <source>An optional label to associate with the new receiving address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
- <source>Use this form to request payments. All fields are optional.</source>
+ <location line="+7"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+56"/>
+ <location line="+7"/>
+ <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+39"/>
+ <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+17"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"/>
</message>
@@ -1878,11 +1932,11 @@ Wohin: %4
</message>
<message>
<location line="+47"/>
- <source>Previously requested payments</source>
+ <source>Requested payments</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+12"/>
+ <location line="+16"/>
<source>Show the selected request (does the same as double clicking an entry)</source>
<translation type="unfinished"/>
</message>
@@ -1973,7 +2027,7 @@ Wohin: %4
<context>
<name>RecentRequestsTableModel</name>
<message>
- <location filename="../recentrequeststablemodel.cpp" line="+14"/>
+ <location filename="../recentrequeststablemodel.cpp" line="+24"/>
<source>Date</source>
<translation>Waunn</translation>
</message>
@@ -1993,7 +2047,7 @@ Wohin: %4
<translation>Betrog</translation>
</message>
<message>
- <location line="+36"/>
+ <location line="+38"/>
<source>(no label)</source>
<translation>nixda</translation>
</message>
@@ -2008,7 +2062,7 @@ Wohin: %4
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
<location filename="../sendcoinsdialog.cpp" line="+381"/>
- <location line="+81"/>
+ <location line="+80"/>
<source>Send Coins</source>
<translation>Vaschick Zasta</translation>
</message>
@@ -2118,7 +2172,7 @@ Wohin: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-229"/>
+ <location filename="../sendcoinsdialog.cpp" line="-228"/>
<source>Confirm send coins</source>
<translation>Iwaweisung bschtätign</translation>
</message>
@@ -2221,22 +2275,22 @@ Wohin: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+113"/>
+ <location line="+112"/>
<source>Warning: Invalid Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+21"/>
<source>(no label)</source>
<translation>nixda</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="-11"/>
<source>Warning: Unknown change address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-378"/>
+ <location line="-366"/>
<source>Are you sure you want to send?</source>
<translation type="unfinished"/>
</message>
@@ -2260,13 +2314,13 @@ Wohin: %4
<name>SendCoinsEntry</name>
<message>
<location filename="../forms/sendcoinsentry.ui" line="+131"/>
- <location line="+501"/>
+ <location line="+521"/>
<location line="+536"/>
<source>A&amp;mount:</source>
<translation>&amp;Betrog:</translation>
</message>
<message>
- <location line="-1132"/>
+ <location line="-1152"/>
<source>Pay &amp;To:</source>
<translation>wo&amp;hin:</translation>
</message>
@@ -2312,23 +2366,33 @@ Wohin: %4
</message>
<message>
<location line="+7"/>
- <location line="+504"/>
+ <location line="+524"/>
<location line="+536"/>
<source>Remove this entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-40"/>
+ <location line="-1008"/>
+ <source>Message:</source>
+ <translation>Mödung:</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+958"/>
<source>This is a verified payment request.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-971"/>
+ <location line="-991"/>
<source>Enter a label for this address to add it to the list of used addresses</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+439"/>
+ <location line="+459"/>
<source>This is an unverified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2351,6 +2415,19 @@ Wohin: %4
</message>
</context>
<context>
+ <name>ShutdownWindow</name>
+ <message>
+ <location filename="../utilitydialog.cpp" line="+48"/>
+ <source>Bitcoin Core is shutting down...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Do not shut down the computer until this window disappears.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>SignVerifyMessageDialog</name>
<message>
<location filename="../forms/signverifymessagedialog.ui" line="+14"/>
@@ -2358,7 +2435,7 @@ Wohin: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+10"/>
<source>&amp;Sign Message</source>
<translation>Mödung &amp;untaschreim</translation>
</message>
@@ -2546,7 +2623,7 @@ Wohin: %4
<context>
<name>SplashScreen</name>
<message>
- <location filename="../splashscreen.cpp" line="+26"/>
+ <location filename="../splashscreen.cpp" line="+28"/>
<source>Bitcoin Core</source>
<translation type="unfinished"/>
</message>
@@ -2645,12 +2722,12 @@ Wohin: %4
<location line="+12"/>
<location line="+45"/>
<location line="+17"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Credit</source>
<translation>eahoitena Betrog</translation>
</message>
<message numerus="yes">
- <location line="-120"/>
+ <location line="-125"/>
<source>matures in %n more block(s)</source>
<translation><numerusform>eascht noch %n Block vawendboa</numerusform><numerusform>eascht noch %n Bleckn vawendboa</numerusform></translation>
</message>
@@ -2663,12 +2740,12 @@ Wohin: %4
<location line="+44"/>
<location line="+8"/>
<location line="+15"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Debit</source>
<translation>ausgebana Betrog</translation>
</message>
<message>
- <location line="-57"/>
+ <location line="-62"/>
<source>Transaction fee</source>
<translation>Iwaweisungsgebüa</translation>
</message>
@@ -2679,11 +2756,12 @@ Wohin: %4
</message>
<message>
<location line="+6"/>
+ <location line="+9"/>
<source>Message</source>
<translation>Mödung</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="-7"/>
<source>Comment</source>
<translation>Bemeakung</translation>
</message>
@@ -2693,7 +2771,7 @@ Wohin: %4
<translation>Iwaweisungs Nr</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+18"/>
<source>Merchant</source>
<translation type="unfinished"/>
</message>
@@ -2733,7 +2811,7 @@ Wohin: %4
<translation>foisch</translation>
</message>
<message>
- <location line="-227"/>
+ <location line="-232"/>
<source>, has not been successfully broadcast yet</source>
<translation>, is no ned eafoigreich oogschickt wuan.</translation>
</message>
@@ -2783,8 +2861,13 @@ Wohin: %4
<source>Amount</source>
<translation>Betrog</translation>
</message>
+ <message>
+ <location line="+59"/>
+ <source>Immature (%1 confirmations, will be available after %2)</source>
+ <translation type="unfinished"/>
+ </message>
<message numerus="yes">
- <location line="+57"/>
+ <location line="+16"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -2804,17 +2887,13 @@ Wohin: %4
<translation>unbschtätigt (nua %1 vo %2 Bschtätigungen)</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="-22"/>
+ <location line="+25"/>
<source>Confirmed (%1 confirmations)</source>
<translation>bschtätigt (%1 Bschtätigungen)</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></translation>
- </message>
<message>
- <location line="+5"/>
+ <location line="-22"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation>Den Block kaunnst da in d&apos; Hoa schmian!</translation>
</message>
@@ -2824,7 +2903,7 @@ Wohin: %4
<translation>Eazeigt, owa ned aungnumman</translation>
</message>
<message>
- <location line="+43"/>
+ <location line="+62"/>
<source>Received with</source>
<translation>Empfaungen mid</translation>
</message>
@@ -3120,7 +3199,7 @@ Wohin: %4
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+217"/>
+ <location filename="../bitcoinstrings.cpp" line="+221"/>
<source>Usage:</source>
<translation>Vawendung:</translation>
</message>
@@ -3140,7 +3219,7 @@ Wohin: %4
<translation>Eistöllungen:</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+22"/>
<source>Specify configuration file (default: bitcoin.conf)</source>
<translation>Gib de Konfigurationsdatei aun (sunsta: bitcoin.conf)</translation>
</message>
@@ -3160,7 +3239,7 @@ Wohin: %4
<translation>Zwischnspeichagreß fia de Datenbank in megabeits (sunsta: 25)</translation>
</message>
<message>
- <location line="-27"/>
+ <location line="-26"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
<translation>Auf Vabindungen am &lt;port&gt; lauschn (sunsta: 8333 bzw. testnet: 18333)</translation>
</message>
@@ -3170,7 +3249,7 @@ Wohin: %4
<translation>Hechstns &lt;n&gt; Vabindungen zu aundare Netz-Knotn aufrecht eahoitn (sunsta: 125)</translation>
</message>
<message>
- <location line="-50"/>
+ <location line="-51"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation>Vabind di mid an Netz-Knotn, owa frog nua noch aundare Knotn, danoch vapäulisia di wieda</translation>
</message>
@@ -3180,22 +3259,22 @@ Wohin: %4
<translation>Gib dei eigene öffentliche Adress aun</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation>Geduidsfodnstärke gegniwa deppate Netz-Knotn (sunsta: 100)</translation>
</message>
<message>
- <location line="-147"/>
+ <location line="-148"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation>Waunn Geduidsfodn amoi grissn, daunn wia long bis wieda guat (sunsta: 86400)</translation>
</message>
<message>
- <location line="-33"/>
+ <location line="-36"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation type="unfinished"/>
</message>
@@ -3205,7 +3284,7 @@ Wohin: %4
<translation>Hob a Uawaschl offn fia de Kommandozeuln und JSON-RPC Beföhle</translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>Ois Dämon im Hintagrund laafn und auf Beföhle lauschn</translation>
</message>
@@ -3215,12 +3294,12 @@ Wohin: %4
<translation>Des Test-Netz vawenden</translation>
</message>
<message>
- <location line="-117"/>
+ <location line="-118"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation>Nimm Vabindungen vo aussn aun (waunn nix aungebn is, güt 1, aussa waunn -proxy oda -connect optionen aungebm san)</translation>
</message>
<message>
- <location line="-92"/>
+ <location line="-95"/>
<source>%s, you must set a rpcpassword in the configuration file:
%s
It is recommended you use the following random password:
@@ -3261,6 +3340,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+4"/>
+ <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</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>
@@ -3366,6 +3450,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+1"/>
+ <source>Do not load the wallet and disable wallet RPC calls</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Do you want to rebuild the block database now?</source>
<translation type="unfinished"/>
</message>
@@ -3530,7 +3619,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+8"/>
+ <location line="+7"/>
<source>Set maximum block size in bytes (default: %d)</source>
<translation type="unfinished"/>
</message>
@@ -3550,7 +3639,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+12"/>
+ <location line="+3"/>
+ <source>This is intended for regression testing tools and app development.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Usage (deprecated, use bitcoin-cli):</source>
<translation type="unfinished"/>
</message>
@@ -3575,7 +3669,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
+ <location line="+2"/>
+ <source>Wallet options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source>
<translation type="unfinished"/>
</message>
@@ -3585,12 +3684,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-78"/>
+ <location line="-79"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-104"/>
+ <location line="-105"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation>A programmal startn, waunn de Alarmglockn leitn, oda waunn de Block-Kettn oag vazweigt. (a %s wiad dabei duach a Nochricht easetzt)</translation>
</message>
@@ -3610,7 +3709,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+88"/>
+ <location line="+89"/>
<source>Information</source>
<translation type="unfinished"/>
</message>
@@ -3660,11 +3759,6 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Protokoi anstott in de Datei debug.log liawa direkt aussaschreibn</translation>
</message>
<message>
- <location line="+1"/>
- <source>Send trace/debug info to debugger</source>
- <translation>Protokoi zum Debugger schickn</translation>
- </message>
- <message>
<location line="+6"/>
<source>Set minimum block size in bytes (default: 0)</source>
<translation type="unfinished"/>
@@ -3690,7 +3784,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Transaction amount too small</source>
<translation type="unfinished"/>
</message>
@@ -3720,7 +3814,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Benutza fia JSON-RPC Vabindungen</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Warning</source>
<translation>Pass auf</translation>
</message>
@@ -3740,37 +3834,37 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-57"/>
+ <location line="-58"/>
<source>Password for JSON-RPC connections</source>
<translation>Geheimwuat fia JSON-RPC Vabindungen</translation>
</message>
<message>
- <location line="-69"/>
+ <location line="-70"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation>JSON-RPC Beföhle nua vo da aungebanen Netz-Adress ealaubn</translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation>Beföhle zum Netz-Knotn mit da &lt;ip&gt;-Adress schickn (sunsta: 127.0.0.1)</translation>
</message>
<message>
- <location line="-131"/>
+ <location line="-132"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation>A programmal startn, waunn si wos am bestn Block ändat. (a %s wiad dabei duachn Block-Hash easetzt)</translation>
</message>
<message>
- <location line="+160"/>
+ <location line="+161"/>
<source>Upgrade wallet to latest format</source>
<translation>&apos;s Beasl ins neichaste Foamat bringan</translation>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation>Schlisslvorratsgreß auf &lt;n&gt; setzn (sunsta: 100)</translation>
</message>
<message>
- <location line="-12"/>
+ <location line="-11"/>
<source>Rescan the block chain for missing wallet transactions</source>
<translation>De gaunze Block-kettn noch föhlende Iwaweisungen oosuachn</translation>
</message>
@@ -3780,7 +3874,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Vawend OpenSSL (https) fia JSON-RPC Vabindungan</translation>
</message>
<message>
- <location line="-29"/>
+ <location line="-30"/>
<source>Server certificate file (default: server.cert)</source>
<translation>Söawa Zeatifikatsdatei (sunsta: server.cert)</translation>
</message>
@@ -3795,17 +3889,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Dea Hüfe-Text</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Unable to bind to %s on this computer (bind returned error %d, %s)</source>
<translation>Kaun mi ned aun %s auf dera Maschin draunhängan (bind returned error %d, %s)</translation>
</message>
<message>
- <location line="-106"/>
+ <location line="-107"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation>Ealaub DNS nochfrogn fia -addnode, -seednode und -connect</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+60"/>
<source>Loading addresses...</source>
<translation>Adressbiachl lodn...</translation>
</message>
@@ -3845,7 +3939,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>De valongte -socks proxy version is ned bekaunnt: %i</translation>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation>Kaunn de -bind Adressn ned auflösn: &apos;%s&apos;</translation>
</message>
@@ -3855,7 +3949,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Kaunn de -externalip Adressn ned auflösn: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+47"/>
+ <location line="+48"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation>Da Betrog fia -paytxfee=&lt;amount&gt; is a Kas: &apos;%s&apos;</translation>
</message>
@@ -3875,7 +3969,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Block index lodn...</translation>
</message>
<message>
- <location line="-61"/>
+ <location line="-62"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation>An Netz-Knotn aufnehman, und bei da Staungan hoitn</translation>
</message>
@@ -3885,12 +3979,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Konnt mi ned aun %s auf dera Maschin aunhängan. Meglichaweis rennt des Programmal scho.</translation>
</message>
<message>
- <location line="+94"/>
+ <location line="+95"/>
<source>Loading wallet...</source>
<translation>Beasl lodn...</translation>
</message>
<message>
- <location line="-55"/>
+ <location line="-56"/>
<source>Cannot downgrade wallet</source>
<translation>Zrucksteign geht nimma beim Beasl</translation>
</message>
@@ -3900,7 +3994,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>De Easotz Adress kaunn ned gschriem weadn</translation>
</message>
<message>
- <location line="+66"/>
+ <location line="+67"/>
<source>Rescanning...</source>
<translation>Noch-tscheckn...</translation>
</message>
@@ -3920,7 +4014,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Föhla</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-35"/>
<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 b110ada2d8..da09f39f4f 100644
--- a/src/qt/locale/bitcoin_el_GR.ts
+++ b/src/qt/locale/bitcoin_el_GR.ts
@@ -3,13 +3,13 @@
<name>AboutDialog</name>
<message>
<location filename="../forms/aboutdialog.ui" line="+14"/>
- <source>About Bitcoin</source>
- <translation>Σχετικά με το Bitcoin</translation>
+ <source>About Bitcoin Core</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+39"/>
- <source>&lt;b&gt;Bitcoin&lt;/b&gt; version</source>
- <translation>Έκδοση &lt;b&gt;Bitcoin&lt;/b&gt;</translation>
+ <source>&lt;b&gt;Bitcoin Core&lt;/b&gt; version</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+57"/>
@@ -27,14 +27,14 @@ Distributed under the MIT/X11 software license, see the accompanying file COPYIN
This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard.</translation>
</message>
<message>
- <location filename="../aboutdialog.cpp" line="+14"/>
+ <location filename="../utilitydialog.cpp" line="+29"/>
<source>Copyright</source>
<translation>Πνευματική ιδιοκτησία </translation>
</message>
<message>
<location line="+0"/>
- <source>The Bitcoin developers</source>
- <translation>Οι Bitcoin Ï€ÏογÏαμματιστές </translation>
+ <source>The Bitcoin Core developers</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -70,7 +70,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Κ&amp;λείσιμο</translation>
</message>
<message>
- <location filename="../addressbookpage.cpp" line="+72"/>
+ <location filename="../addressbookpage.cpp" line="+74"/>
<source>&amp;Copy Address</source>
<translation>&amp;ΑντιγÏαφή διεÏθυνσης</translation>
</message>
@@ -97,12 +97,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location filename="../addressbookpage.cpp" line="-30"/>
<source>Choose the address to send coins to</source>
- <translation type="unfinished"/>
+ <translation>Επιλογή διεÏθυνσης όπου θα σταλθοÏν νομίσματα</translation>
</message>
<message>
<location line="+1"/>
<source>Choose the address to receive coins with</source>
- <translation type="unfinished"/>
+ <translation>Επιλογή διεÏθυνσης απ&apos; όπου θα ληφθοÏν νομίσματα</translation>
</message>
<message>
<location line="+5"/>
@@ -112,12 +112,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+6"/>
<source>Sending addresses</source>
- <translation type="unfinished"/>
+ <translation>ΔιευθÏνσεις αποστολής</translation>
</message>
<message>
<location line="+1"/>
<source>Receiving addresses</source>
- <translation type="unfinished"/>
+ <translation>ΔιευθÏνσεις λήψης</translation>
</message>
<message>
<location line="+7"/>
@@ -140,9 +140,9 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>&amp;ΕπεξεÏγασία</translation>
</message>
<message>
- <location line="+197"/>
+ <location line="+194"/>
<source>Export Address List</source>
- <translation type="unfinished"/>
+ <translation>Εξαγωγή της λίστας διευθÏνσεων</translation>
</message>
<message>
<location line="+1"/>
@@ -151,19 +151,19 @@ This product includes software developed by the OpenSSL Project for use in the O
</message>
<message>
<location line="+13"/>
- <source>Error exporting</source>
- <translation>Εξαγωγή λαθών</translation>
+ <source>Exporting Failed</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation>Αδυναμία εγγÏαφής στο αÏχείο %1.</translation>
+ <location line="+1"/>
+ <source>There was an error trying to save the address list to %1.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<name>AddressTableModel</name>
<message>
- <location filename="../addresstablemodel.cpp" line="+164"/>
+ <location filename="../addresstablemodel.cpp" line="+168"/>
<source>Label</source>
<translation>Ετικέτα</translation>
</message>
@@ -201,7 +201,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Επανέλαβε τον νέο κωδικό Ï€Ïόσβασης</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="+34"/>
+ <location filename="../askpassphrasedialog.cpp" line="+40"/>
<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; οχτώ ή παÏαπάνω λέξεις&lt;/b&gt;.</translation>
</message>
@@ -276,7 +276,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>Το Bitcoin θα κλεισει Ï„ÏŽÏα για να τελειώσει την διαδικασία κÏυπτογÏαφησης. Θυμησου ότι κÏυπτογÏαφώντας το ποÏτοφολι σου δεν μποÏείς να Ï€Ïοστατέψεις πλήÏως τα bitcoins σου από κλοπή στην πεÏίπτωση όπου μολυνθεί ο υπολογιστής σου με κακόβουλο λογισμικο.</translation>
+ <translation>Το Bitcoin θα κλεισει Ï„ÏŽÏα για να τελειώσει την διαδικασία κÏυπτογÏαφησης. Θυμησου ότι κÏυπτογÏαφώντας το ποÏτοφολι σου δεν μποÏείς να Ï€Ïοστατέψεις πλήÏως τα bitcoins σου από κλοπή στην πεÏίπτωση όπου μολυνθεί ο υπολογιστής σου με κακόβουλο λογισμικό.</translation>
</message>
<message>
<location line="+13"/>
@@ -323,22 +323,27 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+250"/>
+ <location filename="../bitcoingui.cpp" line="+295"/>
<source>Sign &amp;message...</source>
<translation>ΥπογÏαφή &amp;ΜηνÏματος...</translation>
</message>
<message>
- <location line="+254"/>
+ <location line="+335"/>
<source>Synchronizing with network...</source>
<translation>ΣυγχÏονισμός με το δίκτυο...</translation>
</message>
<message>
- <location line="-324"/>
+ <location line="-407"/>
<source>&amp;Overview</source>
<translation>&amp;Επισκόπηση</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="-137"/>
+ <source>Node</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+138"/>
<source>Show general overview of wallet</source>
<translation>Εμφάνισε τη γενική εικόνα του ποÏτοφολιοÏ</translation>
</message>
@@ -353,7 +358,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>ΠεÏιήγηση στο ιστοÏικό συναλλαγών</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>E&amp;xit</source>
<translation>Έ&amp;ξοδος</translation>
</message>
@@ -365,7 +370,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+7"/>
<source>Show information about Bitcoin</source>
- <translation>Εμφάνισε πληÏοφοÏίες σχετικά με το Bitcoin</translation>
+ <translation>Εμφάνιση πληÏοφοÏιών σχετικά με το Bitcoin</translation>
</message>
<message>
<location line="+3"/>
@@ -399,7 +404,22 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>&amp;Άλλαξε κωδικο Ï€Ïόσβασης</translation>
</message>
<message>
- <location line="+259"/>
+ <location line="+10"/>
+ <source>&amp;Sending addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Receiving addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open &amp;URI...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+325"/>
<source>Importing blocks from disk...</source>
<translation>Εισαγωγή μπλοκ από τον σκληÏο δίσκο ... </translation>
</message>
@@ -409,12 +429,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>ΦόÏτωση ευÏετηÏίου μπλοκ στον σκληÏο δισκο...</translation>
</message>
<message>
- <location line="-322"/>
+ <location line="-405"/>
<source>Send coins to a Bitcoin address</source>
<translation>Στείλε νομίσματα σε μια διεÏθυνση bitcoin</translation>
</message>
<message>
- <location line="+47"/>
+ <location line="+49"/>
<source>Modify configuration options for Bitcoin</source>
<translation>ΕπεÏγασία Ïυθμισεων επιλογών για το Bitcoin</translation>
</message>
@@ -444,20 +464,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>&amp;Επιβεβαίωση μηνÏματος</translation>
</message>
<message>
- <location line="-180"/>
- <location line="+6"/>
- <location line="+513"/>
+ <location line="+430"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-519"/>
- <location line="+6"/>
+ <location line="-643"/>
<source>Wallet</source>
<translation>ΠοÏτοφόλι</translation>
</message>
<message>
- <location line="+109"/>
+ <location line="+146"/>
<source>&amp;Send</source>
<translation>&amp;Αποστολή</translation>
</message>
@@ -467,13 +484,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>&amp;ΠαÏαλαβή </translation>
</message>
<message>
- <location line="+28"/>
- <location line="+2"/>
- <source>&amp;About Bitcoin</source>
- <translation>&amp;Σχετικα:Bitcoin</translation>
- </message>
- <message>
- <location line="+14"/>
+ <location line="+46"/>
<location line="+2"/>
<source>&amp;Show / Hide</source>
<translation>&amp;Εμφάνισε/ΚÏÏψε</translation>
@@ -499,64 +510,80 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>ΥπογÏάψτε ένα μήνυμα για ν&apos; αποδείξετε πως ανήκει μια συγκεκÏιμένη διεÏθυνση Bitcoin</translation>
</message>
<message>
- <location line="+35"/>
+ <location line="+48"/>
<source>&amp;File</source>
<translation>&amp;ΑÏχείο</translation>
</message>
<message>
- <location line="+10"/>
+ <location line="+14"/>
<source>&amp;Settings</source>
<translation>&amp;Ρυθμίσεις</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>&amp;Help</source>
<translation>&amp;Βοήθεια</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+15"/>
<source>Tabs toolbar</source>
<translation>ΕÏγαλειοθήκη καÏτελών</translation>
</message>
<message>
- <location line="-235"/>
- <location line="+294"/>
+ <location line="-284"/>
+ <location line="+376"/>
<source>[testnet]</source>
<translation>[testnet]</translation>
</message>
<message>
- <location line="-177"/>
+ <location line="-401"/>
+ <source>Bitcoin Core</source>
+ <translation>Bitcoin Core</translation>
+ </message>
+ <message>
+ <location line="+163"/>
<source>Request payments (generates QR codes and bitcoin: URIs)</source>
- <translation type="unfinished"/>
+ <translation>Αίτηση πληÏωμών (δημιουÏγεί QR codes και διευθÏνσεις bitcoin: )</translation>
</message>
<message>
- <location line="+63"/>
- <source>&amp;Used sending addresses...</source>
+ <location line="+29"/>
+ <location line="+2"/>
+ <source>&amp;About Bitcoin Core</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="+35"/>
<source>Show the list of used sending addresses and labels</source>
+ <translation>ΠÏοβολή της λίστας των χÏησιμοποιημένων διευθÏνσεων και ετικετών αποστολής</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Show the list of used receiving addresses and labels</source>
+ <translation>ΠÏοβολή της λίστας των χÏησιμοποιημένων διευθÏνσεων και ετικετών λήψεως</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open a bitcoin: URI or payment request</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Used &amp;receiving addresses...</source>
+ <location line="+2"/>
+ <source>&amp;Command-line options</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
- <source>Show the list of used receiving addresses and labels</source>
+ <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+106"/>
+ <location line="+159"/>
<location line="+5"/>
<source>Bitcoin client</source>
<translation>Πελάτης Bitcoin</translation>
</message>
<message numerus="yes">
- <location line="+120"/>
+ <location line="+142"/>
<source>%n active connection(s) to Bitcoin network</source>
<translation><numerusform>%n ενεÏγή σÏνδεση στο δίκτυο Bitcoin</numerusform><numerusform>%n ενεÏγές συνδέσεις στο δίκτυο Î’itcoin</numerusform></translation>
</message>
@@ -576,7 +603,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Έγινε λήψη %1 μπλοκ ιστοÏÎ¹ÎºÎ¿Ï ÏƒÏ…Î½Î±Î»Î»Î±Î³ÏŽÎ½</translation>
</message>
<message numerus="yes">
- <location line="+20"/>
+ <location line="+23"/>
<source>%n hour(s)</source>
<translation><numerusform>%n ÏŽÏες </numerusform><numerusform>%n ÏŽÏες </numerusform></translation>
</message>
@@ -596,7 +623,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>%1 πίσω</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="+21"/>
<source>Last received block was generated %1 ago.</source>
<translation>Το τελευταίο μπλοκ που ελήφθη δημιουÏγήθηκε %1 Ï€Ïιν.</translation>
</message>
@@ -621,29 +648,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>ΠληÏοφοÏία</translation>
</message>
<message>
- <location line="+77"/>
- <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="-152"/>
+ <location line="-85"/>
<source>Up to date</source>
<translation>ΕνημεÏωμένο</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Catching up...</source>
<translation>ΕνημέÏωση...</translation>
</message>
<message>
- <location line="+124"/>
- <source>Confirm transaction fee</source>
- <translation>Επιβεβαίωση αμοιβής συναλλαγής</translation>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+130"/>
<source>Sent transaction</source>
<translation>Η συναλλαγή απεστάλη</translation>
</message>
@@ -666,17 +681,7 @@ Address: %4
</translation>
</message>
<message>
- <location line="+34"/>
- <source>URI handling</source>
- <translation>ΧειÏισμός URI</translation>
- </message>
- <message>
- <location line="+0"/>
- <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>
- <message>
- <location line="+45"/>
+ <location line="+69"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation>Το ποÏτοφόλι είναι &lt;b&gt;κÏυπτογÏαφημένο&lt;/b&gt; και &lt;b&gt;ξεκλείδωτο&lt;/b&gt;</translation>
</message>
@@ -686,7 +691,7 @@ Address: %4
<translation>Το ποÏτοφόλι είναι &lt;b&gt;κÏυπτογÏαφημένο&lt;/b&gt; και &lt;b&gt;κλειδωμένο&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+110"/>
+ <location filename="../bitcoin.cpp" line="+438"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation>ΠαÏουσιάστηκε ανεπανόÏθωτο σφάλμα. Το Bitcoin δεν μποÏεί πλέον να συνεχίσει με ασφάλεια και θα τεÏματισθει.</translation>
</message>
@@ -694,12 +699,304 @@ Address: %4
<context>
<name>ClientModel</name>
<message>
- <location filename="../clientmodel.cpp" line="+115"/>
+ <location filename="../clientmodel.cpp" line="+119"/>
<source>Network Alert</source>
<translation>Ειδοποίηση ΔικτÏου</translation>
</message>
</context>
<context>
+ <name>CoinControlDialog</name>
+ <message>
+ <location filename="../forms/coincontroldialog.ui" line="+14"/>
+ <source>Coin Control Address Selection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>Quantity:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Bytes:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>Amount:</source>
+ <translation>Ποσό:</translation>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Priority:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Low Output:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>After Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Change:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+63"/>
+ <source>(un)select all</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Tree mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>List mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>Amount</source>
+ <translation>Ποσό</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Address</source>
+ <translation>ΔιεÏθυνση</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Date</source>
+ <translation>ΗμεÏομηνία</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Confirmations</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Confirmed</source>
+ <translation>ΕπικυÏωμένες</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../coincontroldialog.cpp" line="+42"/>
+ <source>Copy address</source>
+ <translation>ΑντιγÏαφή διεÏθυνσης</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy label</source>
+ <translation>ΑντιγÏαφή επιγÏαφής</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+26"/>
+ <source>Copy amount</source>
+ <translation>ΑντιγÏαφή ποσοÏ</translation>
+ </message>
+ <message>
+ <location line="-25"/>
+ <source>Copy transaction ID</source>
+ <translation>ΑντιγÏαφη του ID Συναλλαγής</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Lock unspent</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Unlock unspent</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+22"/>
+ <source>Copy quantity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Copy fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy after fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy bytes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy low output</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy change</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+323"/>
+ <source>highest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>higher</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>high</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>medium-high</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>medium</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>low-medium</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>low</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>lower</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>lowest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>(%1 locked)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+140"/>
+ <source>Dust</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>yes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>no</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>This label turns red, if the transaction size is greater than 1000 bytes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+5"/>
+ <source>This means a fee of at least %1 per kB is required.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-4"/>
+ <source>Can vary +/- 1 byte per input.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Transactions with higher priority are more likely to get included into a block.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>This label turns red, if the priority is smaller than &quot;medium&quot;.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>This label turns red, if any recipient receives an amount smaller than %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+4"/>
+ <source>This means a fee of at least %1 is required.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-3"/>
+ <source>Amounts below 0.546 times the minimum relay fee are shown as dust.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>This label turns red, if the change is smaller than %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
+ <location line="+66"/>
+ <source>(no label)</source>
+ <translation>(χωÏίς ετικέτα)</translation>
+ </message>
+ <message>
+ <location line="-9"/>
+ <source>change from %1 (%2)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>(change)</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>EditAddressDialog</name>
<message>
<location filename="../forms/editaddressdialog.ui" line="+14"/>
@@ -727,7 +1024,7 @@ Address: %4
<translation>&amp;ΔιεÏθυνση</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+21"/>
+ <location filename="../editaddressdialog.cpp" line="+28"/>
<source>New receiving address</source>
<translation>Îέα διεÏθυνση λήψης</translation>
</message>
@@ -770,9 +1067,9 @@ Address: %4
<context>
<name>FreespaceChecker</name>
<message>
- <location filename="../intro.cpp" line="+61"/>
+ <location filename="../intro.cpp" line="+65"/>
<source>A new data directory will be created.</source>
- <translation type="unfinished"/>
+ <translation>Θα δημιουÏγηθεί ένας νέος φάκελος δεδομένων.</translation>
</message>
<message>
<location line="+22"/>
@@ -792,19 +1089,23 @@ Address: %4
<message>
<location line="+7"/>
<source>Cannot create data directory here.</source>
- <translation type="unfinished"/>
+ <translation>Δεν μποÏεί να δημιουÏγηθεί φάκελος δεδομένων εδώ.</translation>
</message>
</context>
<context>
- <name>GUIUtil::HelpMessageBox</name>
+ <name>HelpMessageDialog</name>
<message>
- <location filename="../guiutil.cpp" line="+558"/>
- <location line="+13"/>
- <source>Bitcoin-Qt</source>
- <translation>bitcoin-qt</translation>
+ <location filename="../forms/helpmessagedialog.ui" line="+19"/>
+ <source>Bitcoin Core - Command-line options</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="-13"/>
+ <location filename="../utilitydialog.cpp" line="+38"/>
+ <source>Bitcoin Core</source>
+ <translation>Bitcoin Core</translation>
+ </message>
+ <message>
+ <location line="+0"/>
<source>version</source>
<translation>έκδοση</translation>
</message>
@@ -853,31 +1154,41 @@ Address: %4
</message>
<message>
<location line="+9"/>
- <source>Welcome to Bitcoin-Qt.</source>
- <translation>Καλώς ήÏθατε στο Bitcoin-Qt.</translation>
+ <source>Welcome to Bitcoin Core.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+26"/>
- <source>As this is the first time the program is launched, you can choose where Bitcoin-Qt will store its data.</source>
+ <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+10"/>
- <source>Bitcoin-Qt will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
+ <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+10"/>
<source>Use the default data directory</source>
- <translation type="unfinished"/>
+ <translation>ΧÏήση του Ï€Ïοεπιλεγμένου φακέλου δεδομένων</translation>
</message>
<message>
<location line="+7"/>
<source>Use a custom data directory:</source>
- <translation type="unfinished"/>
+ <translation>ΠÏοσαÏμογή του φακέλου δεδομένων: </translation>
</message>
<message>
- <location filename="../intro.cpp" line="+105"/>
+ <location filename="../intro.cpp" line="+85"/>
+ <source>Bitcoin</source>
+ <translation>Bitcoin</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error: Specified data directory &quot;%1&quot; can not be created.</source>
+ <translation>Σφάλμα: Ο καθοÏισμένος φάκελος δεδομένων &quot;%1&quot; δεν μποÏεί να δημιουÏγηθεί.</translation>
+ </message>
+ <message>
+ <location line="+19"/>
<source>Error</source>
<translation>Σφάλμα</translation>
</message>
@@ -889,6 +1200,34 @@ Address: %4
<message>
<location line="+3"/>
<source>(of %1GB needed)</source>
+ <translation>(από τα %1GB που χÏειάζονται)</translation>
+ </message>
+</context>
+<context>
+ <name>OpenURIDialog</name>
+ <message>
+ <location filename="../forms/openuridialog.ui" line="+14"/>
+ <source>Open URI</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Open payment request from URI or file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>URI:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Select payment request file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../openuridialog.cpp" line="+47"/>
+ <source>Select payment request file to open</source>
<translation type="unfinished"/>
</message>
</context>
@@ -900,7 +1239,7 @@ Address: %4
<translation>Ρυθμίσεις</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+13"/>
<source>&amp;Main</source>
<translation>&amp;ΚÏÏιο</translation>
</message>
@@ -925,7 +1264,52 @@ Address: %4
<translation>&amp;ΈναÏξη του Βιtcoin κατά την εκκίνηση του συστήματος</translation>
</message>
<message>
- <location line="+35"/>
+ <location line="+9"/>
+ <source>Size of &amp;database cache</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set database cache size in megabytes (default: 25)</source>
+ <translation>ÎŒÏισε το μέγεθος της βάσης Ï€ÏοσωÏινής αποθήκευσης σε megabytes(Ï€Ïοεπιλογή:25)</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>MB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Number of script &amp;verification threads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
+ <translation>ΟÏίσμος του αÏιθμό των νημάτων ελέγχου σεναÏίου (μέχÏι 16, 0 = auto, &lt;0 = αφήνουν τους πολλους πυÏήνες δωÏεάν, default: 0)</translation>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Connect to the Bitcoin network through a SOCKS proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Connect through SOCKS proxy (default proxy):</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+224"/>
+ <source>Active command-line options that override above options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
<source>Reset all client options to default.</source>
<translation>ΕπαναφοÏα όλων των επιλογων του πελάτη σε default.</translation>
</message>
@@ -935,7 +1319,7 @@ Address: %4
<translation>ΕπαναφοÏα Ïυθμίσεων</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="-323"/>
<source>&amp;Network</source>
<translation>&amp;Δίκτυο</translation>
</message>
@@ -950,32 +1334,17 @@ Address: %4
<translation>Απόδοση θυÏών με χÏήστη &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>ΣÏνδεση στο Bitcoin δίκτυο μέσω διαμεσολαβητή SOCKS4 (Ï€.χ. για σÏνδεση μέσω Tor)</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>&amp;Connect through SOCKS proxy:</source>
- <translation>&amp;ΣÏνδεση μέσω διαμεσολαβητή SOCKS</translation>
- </message>
- <message>
- <location line="+9"/>
+ <location line="+19"/>
<source>Proxy &amp;IP:</source>
<translation>&amp;IP διαμεσολαβητή:</translation>
</message>
<message>
- <location line="+19"/>
- <source>IP address of the proxy (e.g. 127.0.0.1)</source>
- <translation>ΔιεÏθυνση IP του διαμεσολαβητή (Ï€.χ. 127.0.0.1)</translation>
- </message>
- <message>
- <location line="+7"/>
+ <location line="+32"/>
<source>&amp;Port:</source>
<translation>&amp;ΘÏÏα:</translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+25"/>
<source>Port of the proxy (e.g. 9050)</source>
<translation>ΘÏÏα διαμεσολαβητή</translation>
</message>
@@ -1050,7 +1419,17 @@ Address: %4
<translation>Εμφάνιση διευθÏνσεων στη λίστα συναλλαγών</translation>
</message>
<message>
- <location line="+71"/>
+ <location line="+7"/>
+ <source>Whether to show coin control features or not.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Display coin &amp;control features (experts only)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+136"/>
<source>&amp;OK</source>
<translation>&amp;ΟΚ</translation>
</message>
@@ -1060,44 +1439,38 @@ Address: %4
<translation>&amp;ΑκÏÏωση</translation>
</message>
<message>
- <location line="+10"/>
- <source>&amp;Apply</source>
- <translation>&amp;ΕφαÏμογή</translation>
- </message>
- <message>
- <location filename="../optionsdialog.cpp" line="+58"/>
+ <location filename="../optionsdialog.cpp" line="+67"/>
<source>default</source>
<translation>Ï€Ïοεπιλογή</translation>
</message>
<message>
- <location line="+130"/>
+ <location line="+57"/>
+ <source>none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+75"/>
<source>Confirm options reset</source>
<translation>Επιβεβαιώση των επιλογων επαναφοÏάς </translation>
</message>
<message>
<location line="+1"/>
- <source>Some settings may require a client restart to take effect.</source>
- <translation>Για οÏισμένες Ïυθμίσεις Ï€Ïεπει η επανεκκίνηση να τεθεί σε ισχÏ.</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Do you want to proceed?</source>
- <translation>Θέλετε να Ï€ÏοχωÏήσετε;</translation>
+ <location line="+29"/>
+ <source>Client restart required to activate changes.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
- <location line="+9"/>
- <source>Warning</source>
- <translation>ΠÏοειδοποίηση</translation>
+ <location line="-29"/>
+ <source>Client will be shutdown, do you want to proceed?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="-9"/>
- <location line="+9"/>
- <source>This setting will take effect after restarting Bitcoin.</source>
- <translation>Αυτή η ÏÏθμιση θα ισχÏσει μετά την επανεκκίνηση του Bitcoin.</translation>
+ <location line="+33"/>
+ <source>This change would require a client restart.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+29"/>
+ <location line="+34"/>
<source>The supplied proxy address is invalid.</source>
<translation>Δεν είναι έγκυÏη η διεÏθυνση διαμεσολαβητή</translation>
</message>
@@ -1111,22 +1484,22 @@ Address: %4
</message>
<message>
<location line="+50"/>
- <location line="+202"/>
+ <location line="+231"/>
<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="-131"/>
+ <location line="-155"/>
<source>Unconfirmed:</source>
<translation>Ανεπιβεβαίωτες</translation>
</message>
<message>
- <location line="-78"/>
+ <location line="-83"/>
<source>Wallet</source>
<translation>ΠοÏτοφόλι</translation>
</message>
<message>
- <location line="+49"/>
+ <location line="+51"/>
<source>Confirmed:</source>
<translation>ΕπικυÏωμένες:</translation>
</message>
@@ -1136,12 +1509,12 @@ Address: %4
<translation>Το Ï„Ïέχον διαθέσιμο υπόλοιπο</translation>
</message>
<message>
- <location line="+29"/>
+ <location line="+32"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation>Το άθÏοισμα των συναλλαγών που δεν έχουν ακόμα επιβεβαιωθεί και δεν Ï€ÏοσμετÏώνται στο Ï„Ïέχον διαθέσιμο υπόλοιπό σας</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+16"/>
<source>Immature:</source>
<translation>ΑνώÏιμος</translation>
</message>
@@ -1151,7 +1524,7 @@ Address: %4
<translation>ΕξοÏυγμενο υπόλοιπο που δεν έχει ακόμα ωÏιμάσει </translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+16"/>
<source>Total:</source>
<translation>ΣÏνολο:</translation>
</message>
@@ -1161,12 +1534,12 @@ Address: %4
<translation>Το Ï„Ïέχον συνολικό υπόλοιπο</translation>
</message>
<message>
- <location line="+53"/>
+ <location line="+71"/>
<source>&lt;b&gt;Recent transactions&lt;/b&gt;</source>
<translation>&lt;b&gt;ΠÏόσφατες συναλλαγές&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../overviewpage.cpp" line="+116"/>
+ <location filename="../overviewpage.cpp" line="+120"/>
<location line="+1"/>
<source>out of sync</source>
<translation>εκτός συγχÏονισμοÏ</translation>
@@ -1175,7 +1548,8 @@ Address: %4
<context>
<name>PaymentServer</name>
<message>
- <location filename="../paymentserver.cpp" line="+392"/>
+ <location filename="../paymentserver.cpp" line="+403"/>
+ <location line="+13"/>
<source>URI handling</source>
<translation>ΧειÏισμός URI</translation>
</message>
@@ -1185,45 +1559,82 @@ Address: %4
<translation>Το URI δεν μποÏεί να αναλυθεί! Αυτό μποÏεί να Ï€Ïοκληθεί από μια μη έγκυÏη διεÏθυνση Bitcoin ή ακατάλληλη παÏαμέτÏο URI.</translation>
</message>
<message>
- <location line="+69"/>
+ <location line="+96"/>
<source>Requested payment amount of %1 is too small (considered dust).</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
- <location line="+37"/>
+ <location line="-221"/>
+ <location line="+212"/>
+ <location line="+13"/>
+ <location line="+95"/>
+ <location line="+18"/>
+ <location line="+16"/>
<source>Payment request error</source>
<translation>Σφάλμα αιτήματος πληÏωμής</translation>
</message>
<message>
+ <location line="-353"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
+ <translation>Δεν είναι δυνατή η εκκίνηση του Bitcoin: click-to-pay handler</translation>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Net manager warning</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+1"/>
- <source>Insecure requests to custom payment scripts unsupported</source>
+ <source>Your active proxy doesn&apos;t support SOCKS5, which is required for payment requests via proxy.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+38"/>
+ <location line="+52"/>
+ <source>Payment request fetch URL is invalid: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Payment request file handling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Payment request file can not be read or processed! This can be caused by an invalid payment request file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+73"/>
+ <source>Unverified payment requests to custom payment scripts are unsupported.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+59"/>
<source>Refund from %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
+ <location line="+43"/>
<source>Error communicating with %1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+24"/>
+ <source>Payment request can not be parsed or processed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
<source>Bad response from server %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+32"/>
+ <location line="+33"/>
<source>Payment acknowledged</source>
<translation>ΠληÏωμή αναγνωÏίστηκε</translation>
</message>
<message>
- <location line="-58"/>
- <location line="+30"/>
- <location line="+17"/>
+ <location line="-11"/>
<source>Network request error</source>
<translation>Σφάλμα αιτήματος δικτÏου</translation>
</message>
@@ -1231,32 +1642,26 @@ Address: %4
<context>
<name>QObject</name>
<message>
- <location filename="../bitcoin.cpp" line="+114"/>
- <location line="+5"/>
- <location filename="../intro.cpp" line="-32"/>
+ <location filename="../bitcoin.cpp" line="+71"/>
+ <location line="+11"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-4"/>
+ <location line="+1"/>
<source>Error: Specified data directory &quot;%1&quot; does not exist.</source>
- <translation type="unfinished"/>
+ <translation>Σφάλμα: Ο καθοÏισμένος φάκελος δεδομένων &quot;%1&quot; δεν υπάÏχει.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="-12"/>
<source>Error: Invalid combination of -regtest and -testnet.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../intro.cpp" line="+1"/>
- <source>Error: Specified data directory &quot;%1&quot; can not be created.</source>
- <translation type="unfinished"/>
+ <translation>Σφάλμα: ΆκυÏος συνδυασμός των -regtest και -testnet</translation>
</message>
</context>
<context>
<name>QRImageWidget</name>
<message>
- <location filename="../receiverequestdialog.cpp" line="+32"/>
+ <location filename="../receiverequestdialog.cpp" line="+36"/>
<source>&amp;Save Image...</source>
<translation type="unfinished"/>
</message>
@@ -1272,8 +1677,8 @@ Address: %4
</message>
<message>
<location line="+0"/>
- <source>PNG Images (*.png)</source>
- <translation>Εικόνες PNG (*.png)</translation>
+ <source>PNG Image (*.png)</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1290,15 +1695,16 @@ Address: %4
<location line="+23"/>
<location line="+23"/>
<location line="+36"/>
- <location line="+53"/>
+ <location line="+23"/>
+ <location line="+36"/>
<location line="+23"/>
<location line="+23"/>
- <location filename="../rpcconsole.cpp" line="+352"/>
+ <location filename="../rpcconsole.cpp" line="+359"/>
<source>N/A</source>
<translation>Μη διαθέσιμο</translation>
</message>
<message>
- <location line="-217"/>
+ <location line="-223"/>
<source>Client version</source>
<translation>Έκδοση Πελάτη</translation>
</message>
@@ -1308,7 +1714,17 @@ Address: %4
<translation>&amp;ΠληÏοφοÏία</translation>
</message>
<message>
- <location line="+68"/>
+ <location line="-10"/>
+ <source>Debug window</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+25"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+53"/>
<source>Using OpenSSL version</source>
<translation>ΧÏησιμοποιηση της OpenSSL εκδοσης</translation>
</message>
@@ -1324,18 +1740,18 @@ Address: %4
</message>
<message>
<location line="+7"/>
- <source>Number of connections</source>
- <translation>ΑÏιθμός συνδέσεων</translation>
+ <source>Name</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+23"/>
- <source>On testnet</source>
- <translation>Στο testnet</translation>
+ <source>Number of connections</source>
+ <translation>ΑÏιθμός συνδέσεων</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+29"/>
<source>Block chain</source>
- <translation>αλυσίδα εμποδισμοÏ</translation>
+ <translation>Αλυσίδα μπλοκ</translation>
</message>
<message>
<location line="+7"/>
@@ -1358,21 +1774,6 @@ Address: %4
<translation>&amp;Άνοιγμα</translation>
</message>
<message>
- <location line="+16"/>
- <source>Command-line options</source>
- <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>Εμφανιση του Bitcoin-Qt μήνυματος βοήθειας για να πάÏετε μια λίστα με τις πιθανές επιλογές Bitcoin γÏαμμής εντολών.</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>&amp;Show</source>
- <translation>&amp;Εμφάνιση</translation>
- </message>
- <message>
<location line="+24"/>
<source>&amp;Console</source>
<translation>&amp;Κονσόλα</translation>
@@ -1390,35 +1791,25 @@ Address: %4
<message>
<location line="+13"/>
<source>Totals</source>
- <translation type="unfinished"/>
+ <translation>ΣÏνολα</translation>
</message>
<message>
<location line="+64"/>
<source>In:</source>
- <translation type="unfinished"/>
+ <translation>ΕισεÏχόμενα:</translation>
</message>
<message>
<location line="+80"/>
<source>Out:</source>
- <translation type="unfinished"/>
+ <translation>ΕξεÏχόμενα:</translation>
</message>
<message>
- <location line="-541"/>
+ <location line="-521"/>
<source>Build date</source>
<translation>ΗμεÏομηνία κατασκευής</translation>
</message>
<message>
- <location line="-104"/>
- <source>Bitcoin - Debug window</source>
- <translation>Bitcoin - ΠαÏάθυÏο αποσφαλμάτωσης</translation>
- </message>
- <message>
- <location line="+25"/>
- <source>Bitcoin Core</source>
- <translation>Bitcoin Core</translation>
- </message>
- <message>
- <location line="+279"/>
+ <location line="+206"/>
<source>Debug log file</source>
<translation>ΑÏχείο καταγÏαφής ÎµÎ½Ï„Î¿Ï€Î¹ÏƒÎ¼Î¿Ï ÏƒÏ†Î±Î»Î¼Î¬Ï„Ï‰Î½ </translation>
</message>
@@ -1428,7 +1819,7 @@ Address: %4
<translation>Ανοίξτε το αÏχείο καταγÏαφής ÎµÎ½Ï„Î¿Ï€Î¹ÏƒÎ¼Î¿Ï ÏƒÏ†Î±Î»Î¼Î¬Ï„Ï‰Î½ από τον Ï„Ïέχοντα κατάλογο δεδομένων. Αυτό μποÏεί να πάÏει μεÏικά δευτεÏόλεπτα για τα μεγάλα αÏχεία καταγÏαφής. </translation>
</message>
<message>
- <location line="+102"/>
+ <location line="+76"/>
<source>Clear console</source>
<translation>ΚαθαÏισμός κονσόλας</translation>
</message>
@@ -1448,103 +1839,128 @@ Address: %4
<translation>ΓÏάψτε &lt;b&gt;help&lt;/b&gt; για μια επισκόπηση των διαθέσιμων εντολών</translation>
</message>
<message>
- <location line="+128"/>
+ <location line="+122"/>
<source>%1 B</source>
- <translation type="unfinished"/>
+ <translation>%1 B</translation>
</message>
<message>
<location line="+2"/>
<source>%1 KB</source>
- <translation type="unfinished"/>
+ <translation>%1 KB</translation>
</message>
<message>
<location line="+2"/>
<source>%1 MB</source>
- <translation type="unfinished"/>
+ <translation>%1 MB</translation>
</message>
<message>
<location line="+2"/>
<source>%1 GB</source>
- <translation type="unfinished"/>
+ <translation>%1 GB</translation>
</message>
<message>
<location line="+7"/>
<source>%1 m</source>
- <translation type="unfinished"/>
+ <translation>%1 λ</translation>
</message>
<message>
<location line="+5"/>
<source>%1 h</source>
- <translation type="unfinished"/>
+ <translation>%1 ÏŽ</translation>
</message>
<message>
<location line="+2"/>
<source>%1 h %2 m</source>
- <translation type="unfinished"/>
+ <translation>%1 ώ %2 λ</translation>
</message>
</context>
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+22"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
<source>&amp;Amount:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
- <source>The amount to request</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+7"/>
+ <location line="-13"/>
<source>&amp;Label:</source>
<translation>&amp;ΕπιγÏαφή</translation>
</message>
<message>
- <location line="+10"/>
- <source>The label to associate with the receiving address</source>
+ <location line="-34"/>
+ <source>&amp;Message:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>&amp;Message:</source>
+ <location line="-17"/>
+ <source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>The message to attach to payment request</source>
+ <location line="+3"/>
+ <source>R&amp;euse an existing receiving address (not recommended)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
- <source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
+ <location line="+27"/>
+ <source>An optional label to associate with the new receiving address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>R&amp;euse an existing receiving address (not recommended)</source>
+ <location line="+7"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+7"/>
- <source>Use this form to request payments. All fields are optional.</source>
+ <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+39"/>
+ <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+17"/>
<source>Clear all fields of the form.</source>
- <translation type="unfinished"/>
+ <translation>ΚαθαÏισμός όλων των πεδίων της φόÏμας.</translation>
</message>
<message>
<location line="+3"/>
<source>Clear</source>
- <translation type="unfinished"/>
+ <translation>ΚαθαÏισμός</translation>
</message>
<message>
<location line="+36"/>
<source>&amp;Request payment</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+47"/>
+ <source>Requested payments</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Show the selected request (does the same as double clicking an entry)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Show</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Remove the selected entries from the list</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Remove</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
@@ -1565,23 +1981,18 @@ Address: %4
</message>
<message>
<location line="+7"/>
- <source>&amp;Copy Image</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+7"/>
<source>&amp;Save Image...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../receiverequestdialog.cpp" line="+58"/>
+ <location filename="../receiverequestdialog.cpp" line="+56"/>
<source>Request payment to %1</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+6"/>
<source>Payment information</source>
- <translation type="unfinished"/>
+ <translation>ΠληÏοφοÏίες πληÏωμής</translation>
</message>
<message>
<location line="+1"/>
@@ -1620,16 +2031,119 @@ Address: %4
</message>
</context>
<context>
+ <name>RecentRequestsTableModel</name>
+ <message>
+ <location filename="../recentrequeststablemodel.cpp" line="+24"/>
+ <source>Date</source>
+ <translation>ΗμεÏομηνία</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Label</source>
+ <translation>Ετικέτα</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Message</source>
+ <translation>Μήνυμα</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Amount</source>
+ <translation>Ποσό</translation>
+ </message>
+ <message>
+ <location line="+38"/>
+ <source>(no label)</source>
+ <translation>(χωÏίς ετικέτα)</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>(no message)</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+140"/>
- <location line="+213"/>
+ <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location line="+80"/>
<source>Send Coins</source>
<translation>Αποστολή νομισμάτων</translation>
</message>
<message>
- <location line="+50"/>
+ <location line="+76"/>
+ <source>Coin Control Features</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Inputs...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>automatically selected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Insufficient funds!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+89"/>
+ <source>Quantity:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+35"/>
+ <source>Bytes:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Amount:</source>
+ <translation>Ποσό:</translation>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Priority:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Low Output:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>After Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Change:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+44"/>
+ <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Custom change address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+115"/>
<source>Send to multiple recipients at once</source>
<translation>Αποστολή σε πολλοÏÏ‚ αποδέκτες ταυτόχÏονα</translation>
</message>
@@ -1641,7 +2155,7 @@ Address: %4
<message>
<location line="+20"/>
<source>Clear all fields of the form.</source>
- <translation type="unfinished"/>
+ <translation>ΚαθαÏισμός όλων των πεδίων της φόÏμας.</translation>
</message>
<message>
<location line="+3"/>
@@ -1654,12 +2168,7 @@ Address: %4
<translation>Υπόλοιπο:</translation>
</message>
<message>
- <location line="+10"/>
- <source>123.456 BTC</source>
- <translation>123,456 BTC</translation>
- </message>
- <message>
- <location line="+31"/>
+ <location line="+41"/>
<source>Confirm the send action</source>
<translation>Επιβεβαίωση αποστολής</translation>
</message>
@@ -1669,49 +2178,125 @@ Address: %4
<translation>Αποστολη</translation>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-154"/>
+ <location filename="../sendcoinsdialog.cpp" line="-228"/>
<source>Confirm send coins</source>
<translation>Επιβεβαίωση αποστολής νομισμάτων</translation>
</message>
<message>
- <location line="-90"/>
+ <location line="-74"/>
<location line="+5"/>
<location line="+5"/>
+ <location line="+4"/>
<source>%1 to %2</source>
+ <translation>%1 σε %2</translation>
+ </message>
+ <message>
+ <location line="-136"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation>Εισάγετε μια διεÏθυνση Bitcoin (Ï€.χ. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Copy quantity</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+26"/>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation>ΑντιγÏαφή ποσοÏ</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy after fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy bytes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy low output</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy change</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+170"/>
+ <source>Total Amount %1 (= %2)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>or</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+202"/>
<source>The recipient address is not valid, please recheck.</source>
<translation>Η διεÏθυνση του αποδέκτη δεν είναι σωστή. ΠαÏακαλώ ελέγξτε ξανά.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The amount to pay must be larger than 0.</source>
<translation>Το ποσό πληÏωμής Ï€Ïέπει να είναι μεγαλÏτεÏο από 0.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The amount exceeds your balance.</source>
<translation>Το ποσό ξεπεÏνάει το διαθέσιμο υπόλοιπο</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The total exceeds your balance when the %1 transaction fee is included.</source>
<translation>Το σÏνολο υπεÏβαίνει το υπόλοιπό σας όταν συμπεÏιληφθεί και η αμοιβή %1</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+3"/>
<source>Duplicate address found, can only send to each address once per send operation.</source>
<translation>Î’Ïέθηκε η ίδια διεÏθυνση δÏο φοÏές. ΕπιτÏέπεται μία μόνο εγγÏαφή για κάθε διεÏθυνση, σε κάθε διαδικασία αποστολής.</translation>
</message>
<message>
+ <location line="+3"/>
+ <source>Transaction creation failed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+4"/>
- <source>Error: Transaction creation failed!</source>
- <translation>Σφάλμα: Η δημιουÏγία της συναλλαγής απέτυχε</translation>
+ <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+15"/>
+ <location line="+112"/>
+ <source>Warning: Invalid Bitcoin address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+21"/>
+ <source>(no label)</source>
+ <translation>(χωÏίς ετικέτα)</translation>
+ </message>
+ <message>
+ <location line="-11"/>
+ <source>Warning: Unknown change address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-366"/>
<source>Are you sure you want to send?</source>
<translation>Είστε βέβαιοι για την αποστολή;</translation>
</message>
@@ -1721,17 +2306,7 @@ Address: %4
<translation>Ï€Ïοστέθηκαν ως αμοιβή συναλλαγής</translation>
</message>
<message>
- <location line="+6"/>
- <source>Total Amount %1</source>
- <translation>Συνολικό Ποσό %1</translation>
- </message>
- <message>
- <location line="+20"/>
- <source>Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
- <translation>Σφάλμα: Η συναλλαγή απεÏÏίφθη. Αυτό ενδέχεται να συμβαίνει αν κάποια από τα νομίσματα έχουν ήδη ξοδευθεί, όπως αν χÏησιμοποιήσατε αντίγÏαφο του wallet.dat και τα νομίσματα ξοδεÏθηκαν εκεί.</translation>
- </message>
- <message>
- <location line="+144"/>
+ <location line="+170"/>
<source>Payment request expired</source>
<translation>Έληξε η αίτηση πληÏωμής</translation>
</message>
@@ -1744,39 +2319,44 @@ Address: %4
<context>
<name>SendCoinsEntry</name>
<message>
- <location filename="../forms/sendcoinsentry.ui" line="+33"/>
- <location line="+585"/>
+ <location filename="../forms/sendcoinsentry.ui" line="+131"/>
+ <location line="+521"/>
+ <location line="+536"/>
<source>A&amp;mount:</source>
<translation>&amp;Ποσό:</translation>
</message>
<message>
- <location line="-572"/>
- <location line="+585"/>
+ <location line="-1152"/>
<source>Pay &amp;To:</source>
<translation>ΠληÏωμή &amp;σε:</translation>
</message>
<message>
- <location line="-551"/>
+ <location line="+18"/>
<source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>ΔιεÏθυνση αποστολής της πληÏωμής (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location filename="../sendcoinsentry.cpp" line="+28"/>
+ <location filename="../sendcoinsentry.cpp" line="+30"/>
<source>Enter a label for this address to add it to your address book</source>
<translation>Εισάγετε μια επιγÏαφή για αυτή τη διεÏθυνση ώστε να καταχωÏηθεί στο βιβλίο διευθÏνσεων</translation>
</message>
<message>
- <location filename="../forms/sendcoinsentry.ui" line="-18"/>
+ <location filename="../forms/sendcoinsentry.ui" line="+57"/>
<source>&amp;Label:</source>
<translation>&amp;ΕπιγÏαφή</translation>
</message>
<message>
- <location line="+28"/>
+ <location line="-50"/>
<source>Choose previously used address</source>
+ <translation>Επιλογή διεÏθυνσης που έχει ήδη χÏησιμοποιηθεί</translation>
+ </message>
+ <message>
+ <location line="-40"/>
+ <source>This is a normal payment.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
+ <location line="+50"/>
<source>Alt+A</source>
<translation>Alt+A</translation>
</message>
@@ -1792,16 +2372,45 @@ Address: %4
</message>
<message>
<location line="+7"/>
- <source>Remove this recipient</source>
- <translation>ΑφαίÏεση αποδέκτη</translation>
+ <location line="+524"/>
+ <location line="+536"/>
+ <source>Remove this entry</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="-1008"/>
+ <source>Message:</source>
+ <translation>Μήνυμα:</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+958"/>
+ <source>This is a verified payment request.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-991"/>
<source>Enter a label for this address to add it to the list of used addresses</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+465"/>
+ <location line="+459"/>
+ <source>This is an unverified payment request.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+18"/>
+ <location line="+532"/>
+ <source>Pay To:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-498"/>
+ <location line="+536"/>
<source>Memo:</source>
<translation type="unfinished"/>
</message>
@@ -1812,6 +2421,19 @@ Address: %4
</message>
</context>
<context>
+ <name>ShutdownWindow</name>
+ <message>
+ <location filename="../utilitydialog.cpp" line="+48"/>
+ <source>Bitcoin Core is shutting down...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Do not shut down the computer until this window disappears.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>SignVerifyMessageDialog</name>
<message>
<location filename="../forms/signverifymessagedialog.ui" line="+14"/>
@@ -1819,7 +2441,7 @@ Address: %4
<translation>ΥπογÏαφές - Είσοδος / Επαλήθευση μήνυματος </translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+10"/>
<source>&amp;Sign Message</source>
<translation>&amp;ΥπογÏαφή ΜηνÏματος</translation>
</message>
@@ -1837,7 +2459,7 @@ Address: %4
<location line="+10"/>
<location line="+213"/>
<source>Choose previously used address</source>
- <translation type="unfinished"/>
+ <translation>Επιλογή διεÏθυνσης που έχει ήδη χÏησιμοποιηθεί</translation>
</message>
<message>
<location line="-203"/>
@@ -1922,7 +2544,7 @@ Address: %4
<translation>ΕπαναφοÏά όλων επαλήθευμενων πεδίων μήνυματος </translation>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+27"/>
+ <location filename="../signverifymessagedialog.cpp" line="+29"/>
<location line="+3"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>Εισάγετε μια διεÏθυνση Bitcoin (Ï€.χ. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
@@ -1938,7 +2560,7 @@ Address: %4
<translation>Εισαγωγή υπογÏαφής Bitcoin</translation>
</message>
<message>
- <location line="+85"/>
+ <location line="+84"/>
<location line="+81"/>
<source>The entered address is invalid.</source>
<translation>Η διεÏθυνση που εισήχθη είναι λάθος.</translation>
@@ -2007,9 +2629,14 @@ Address: %4
<context>
<name>SplashScreen</name>
<message>
- <location filename="../splashscreen.cpp" line="+23"/>
- <source>The Bitcoin developers</source>
- <translation>Οι Bitcoin Ï€ÏογÏαμματιστές </translation>
+ <location filename="../splashscreen.cpp" line="+28"/>
+ <source>Bitcoin Core</source>
+ <translation>Bitcoin Core</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>The Bitcoin Core developers</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
@@ -2020,15 +2647,15 @@ Address: %4
<context>
<name>TrafficGraphWidget</name>
<message>
- <location filename="../trafficgraphwidget.cpp" line="+75"/>
+ <location filename="../trafficgraphwidget.cpp" line="+79"/>
<source>KB/s</source>
- <translation type="unfinished"/>
+ <translation>KB/s</translation>
</message>
</context>
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="+22"/>
+ <location filename="../transactiondesc.cpp" line="+28"/>
<source>Open until %1</source>
<translation>Ανοιχτό μέχÏι %1</translation>
</message>
@@ -2101,12 +2728,12 @@ Address: %4
<location line="+12"/>
<location line="+45"/>
<location line="+17"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Credit</source>
<translation>Πίστωση </translation>
</message>
<message numerus="yes">
- <location line="-120"/>
+ <location line="-125"/>
<source>matures in %n more block(s)</source>
<translation><numerusform>ωÏίμανση σε %n επιπλέον μπλοκ</numerusform><numerusform>ωÏίμανση σε %n επιπλέον μπλοκ</numerusform></translation>
</message>
@@ -2119,12 +2746,12 @@ Address: %4
<location line="+44"/>
<location line="+8"/>
<location line="+15"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Debit</source>
<translation>Debit</translation>
</message>
<message>
- <location line="-57"/>
+ <location line="-62"/>
<source>Transaction fee</source>
<translation>Τέλος συναλλαγής </translation>
</message>
@@ -2135,11 +2762,12 @@ Address: %4
</message>
<message>
<location line="+6"/>
+ <location line="+9"/>
<source>Message</source>
<translation>Μήνυμα</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="-7"/>
<source>Comment</source>
<translation>Σχόλιο:</translation>
</message>
@@ -2149,9 +2777,9 @@ Address: %4
<translation>ID Συναλλαγής:</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+18"/>
<source>Merchant</source>
- <translation type="unfinished"/>
+ <translation>ΈμποÏος</translation>
</message>
<message>
<location line="+7"/>
@@ -2189,7 +2817,7 @@ Address: %4
<translation>αναληθής </translation>
</message>
<message>
- <location line="-227"/>
+ <location line="-232"/>
<source>, has not been successfully broadcast yet</source>
<translation>, δεν έχει ακόμα μεταδοθεί μ&apos; επιτυχία</translation>
</message>
@@ -2220,7 +2848,7 @@ Address: %4
<context>
<name>TransactionTableModel</name>
<message>
- <location filename="../transactiontablemodel.cpp" line="+227"/>
+ <location filename="../transactiontablemodel.cpp" line="+234"/>
<source>Date</source>
<translation>ΗμεÏομηνία</translation>
</message>
@@ -2239,8 +2867,13 @@ Address: %4
<source>Amount</source>
<translation>Ποσό</translation>
</message>
+ <message>
+ <location line="+59"/>
+ <source>Immature (%1 confirmations, will be available after %2)</source>
+ <translation type="unfinished"/>
+ </message>
<message numerus="yes">
- <location line="+57"/>
+ <location line="+16"/>
<source>Open for %n more block(s)</source>
<translation><numerusform>Ανοιχτό για %n μπλοκ</numerusform><numerusform>Ανοιχτό για %n μπλοκ</numerusform></translation>
</message>
@@ -2260,17 +2893,13 @@ Address: %4
<translation>ΧωÏίς επιβεβαίωση (%1 από %2 επικυÏώσεις)</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="-22"/>
+ <location line="+25"/>
<source>Confirmed (%1 confirmations)</source>
<translation>ΕπικυÏωμένη (%1 επικυÏώσεις)</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>Το υπόλοιπο από την εξόÏυξη θα είναι διαθέσιμο μετά από %n μπλοκ</numerusform><numerusform>Το υπόλοιπο από την εξόÏυξη θα είναι διαθέσιμο μετά από %n μπλοκ</numerusform></translation>
- </message>
<message>
- <location line="+5"/>
+ <location line="-22"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation>Αυτό το μπλοκ δεν έχει παÏαληφθεί από κανέναν άλλο κόμβο και κατά πάσα πιθανότητα θα αποÏÏιφθεί!</translation>
</message>
@@ -2280,7 +2909,7 @@ Address: %4
<translation>ΔημιουÏγήθηκε αλλά αποÏÏίφθηκε</translation>
</message>
<message>
- <location line="+43"/>
+ <location line="+62"/>
<source>Received with</source>
<translation>ΠαÏαλαβή με</translation>
</message>
@@ -2338,7 +2967,7 @@ Address: %4
<context>
<name>TransactionView</name>
<message>
- <location filename="../transactionview.cpp" line="+52"/>
+ <location filename="../transactionview.cpp" line="+57"/>
<location line="+16"/>
<source>All</source>
<translation>Όλα</translation>
@@ -2399,12 +3028,12 @@ Address: %4
<translation>Άλλο</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+6"/>
<source>Enter address or label to search</source>
<translation>Αναζήτηση με βάση τη διεÏθυνση ή την επιγÏαφή</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+6"/>
<source>Min amount</source>
<translation>Ελάχιστο ποσό</translation>
</message>
@@ -2439,17 +3068,37 @@ Address: %4
<translation>Εμφάνιση λεπτομεÏειών συναλλαγής</translation>
</message>
<message>
- <location line="+143"/>
- <source>Export Transaction Data</source>
- <translation>Εξαγωγή Στοιχείων Συναλλαγών</translation>
+ <location line="+142"/>
+ <source>Export Transaction History</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="+19"/>
+ <source>Exporting Failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>There was an error trying to save the transaction history to %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Exporting Successful</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The transaction history was successfully saved to %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-22"/>
<source>Comma separated file (*.csv)</source>
<translation>ΑÏχείο οÏιοθετημένο με κόμματα (*.csv)</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+9"/>
<source>Confirmed</source>
<translation>ΕπικυÏωμένες</translation>
</message>
@@ -2484,17 +3133,7 @@ Address: %4
<translation>ID</translation>
</message>
<message>
- <location line="+4"/>
- <source>Error exporting</source>
- <translation>Σφάλμα εξαγωγής</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation>Αδυναμία εγγÏαφής στο αÏχείο %1.</translation>
- </message>
- <message>
- <location line="+100"/>
+ <location line="+107"/>
<source>Range:</source>
<translation>Έκταση:</translation>
</message>
@@ -2505,9 +3144,17 @@ Address: %4
</message>
</context>
<context>
+ <name>WalletFrame</name>
+ <message>
+ <location filename="../walletframe.cpp" line="+26"/>
+ <source>No wallet has been loaded.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>WalletModel</name>
<message>
- <location filename="../walletmodel.cpp" line="+218"/>
+ <location filename="../walletmodel.cpp" line="+245"/>
<source>Send Coins</source>
<translation>Αποστολή νομισμάτων</translation>
</message>
@@ -2515,7 +3162,7 @@ Address: %4
<context>
<name>WalletView</name>
<message>
- <location filename="../walletview.cpp" line="+46"/>
+ <location filename="../walletview.cpp" line="+43"/>
<source>&amp;Export</source>
<translation>&amp;Εξαγωγή</translation>
</message>
@@ -2525,65 +3172,60 @@ Address: %4
<translation>Εξαγωγή δεδομένων καÏτέλας σε αÏχείο</translation>
</message>
<message>
- <location line="+183"/>
+ <location line="+181"/>
<source>Backup Wallet</source>
<translation>ΑντίγÏαφο ασφαλείας του ποÏτοφολιοÏ</translation>
</message>
<message>
- <location line="+0"/>
+ <location line="+1"/>
<source>Wallet Data (*.dat)</source>
<translation>ΑÏχεία δεδομένων ποÏÏ„Î¿Ï†Î¿Î»Î¹Î¿Ï (*.dat)</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="+6"/>
<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>
+ <source>There was an error trying to save the wallet data to %1.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+4"/>
- <source>Backup Successful</source>
- <translation>Η δημιουÏγια αντιγÏαφου ασφαλειας πετυχε</translation>
+ <source>The wallet data was successfully saved to %1.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+0"/>
- <source>The wallet data was successfully saved to the new location.</source>
- <translation>Τα δεδομένα ποÏτοφόλιου αποθηκεÏτηκαν με επιτυχία στη νέα θέση. </translation>
+ <source>Backup Successful</source>
+ <translation>Η δημιουÏγια αντιγÏαφου ασφαλειας πετυχε</translation>
</message>
</context>
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+102"/>
- <source>Bitcoin version</source>
- <translation>Έκδοση Bitcoin</translation>
- </message>
- <message>
- <location line="+107"/>
+ <location filename="../bitcoinstrings.cpp" line="+221"/>
<source>Usage:</source>
<translation>ΧÏήση:</translation>
</message>
<message>
- <location line="-55"/>
+ <location line="-54"/>
<source>List commands</source>
<translation>Λίστα εντολών</translation>
</message>
<message>
- <location line="-13"/>
+ <location line="-14"/>
<source>Get help for a command</source>
<translation>Επεξήγηση εντολής</translation>
</message>
<message>
- <location line="+25"/>
+ <location line="+26"/>
<source>Options:</source>
<translation>Επιλογές:</translation>
</message>
<message>
- <location line="+24"/>
+ <location line="+22"/>
<source>Specify configuration file (default: bitcoin.conf)</source>
<translation>ΟÏίστε αÏχείο Ïυθμίσεων (Ï€Ïοεπιλογή: bitcoin.conf)</translation>
</message>
@@ -2603,7 +3245,7 @@ Address: %4
<translation>ÎŒÏισε το μέγεθος της βάσης Ï€ÏοσωÏινής αποθήκευσης σε megabytes(Ï€Ïοεπιλογή:25)</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-26"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
<translation>ΕισεÏχόμενες συνδέσεις στη θÏÏα &lt;port&gt; (Ï€Ïοεπιλογή: 8333 ή στο testnet: 18333)</translation>
</message>
@@ -2613,7 +3255,7 @@ Address: %4
<translation>Μέγιστες αÏιθμός συνδέσεων με τους peers &lt;n&gt; (Ï€Ïοεπιλογή: 125)</translation>
</message>
<message>
- <location line="-49"/>
+ <location line="-51"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation>ΣÏνδεση σε έναν κόμβο για την ανάκτηση διευθÏνσεων από ομοτίμους, και αποσυνδέσh</translation>
</message>
@@ -2623,37 +3265,37 @@ Address: %4
<translation>ΔιευκÏινίστε τη δικιά σας δημόσια διεÏθυνση.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation>ÎŒÏιο αποσÏνδεσης Ï€Ïοβληματικών peers (Ï€Ïοεπιλογή: 100)</translation>
</message>
<message>
- <location line="-142"/>
+ <location line="-148"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation>ΔευτεÏόλεπτα Ï€Ïιν επιτÏαπεί ξανά η σÏνδεση των Ï€Ïοβληματικών peers (Ï€Ïοεπιλογή: 86400)</translation>
</message>
<message>
- <location line="-33"/>
+ <location line="-36"/>
<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="+31"/>
+ <location line="+34"/>
<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="+40"/>
+ <location line="+45"/>
<source>Accept command line and JSON-RPC commands</source>
<translation>Αποδοχή εντολών κονσόλας και JSON-RPC</translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>Εκτέλεση στο παÏασκήνιο κι αποδοχή εντολών</translation>
</message>
<message>
- <location line="+40"/>
+ <location line="+39"/>
<source>Use the test network</source>
<translation>ΧÏήση του Î´Î¿ÎºÎ¹Î¼Î±ÏƒÏ„Î¹ÎºÎ¿Ï Î´Î¹ÎºÏ„Ïου</translation>
</message>
@@ -2663,7 +3305,7 @@ Address: %4
<translation>Îα δέχεσαι συνδέσεις από έξω(Ï€Ïοεπιλογή:1)</translation>
</message>
<message>
- <location line="-87"/>
+ <location line="-95"/>
<source>%s, you must set a rpcpassword in the configuration file:
%s
It is recommended you use the following random password:
@@ -2714,6 +3356,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+4"/>
+ <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
<source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
<translation>Σφάλμα: Η συναλλαγή αποÏÏίφθηκε.
Αυτό ίσως οφείλεται στο ότι τα νομίσματά σας έχουν ήδη ξοδευτεί, Ï€.χ. με την αντιγÏαφή του wallet.dat σε άλλο σÏστημα και την χÏήση τους εκεί, χωÏίς η συναλλαγή να έχει καταγÏαφεί στο παÏόν σÏστημα.</translation>
@@ -2729,17 +3376,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Εκτέλεσε την εντολή όταν το καλÏτεÏο μπλοκ αλλάξει(%s στην εντολή αντικαθίσταται από το hash του μπλοκ)</translation>
</message>
<message>
- <location line="+11"/>
- <source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source>
- <translation>ΟÏίστε το μέγιστο μέγεθος των high-priority/low-fee συναλλαγων σε bytes (Ï€Ïοεπιλογή: 27000)</translation>
- </message>
- <message>
- <location line="+6"/>
+ <location line="+18"/>
<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>
<message>
<location line="+5"/>
+ <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
<source>Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source>
<translation>ΠÏοειδοποίηση: Η παÏάμετÏος -paytxfee είναι Ï€Î¿Î»Ï Ï…ÏˆÎ·Î»Î®. ΠÏόκειται για την αμοιβή που θα πληÏώνετε για κάθε συναλλαγή που θα στέλνετε.</translation>
</message>
@@ -2769,17 +3416,27 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>ΠÏοειδοποίηση : το αÏχειο wallet.dat ειναι διεφθαÏμένο, τα δεδομένα σώζονται ! Original wallet.dat αποθηκεÏονται ως wallet.{timestamp}.bak στο %s . Αν το υπόλοιπο του ή τις συναλλαγές σας, είναι λάθος θα Ï€Ïέπει να επαναφέÏετε από ένα αντίγÏαφο ασφαλείας</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="+9"/>
+ <source>&lt;category&gt; can be:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
<source>Attempt to recover private keys from a corrupt wallet.dat</source>
<translation>ΠÏοσπάθεια για ανακτησει ιδιωτικων κλειδιων από ενα διεφθαÏμένο αÏχειο wallet.dat </translation>
</message>
<message>
<location line="+1"/>
+ <source>Bitcoin Core Daemon</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Bitcoin RPC client version</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
<source>Block creation options:</source>
<translation>Αποκλεισμός επιλογων δημιουÏγίας: </translation>
</message>
@@ -2789,7 +3446,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>ΣÏνδεση μόνο με οÏισμένους κόμβους</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
+ <source>Connect through SOCKS proxy</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect to JSON-RPC on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation type="unfinished"/>
</message>
@@ -2805,6 +3467,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+1"/>
+ <source>Do not load the wallet and disable wallet RPC calls</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Do you want to rebuild the block database now?</source>
<translation>Θελετε να δημιουÏγηθει τωÏα η βαση δεδομενων του μπλοκ? </translation>
</message>
@@ -2899,7 +3566,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Αποτυχία εγγÏαφής αναίÏεσης δεδομένων </translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
+ <source>Fee per kB to add to transactions you send</source>
+ <translation>ΠÏοσθήκη αμοιβής ανά kB στις συναλλαγές που στέλνετε</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Find peers using DNS lookup (default: 1 unless -connect)</source>
<translation>Î’Ïες ομότιμους υπολογιστές χÏησιμοποιώντας αναζήτηση DNS(Ï€Ïοεπιλογή:1)</translation>
</message>
@@ -2919,6 +3591,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Πόσο εξονυχιστική να είναι η επιβεβαίωση του μπλοκ(0-4, Ï€Ïοεπιλογή:3)</translation>
</message>
<message>
+ <location line="+1"/>
+ <source>If &lt;category&gt; is not supplied, output all debugging information.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+2"/>
<source>Incorrect or no genesis block found. Wrong datadir for network?</source>
<translation type="unfinished"/>
@@ -2926,7 +3603,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<message>
<location line="+3"/>
<source>Invalid -onion address: &apos;%s&apos;</source>
- <translation type="unfinished"/>
+ <translation>ΆκυÏη διεÏθυνση -onion : &apos;%s&apos;</translation>
</message>
<message>
<location line="+15"/>
@@ -2934,17 +3611,37 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Δεν ειναι αÏκετες πεÏιγÏαφες αÏχείων διαθέσιμες.</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+5"/>
+ <source>Prepend debug output with timestamp (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>RPC client options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Rebuild block chain index from current blk000??.dat files</source>
<translation>Εισαγωγή μπλοκ από εξωτεÏικό αÏχείο blk000?.dat</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+5"/>
+ <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Send command to Bitcoin server</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
+ <location line="+7"/>
+ <source>Set maximum block size in bytes (default: %d)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Set the number of threads to service RPC calls (default: 4)</source>
<translation>ΟÏίσμος του αÏιθμόυ θεματων στην υπηÏεσία κλήσεων RPC (Ï€Ïοεπιλογή: 4) </translation>
</message>
@@ -2959,12 +3656,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+12"/>
+ <location line="+3"/>
+ <source>This is intended for regression testing tools and app development.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Usage (deprecated, use bitcoin-cli):</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+8"/>
+ <location line="+7"/>
<source>Verifying blocks...</source>
<translation>Επαλήθευση των μπλοκ... </translation>
</message>
@@ -2975,31 +3677,56 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+1"/>
+ <source>Wait for RPC server to start</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Wallet %s resides outside data directory %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+2"/>
+ <source>Wallet options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>You need to rebuild the database using -reindex to change -txindex</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-78"/>
+ <location line="-79"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation>Εισαγωγή μπλοκ από εξωτεÏικό αÏχείο blk000?.dat</translation>
</message>
<message>
- <location line="-98"/>
+ <location line="-105"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+17"/>
+ <location line="+14"/>
+ <source>Output debugging information (default: 0, supplying &lt;category&gt; is optional)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
<translation>ΟÏίσμος του αÏιθμό των νημάτων ελέγχου σεναÏίου (μέχÏι 16, 0 = auto, &lt;0 = αφήνουν τους πολλους πυÏήνες δωÏεάν, default: 0)</translation>
</message>
<message>
- <location line="+83"/>
+ <location line="+89"/>
<source>Information</source>
<translation>ΠληÏοφοÏία</translation>
</message>
@@ -3039,49 +3766,19 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation> Συνδέση μόνο σε κόμβους του δικτÏου &lt;net&gt; (IPv4, IPv6 ή Tor) </translation>
</message>
<message>
- <location line="+2"/>
- <source>Output extra debugging information. Implies all other -debug* options</source>
- <translation>Έξοδος επιπλέον πληÏοφοÏιών ÎµÎ½Ï„Î¿Ï€Î¹ÏƒÎ¼Î¿Ï ÏƒÏ†Î±Î»Î¼Î¬Ï„Ï‰Î½</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Output extra network debugging information</source>
- <translation>Έξοδος επιπλέον πληÏοφοÏιών ÎµÎ½Ï„Î¿Ï€Î¹ÏƒÎ¼Î¿Ï ÏƒÏ†Î±Î»Î¼Î¬Ï„Ï‰Î½</translation>
- </message>
- <message>
- <location line="+2"/>
- <source>Prepend debug output with timestamp</source>
- <translation>ΧÏονοσφÏαγίδα πληÏοφοÏιών ÎµÎ½Ï„Î¿Ï€Î¹ÏƒÎ¼Î¿Ï ÏƒÏ†Î±Î»Î¼Î¬Ï„Ï‰Î½</translation>
- </message>
- <message>
- <location line="+5"/>
+ <location line="+9"/>
<source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
<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>Επιλέξτε την έκδοση του διαμεσολαβητη για να χÏησιμοποιήσετε (4-5 , Ï€Ïοεπιλογή: 5)</translation>
- </message>
- <message>
- <location line="+3"/>
+ <location line="+4"/>
<source>Send trace/debug info to console instead of debug.log file</source>
<translation>Αποστολή πληÏοφοÏιών ÎµÎ½Ï„Î¿Ï€Î¹ÏƒÎ¼Î¿Ï ÏƒÏ†Î±Î»Î¼Î¬Ï„Ï‰Î½ στην κονσόλα αντί του αÏχείου debug.log</translation>
</message>
<message>
- <location line="+1"/>
- <source>Send trace/debug info to debugger</source>
- <translation>Αποστολή πληÏοφοÏιών ÎµÎ½Ï„Î¿Ï€Î¹ÏƒÎ¼Î¿Ï ÏƒÏ†Î±Î»Î¼Î¬Ï„Ï‰Î½ στον debugger</translation>
- </message>
- <message>
- <location line="+5"/>
- <source>Set maximum block size in bytes (default: 250000)</source>
- <translation>ΟÏίσμος του μέγιστου μέγεθος block σε bytes (Ï€Ïοεπιλογή: 250000)</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+6"/>
<source>Set minimum block size in bytes (default: 0)</source>
- <translation>ΟÏίστε το μέγιστο μέγεθος block σε bytes (Ï€Ïοεπιλογή: 0)</translation>
+ <translation>ΟÏίστε το μέγιστο μέγεθος μπλοκ σε bytes (Ï€Ïοεπιλογή: 0)</translation>
</message>
<message>
<location line="+2"/>
@@ -3104,7 +3801,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Λάθος Συστήματος:</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Transaction amount too small</source>
<translation>Το ποσό της συναλλαγής είναι Ï€Î¿Î»Ï Î¼Î¹ÎºÏο </translation>
</message>
@@ -3129,32 +3826,32 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>ΧÏησιμοποίηση του UPnP για την χÏήση της πόÏτας αναμονής (Ï€Ïοεπιλογή:1)</translation>
</message>
<message>
- <location line="+1"/>
- <source>Use proxy to reach tor hidden services (default: same as -proxy)</source>
- <translation>ΧÏήση διακομιστή μεσολάβησης για την επίτευξη των Tor κÏυμμένων υπηÏεσιων (Ï€Ïοεπιλογή: ίδιο με το-proxy) </translation>
- </message>
- <message>
<location line="+2"/>
<source>Username for JSON-RPC connections</source>
<translation>Όνομα χÏήστη για τις συνδέσεις JSON-RPC</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+7"/>
<source>Warning</source>
<translation>ΠÏοειδοποίηση</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Warning: This version is obsolete, upgrade required!</source>
<translation>ΠÏοειδοποίηση: Αυτή η έκδοση είναι ξεπεÏασμένη, απαιτείται αναβάθμιση </translation>
</message>
<message>
<location line="+2"/>
+ <source>version</source>
+ <translation>έκδοση</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>wallet.dat corrupt, salvage failed</source>
<translation>Το αÏχειο wallet.dat ειναι διεφθαÏμένο, η διάσωση απέτυχε</translation>
</message>
<message>
- <location line="-54"/>
+ <location line="-58"/>
<source>Password for JSON-RPC connections</source>
<translation>Κωδικός για τις συνδέσεις JSON-RPC</translation>
</message>
@@ -3164,27 +3861,27 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Αποδοχή συνδέσεων JSON-RPC από συγκεκÏιμένη διεÏθυνση IP</translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<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="-126"/>
+ <location line="-132"/>
<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="+155"/>
+ <location line="+161"/>
<source>Upgrade wallet to latest format</source>
<translation>Αναβάθμισε το ποÏτοφόλι στην τελευταία έκδοση</translation>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation>ÎŒÏιο πλήθους κλειδιών pool &lt;n&gt; (Ï€Ïοεπιλογή: 100)</translation>
</message>
<message>
- <location line="-12"/>
+ <location line="-11"/>
<source>Rescan the block chain for missing wallet transactions</source>
<translation>Επανέλεγχος της αλυσίδας μπλοκ για αποÏσες συναλλαγές</translation>
</message>
@@ -3194,7 +3891,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>ΧÏήση του OpenSSL (https) για συνδέσεις JSON-RPC</translation>
</message>
<message>
- <location line="-29"/>
+ <location line="-30"/>
<source>Server certificate file (default: server.cert)</source>
<translation>ΑÏχείο Ï€Î¹ÏƒÏ„Î¿Ï€Î¿Î¹Î·Ï„Î¹ÎºÎ¿Ï Ï„Î¿Ï… διακομιστή (Ï€Ïοεπιλογή: server.cert)</translation>
</message>
@@ -3209,27 +3906,22 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Αυτό το κείμενο βοήθειας</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Unable to bind to %s on this computer (bind returned error %d, %s)</source>
<translation>ΑδÏνατη η σÏνδεση με τη θÏÏα %s Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… υπολογιστή (bind returned error %d, %s) </translation>
</message>
<message>
- <location line="-95"/>
- <source>Connect through socks proxy</source>
- <translation>ΣÏνδεση μέσω διαμεσολαβητή socks</translation>
- </message>
- <message>
- <location line="-11"/>
+ <location line="-107"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation>Îα επιτÏέπονται οι έλεγχοι DNS για Ï€Ïοσθήκη και σÏνδεση κόμβων</translation>
</message>
<message>
- <location line="+58"/>
+ <location line="+60"/>
<source>Loading addresses...</source>
<translation>ΦόÏτωση διευθÏνσεων...</translation>
</message>
<message>
- <location line="-36"/>
+ <location line="-37"/>
<source>Error loading wallet.dat: Wallet corrupted</source>
<translation>Σφάλμα φόÏτωσης wallet.dat: ΚατεστÏαμμένο ΠοÏτοφόλι</translation>
</message>
@@ -3249,12 +3941,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Σφάλμα φόÏτωσης αÏχείου wallet.dat</translation>
</message>
<message>
- <location line="+30"/>
+ <location line="+31"/>
<source>Invalid -proxy address: &apos;%s&apos;</source>
<translation>Δεν είναι έγκυÏη η διεÏθυνση διαμεσολαβητή: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+57"/>
+ <location line="+56"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation>Άγνωστo δίκτυο οÏίζεται σε onlynet: &apos;%s&apos;</translation>
</message>
@@ -3264,7 +3956,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Άγνωστo δίκτυο οÏίζεται: %i</translation>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation>Δεν μποÏÏŽ να γÏάψω την Ï€Ïοεπιλεγμένη διεÏθυνση: &apos;%s&apos;</translation>
</message>
@@ -3274,7 +3966,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Δεν μποÏÏŽ να γÏάψω την Ï€Ïοεπιλεγμένη διεÏθυνση: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+46"/>
+ <location line="+48"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation>Μη έγκυÏο ποσό για την παÏάμετÏο -paytxfee=&lt;amount&gt;: &apos;%s&apos;</translation>
</message>
@@ -3294,27 +3986,22 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>ΦόÏτωση ευÏετηÏίου μπλοκ...</translation>
</message>
<message>
- <location line="-60"/>
+ <location line="-62"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation>ΠÏοσέθεσε ένα κόμβο για σÏνδεση και Ï€Ïοσπάθησε να κÏατήσεις την σÏνδεση ανοιχτή</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-32"/>
<source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source>
<translation>ΑδÏνατη η σÏνδεση με τη θÏÏα %s Î±Ï…Ï„Î¿Ï Ï„Î¿Ï… υπολογιστή. Το Bitcoin είναι πιθανώς ήδη ενεÏγό.</translation>
</message>
<message>
- <location line="+69"/>
- <source>Fee per KB to add to transactions you send</source>
- <translation>Αμοιβή ανά KB που θα Ï€Ïοστίθεται στις συναλλαγές που στέλνεις</translation>
- </message>
- <message>
- <location line="+20"/>
+ <location line="+95"/>
<source>Loading wallet...</source>
<translation>ΦόÏτωση ποÏτοφολιοÏ...</translation>
</message>
<message>
- <location line="-54"/>
+ <location line="-56"/>
<source>Cannot downgrade wallet</source>
<translation>Δεν μποÏÏŽ να υποβαθμίσω το ποÏτοφόλι</translation>
</message>
@@ -3324,7 +4011,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Δεν μποÏÏŽ να γÏάψω την Ï€Ïοεπιλεγμένη διεÏθυνση</translation>
</message>
<message>
- <location line="+66"/>
+ <location line="+67"/>
<source>Rescanning...</source>
<translation>Ανίχνευση...</translation>
</message>
@@ -3344,7 +4031,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Σφάλμα</translation>
</message>
<message>
- <location line="-33"/>
+ <location line="-35"/>
<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 f52544687b..cfbd866381 100644
--- a/src/qt/locale/bitcoin_en.ts
+++ b/src/qt/locale/bitcoin_en.ts
@@ -29,14 +29,14 @@ Distributed under the MIT/X11 software license, see the accompanying file COPYIN
This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard.</translation>
</message>
<message>
- <location filename="../aboutdialog.cpp" line="+19"/>
+ <location filename="../utilitydialog.cpp" line="+29"/>
<source>Copyright</source>
<translation>Copyright</translation>
</message>
<message>
<location line="+0"/>
- <source>The Bitcoin developers</source>
- <translation>The Bitcoin developers</translation>
+ <source>The Bitcoin Core developers</source>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -153,13 +153,13 @@ This product includes software developed by the OpenSSL Project for use in the O
</message>
<message>
<location line="+13"/>
- <source>Error exporting</source>
- <translation>Error exporting</translation>
+ <source>Exporting Failed</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation>Could not write to file %1.</translation>
+ <location line="+1"/>
+ <source>There was an error trying to save the address list to %1.</source>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -322,43 +322,29 @@ This product includes software developed by the OpenSSL Project for use in the O
</message>
</context>
<context>
- <name>BitcoinApplication</name>
- <message>
- <location filename="../bitcoin.cpp" line="+362"/>
- <source>Bitcoin Core is shutting down...
-</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Do not shut down the computer until this window disappears.</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
-<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+297"/>
+ <location filename="../bitcoingui.cpp" line="+295"/>
<source>Sign &amp;message...</source>
<translation>Sign &amp;message...</translation>
</message>
<message>
- <location line="+323"/>
+ <location line="+335"/>
<source>Synchronizing with network...</source>
<translation>Synchronizing with network...</translation>
</message>
<message>
- <location line="-395"/>
+ <location line="-407"/>
<source>&amp;Overview</source>
<translation>&amp;Overview</translation>
</message>
<message>
- <location line="-139"/>
+ <location line="-137"/>
<source>Node</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+140"/>
+ <location line="+138"/>
<source>Show general overview of wallet</source>
<translation>Show general overview of wallet</translation>
</message>
@@ -434,7 +420,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+313"/>
+ <location line="+325"/>
<source>Importing blocks from disk...</source>
<translation>Importing blocks from disk...</translation>
</message>
@@ -444,7 +430,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Reindexing blocks on disk...</translation>
</message>
<message>
- <location line="-393"/>
+ <location line="-405"/>
<source>Send coins to a Bitcoin address</source>
<translation>Send coins to a Bitcoin address</translation>
</message>
@@ -479,17 +465,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>&amp;Verify message...</translation>
</message>
<message>
- <location line="+414"/>
+ <location line="+430"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-629"/>
+ <location line="-643"/>
<source>Wallet</source>
<translation>Wallet</translation>
</message>
<message>
- <location line="+148"/>
+ <location line="+146"/>
<source>&amp;Send</source>
<translation>&amp;Send</translation>
</message>
@@ -525,7 +511,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Verify messages to ensure they were signed with specified Bitcoin addresses</translation>
</message>
<message>
- <location line="+44"/>
+ <location line="+48"/>
<source>&amp;File</source>
<translation>&amp;File</translation>
</message>
@@ -540,23 +526,23 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>&amp;Help</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="+15"/>
<source>Tabs toolbar</source>
<translation>Tabs toolbar</translation>
</message>
<message>
- <location line="-281"/>
- <location line="+373"/>
+ <location line="-284"/>
+ <location line="+376"/>
<source>[testnet]</source>
<translation>[testnet]</translation>
</message>
<message>
- <location line="-398"/>
+ <location line="-401"/>
<source>Bitcoin Core</source>
<translation type="unfinished">Bitcoin Core</translation>
</message>
<message>
- <location line="+165"/>
+ <location line="+163"/>
<source>Request payments (generates QR codes and bitcoin: URIs)</source>
<translation type="unfinished"></translation>
</message>
@@ -582,13 +568,23 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+157"/>
+ <location line="+2"/>
+ <source>&amp;Command-line options</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+159"/>
<location line="+5"/>
<source>Bitcoin client</source>
<translation>Bitcoin client</translation>
</message>
<message numerus="yes">
- <location line="+135"/>
+ <location line="+142"/>
<source>%n active connection(s) to Bitcoin network</source>
<translation>
<numerusform>%n active connection to Bitcoin network</numerusform>
@@ -640,7 +636,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>%1 behind</translation>
</message>
<message>
- <location line="+17"/>
+ <location line="+21"/>
<source>Last received block was generated %1 ago.</source>
<translation>Last received block was generated %1 ago.</translation>
</message>
@@ -665,7 +661,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Information</translation>
</message>
<message>
- <location line="-81"/>
+ <location line="-85"/>
<source>Up to date</source>
<translation>Up to date</translation>
</message>
@@ -675,7 +671,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Catching up...</translation>
</message>
<message>
- <location line="+126"/>
+ <location line="+130"/>
<source>Sent transaction</source>
<translation>Sent transaction</translation>
</message>
@@ -708,7 +704,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 filename="../bitcoin.cpp" line="+78"/>
+ <location filename="../bitcoin.cpp" line="+438"/>
<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>
@@ -1110,52 +1106,56 @@ Address: %4
</message>
</context>
<context>
- <name>GUIUtil::HelpMessageBox</name>
+ <name>HelpMessageDialog</name>
<message>
- <location filename="../guiutil.cpp" line="+597"/>
- <source>version</source>
- <translation>version</translation>
+ <location filename="../forms/helpmessagedialog.ui" line="+19"/>
+ <source>Bitcoin Core - Command-line options</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location line="+0"/>
- <location line="+13"/>
+ <location filename="../utilitydialog.cpp" line="+38"/>
<source>Bitcoin Core</source>
<translation type="unfinished">Bitcoin Core</translation>
</message>
<message>
- <location line="-11"/>
+ <location line="+0"/>
+ <source>version</source>
+ <translation type="unfinished">version</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Usage:</source>
- <translation>Usage:</translation>
+ <translation type="unfinished">Usage:</translation>
</message>
<message>
<location line="+1"/>
<source>command-line options</source>
- <translation>command-line options</translation>
+ <translation type="unfinished">command-line options</translation>
</message>
<message>
<location line="+4"/>
<source>UI options</source>
- <translation>UI options</translation>
+ <translation type="unfinished">UI options</translation>
</message>
<message>
<location line="+1"/>
<source>Set language, for example &quot;de_DE&quot; (default: system locale)</source>
- <translation>Set language, for example &quot;de_DE&quot; (default: system locale)</translation>
+ <translation type="unfinished">Set language, for example &quot;de_DE&quot; (default: system locale)</translation>
</message>
<message>
<location line="+1"/>
<source>Start minimized</source>
- <translation>Start minimized</translation>
+ <translation type="unfinished">Start minimized</translation>
</message>
<message>
<location line="+1"/>
<source>Show splash screen on startup (default: 1)</source>
- <translation>Show splash screen on startup (default: 1)</translation>
+ <translation type="unfinished">Show splash screen on startup (default: 1)</translation>
</message>
<message>
<location line="+1"/>
<source>Choose data directory on startup (default: 0)</source>
- <translation>Choose data directory on startup (default: 0)</translation>
+ <translation type="unfinished">Choose data directory on startup (default: 0)</translation>
</message>
</context>
<context>
@@ -1317,7 +1317,12 @@ Address: %4
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+267"/>
+ <location line="+224"/>
+ <source>Active command-line options that override above options:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+43"/>
<source>Reset all client options to default.</source>
<translation>Reset all client options to default.</translation>
</message>
@@ -1437,12 +1442,7 @@ Address: %4
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+29"/>
- <source>Active command-line options that override above options: </source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+107"/>
+ <location line="+136"/>
<source>&amp;OK</source>
<translation>&amp;OK</translation>
</message>
@@ -1452,7 +1452,7 @@ Address: %4
<translation>&amp;Cancel</translation>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+68"/>
+ <location filename="../optionsdialog.cpp" line="+67"/>
<source>default</source>
<translation>default</translation>
</message>
@@ -1561,7 +1561,7 @@ Address: %4
<context>
<name>PaymentServer</name>
<message>
- <location filename="../paymentserver.cpp" line="+400"/>
+ <location filename="../paymentserver.cpp" line="+403"/>
<location line="+13"/>
<source>URI handling</source>
<translation type="unfinished">URI handling</translation>
@@ -1577,8 +1577,8 @@ Address: %4
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-216"/>
- <location line="+207"/>
+ <location line="-221"/>
+ <location line="+212"/>
<location line="+13"/>
<location line="+95"/>
<location line="+18"/>
@@ -1587,12 +1587,22 @@ Address: %4
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-348"/>
+ <location line="-353"/>
<source>Cannot start bitcoin: click-to-pay handler</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+106"/>
+ <location line="+58"/>
+ <source>Net manager warning</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Your active proxy doesn&apos;t support SOCKS5, which is required for payment requests via proxy.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+52"/>
<source>Payment request fetch URL is invalid: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -1660,6 +1670,11 @@ Address: %4
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../guiutil.cpp" line="+82"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation type="unfinished">Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ </message>
</context>
<context>
<name>QRImageWidget</name>
@@ -1702,7 +1717,7 @@ Address: %4
<location line="+36"/>
<location line="+23"/>
<location line="+23"/>
- <location filename="../rpcconsole.cpp" line="+360"/>
+ <location filename="../rpcconsole.cpp" line="+359"/>
<source>N/A</source>
<translation>N/A</translation>
</message>
@@ -1777,16 +1792,6 @@ Address: %4
<translation>&amp;Open</translation>
</message>
<message>
- <location line="+16"/>
- <source>Command-line options</source>
- <translation>Command-line options</translation>
- </message>
- <message>
- <location line="+10"/>
- <source>&amp;Show</source>
- <translation>&amp;Show</translation>
- </message>
- <message>
<location line="+24"/>
<source>&amp;Console</source>
<translation>&amp;Console</translation>
@@ -1817,7 +1822,7 @@ Address: %4
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-547"/>
+ <location line="-521"/>
<source>Build date</source>
<translation>Build date</translation>
</message>
@@ -1832,11 +1837,6 @@ Address: %4
<translation>Open the Bitcoin debug log file from the current data directory. This can take a few seconds for large log files.</translation>
</message>
<message>
- <location line="+26"/>
- <source>Show the Bitcoin-Core help message to get a list with possible Bitcoin command-line options.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
<location line="+76"/>
<source>Clear console</source>
<translation>Clear console</translation>
@@ -1857,7 +1857,7 @@ Address: %4
<translation>Type &lt;b&gt;help&lt;/b&gt; for an overview of available commands.</translation>
</message>
<message>
- <location line="+128"/>
+ <location line="+122"/>
<source>%1 B</source>
<translation type="unfinished"></translation>
</message>
@@ -1895,32 +1895,22 @@ Address: %4
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+107"/>
<source>&amp;Amount:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+19"/>
- <source>The amount to request</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="-32"/>
+ <location line="-16"/>
<source>&amp;Label:</source>
<translation type="unfinished">&amp;Label:</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-37"/>
<source>&amp;Message:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+20"/>
- <source>The message to attach to payment request</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="-37"/>
+ <location line="-20"/>
<source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"></translation>
</message>
@@ -1930,17 +1920,30 @@ Address: %4
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+27"/>
- <source>The label to associate with the new receiving address</source>
+ <location line="+14"/>
+ <location line="+23"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+14"/>
- <source>Use this form to request payments. All fields are optional.</source>
+ <location line="-7"/>
+ <location line="+21"/>
+ <source>An optional label to associate with the new receiving address.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+56"/>
+ <location line="-7"/>
+ <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+23"/>
+ <location line="+22"/>
+ <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+32"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"></translation>
</message>
@@ -1950,17 +1953,17 @@ Address: %4
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+36"/>
- <source>&amp;Request payment</source>
+ <location line="+78"/>
+ <source>Requested payments history</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+47"/>
- <source>Requested payments</source>
+ <location line="-98"/>
+ <source>&amp;Request payment</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+12"/>
+ <location line="+120"/>
<source>Show the selected request (does the same as double clicking an entry)</source>
<translation type="unfinished"></translation>
</message>
@@ -1979,6 +1982,21 @@ Address: %4
<source>Remove</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../receivecoinsdialog.cpp" line="+38"/>
+ <source>Copy label</source>
+ <translation type="unfinished">Copy label</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy message</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation type="unfinished">Copy amount</translation>
+ </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
@@ -2051,7 +2069,7 @@ Address: %4
<context>
<name>RecentRequestsTableModel</name>
<message>
- <location filename="../recentrequeststablemodel.cpp" line="+17"/>
+ <location filename="../recentrequeststablemodel.cpp" line="+24"/>
<source>Date</source>
<translation type="unfinished">Date</translation>
</message>
@@ -2080,12 +2098,17 @@ Address: %4
<source>(no message)</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location line="+8"/>
+ <source>(no amount)</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location filename="../sendcoinsdialog.cpp" line="+380"/>
<location line="+80"/>
<source>Send Coins</source>
<translation>Send Coins</translation>
@@ -2161,7 +2184,7 @@ Address: %4
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+115"/>
+ <location line="+164"/>
<source>Send to multiple recipients at once</source>
<translation>Send to multiple recipients at once</translation>
</message>
@@ -2171,7 +2194,7 @@ Address: %4
<translation>Add &amp;Recipient</translation>
</message>
<message>
- <location line="+20"/>
+ <location line="-23"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"></translation>
</message>
@@ -2181,12 +2204,12 @@ Address: %4
<translation>Clear &amp;All</translation>
</message>
<message>
- <location line="+22"/>
+ <location line="+52"/>
<source>Balance:</source>
<translation>Balance:</translation>
</message>
<message>
- <location line="+41"/>
+ <location line="-78"/>
<source>Confirm the send action</source>
<translation>Confirm the send action</translation>
</message>
@@ -2196,7 +2219,7 @@ Address: %4
<translation>S&amp;end</translation>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-228"/>
+ <location filename="../sendcoinsdialog.cpp" line="-229"/>
<source>Confirm send coins</source>
<translation>Confirm send coins</translation>
</message>
@@ -2209,12 +2232,7 @@ Address: %4
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-136"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation type="unfinished">Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
- </message>
- <message>
- <location line="+15"/>
+ <location line="-121"/>
<source>Copy quantity</source>
<translation type="unfinished"></translation>
</message>
@@ -2264,7 +2282,7 @@ Address: %4
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+202"/>
+ <location line="+203"/>
<source>The recipient address is not valid, please recheck.</source>
<translation>The recipient address is not valid, please recheck.</translation>
</message>
@@ -2299,12 +2317,12 @@ Address: %4
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+112"/>
+ <location line="+113"/>
<source>Warning: Invalid Bitcoin address</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+21"/>
+ <location line="+20"/>
<source>(no label)</source>
<translation type="unfinished">(no label)</translation>
</message>
@@ -2314,7 +2332,7 @@ Address: %4
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-366"/>
+ <location line="-367"/>
<source>Are you sure you want to send?</source>
<translation type="unfinished"></translation>
</message>
@@ -2324,7 +2342,7 @@ Address: %4
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+170"/>
+ <location line="+171"/>
<source>Payment request expired</source>
<translation type="unfinished"></translation>
</message>
@@ -2338,13 +2356,13 @@ Address: %4
<name>SendCoinsEntry</name>
<message>
<location filename="../forms/sendcoinsentry.ui" line="+131"/>
- <location line="+501"/>
+ <location line="+521"/>
<location line="+536"/>
<source>A&amp;mount:</source>
<translation>A&amp;mount:</translation>
</message>
<message>
- <location line="-1132"/>
+ <location line="-1152"/>
<source>Pay &amp;To:</source>
<translation>Pay &amp;To:</translation>
</message>
@@ -2390,23 +2408,33 @@ Address: %4
</message>
<message>
<location line="+7"/>
- <location line="+504"/>
+ <location line="+524"/>
<location line="+536"/>
<source>Remove this entry</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-40"/>
+ <location line="-1008"/>
+ <source>Message:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+968"/>
<source>This is a verified payment request.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-971"/>
+ <location line="-991"/>
<source>Enter a label for this address to add it to the list of used addresses</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+439"/>
+ <location line="+33"/>
+ <source>A message that was attached to the bitcoin: URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+426"/>
<source>This is an unverified payment request.</source>
<translation type="unfinished"></translation>
</message>
@@ -2422,10 +2450,18 @@ Address: %4
<source>Memo:</source>
<translation type="unfinished"></translation>
</message>
+</context>
+<context>
+ <name>ShutdownWindow</name>
<message>
- <location filename="../sendcoinsentry.cpp" line="+1"/>
- <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ <location filename="../utilitydialog.cpp" line="+48"/>
+ <source>Bitcoin Core is shutting down...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Do not shut down the computer until this window disappears.</source>
+ <translation type="unfinished"></translation>
</message>
</context>
<context>
@@ -2436,7 +2472,7 @@ Address: %4
<translation>Signatures - Sign / Verify a Message</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+10"/>
<source>&amp;Sign Message</source>
<translation>&amp;Sign Message</translation>
</message>
@@ -2451,19 +2487,19 @@ Address: %4
<translation>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="+10"/>
- <location line="+213"/>
+ <location line="+7"/>
+ <location line="+210"/>
<source>Choose previously used address</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-203"/>
- <location line="+213"/>
+ <location line="-200"/>
+ <location line="+210"/>
<source>Alt+A</source>
<translation>Alt+A</translation>
</message>
<message>
- <location line="-203"/>
+ <location line="-200"/>
<source>Paste address from clipboard</source>
<translation>Paste address from clipboard</translation>
</message>
@@ -2504,12 +2540,12 @@ Address: %4
</message>
<message>
<location line="+3"/>
- <location line="+146"/>
+ <location line="+143"/>
<source>Clear &amp;All</source>
<translation>Clear &amp;All</translation>
</message>
<message>
- <location line="-87"/>
+ <location line="-84"/>
<source>&amp;Verify Message</source>
<translation>&amp;Verify Message</translation>
</message>
@@ -2524,7 +2560,7 @@ Address: %4
<translation>The address the message was signed with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="+40"/>
+ <location line="+37"/>
<source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
<translation>Verify the message to ensure it was signed with the specified Bitcoin address</translation>
</message>
@@ -2539,43 +2575,37 @@ Address: %4
<translation>Reset all verify message fields</translation>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+29"/>
- <location line="+3"/>
+ <location filename="../signverifymessagedialog.cpp" line="+30"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location line="-2"/>
+ <location line="-1"/>
<source>Click &quot;Sign Message&quot; to generate signature</source>
<translation>Click &quot;Sign Message&quot; to generate signature</translation>
</message>
<message>
- <location line="+3"/>
- <source>Enter Bitcoin signature</source>
- <translation>Enter Bitcoin signature</translation>
- </message>
- <message>
<location line="+84"/>
- <location line="+81"/>
+ <location line="+80"/>
<source>The entered address is invalid.</source>
<translation>The entered address is invalid.</translation>
</message>
<message>
- <location line="-81"/>
+ <location line="-80"/>
<location line="+8"/>
- <location line="+73"/>
+ <location line="+72"/>
<location line="+8"/>
<source>Please check the address and try again.</source>
<translation>Please check the address and try again.</translation>
</message>
<message>
- <location line="-81"/>
- <location line="+81"/>
+ <location line="-80"/>
+ <location line="+80"/>
<source>The entered address does not refer to a key.</source>
<translation>The entered address does not refer to a key.</translation>
</message>
<message>
- <location line="-73"/>
+ <location line="-72"/>
<source>Wallet unlock was cancelled.</source>
<translation>Wallet unlock was cancelled.</translation>
</message>
@@ -2595,7 +2625,7 @@ Address: %4
<translation>Message signed.</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+58"/>
<source>The signature could not be decoded.</source>
<translation>The signature could not be decoded.</translation>
</message>
@@ -2726,12 +2756,12 @@ Address: %4
<location line="+12"/>
<location line="+45"/>
<location line="+17"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Credit</source>
<translation>Credit</translation>
</message>
<message numerus="yes">
- <location line="-120"/>
+ <location line="-125"/>
<source>matures in %n more block(s)</source>
<translation>
<numerusform>matures in %n more block</numerusform>
@@ -2747,12 +2777,12 @@ Address: %4
<location line="+44"/>
<location line="+8"/>
<location line="+15"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Debit</source>
<translation>Debit</translation>
</message>
<message>
- <location line="-57"/>
+ <location line="-62"/>
<source>Transaction fee</source>
<translation>Transaction fee</translation>
</message>
@@ -2763,11 +2793,12 @@ Address: %4
</message>
<message>
<location line="+6"/>
+ <location line="+9"/>
<source>Message</source>
<translation>Message</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="-7"/>
<source>Comment</source>
<translation>Comment</translation>
</message>
@@ -2777,7 +2808,7 @@ Address: %4
<translation>Transaction ID</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+18"/>
<source>Merchant</source>
<translation type="unfinished"></translation>
</message>
@@ -2817,7 +2848,7 @@ Address: %4
<translation>false</translation>
</message>
<message>
- <location line="-227"/>
+ <location line="-232"/>
<source>, has not been successfully broadcast yet</source>
<translation>, has not been successfully broadcast yet</translation>
</message>
diff --git a/src/qt/locale/bitcoin_eo.ts b/src/qt/locale/bitcoin_eo.ts
index 2ce97d9f6b..329ff7a57f 100644
--- a/src/qt/locale/bitcoin_eo.ts
+++ b/src/qt/locale/bitcoin_eo.ts
@@ -3,13 +3,13 @@
<name>AboutDialog</name>
<message>
<location filename="../forms/aboutdialog.ui" line="+14"/>
- <source>About Bitcoin</source>
- <translation>Pri Bitmono</translation>
+ <source>About Bitcoin Core</source>
+ <translation>Pri la Bitmona Kerno</translation>
</message>
<message>
<location line="+39"/>
- <source>&lt;b&gt;Bitcoin&lt;/b&gt; version</source>
- <translation>Versio de &lt;b&gt;Bitmono&lt;/b&gt;</translation>
+ <source>&lt;b&gt;Bitcoin Core&lt;/b&gt; version</source>
+ <translation>Versio de &lt;b&gt;Bitmona Kerno&lt;/b&gt;</translation>
</message>
<message>
<location line="+57"/>
@@ -27,14 +27,14 @@ Eldonita laÅ­ la permesilo MIT/X11. Vidu la kunan dosieron COPYING aÅ­ http://ww
Tiu ĉi produkto enhavas erojn kreitajn de la &quot;OpenSSL Project&quot; por uzo en la &quot;OpenSSL Toolkit&quot; (http://www.openssl.org/) kaj ĉifrajn erojn kreitajn de Eric Young (eay@cryptsoft.com) kaj UPnP-erojn kreitajn de Thomas Bernard.</translation>
</message>
<message>
- <location filename="../aboutdialog.cpp" line="+14"/>
+ <location filename="../utilitydialog.cpp" line="+29"/>
<source>Copyright</source>
<translation>Kopirajto</translation>
</message>
<message>
<location line="+0"/>
- <source>The Bitcoin developers</source>
- <translation>La programistoj de Bitmono</translation>
+ <source>The Bitcoin Core developers</source>
+ <translation>La programistoj de Bitmona Kerno</translation>
</message>
</context>
<context>
@@ -70,7 +70,7 @@ Tiu ĉi produkto enhavas erojn kreitajn de la &quot;OpenSSL Project&quot; por uz
<translation>&amp;Fermi</translation>
</message>
<message>
- <location filename="../addressbookpage.cpp" line="+72"/>
+ <location filename="../addressbookpage.cpp" line="+74"/>
<source>&amp;Copy Address</source>
<translation>&amp;Kopii Adreson</translation>
</message>
@@ -140,7 +140,7 @@ Tiu ĉi produkto enhavas erojn kreitajn de la &quot;OpenSSL Project&quot; por uz
<translation>&amp;Redakti</translation>
</message>
<message>
- <location line="+197"/>
+ <location line="+194"/>
<source>Export Address List</source>
<translation>Eksporti Adresliston</translation>
</message>
@@ -151,19 +151,19 @@ Tiu ĉi produkto enhavas erojn kreitajn de la &quot;OpenSSL Project&quot; por uz
</message>
<message>
<location line="+13"/>
- <source>Error exporting</source>
- <translation>Eraro dum eksportado</translation>
+ <source>Exporting Failed</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation>Ne eblis skribi al dosiero %1.</translation>
+ <location line="+1"/>
+ <source>There was an error trying to save the address list to %1.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<name>AddressTableModel</name>
<message>
- <location filename="../addresstablemodel.cpp" line="+164"/>
+ <location filename="../addresstablemodel.cpp" line="+168"/>
<source>Label</source>
<translation>Etikedo</translation>
</message>
@@ -201,7 +201,7 @@ Tiu ĉi produkto enhavas erojn kreitajn de la &quot;OpenSSL Project&quot; por uz
<translation>Ripetu la novan pasfrazon</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="+34"/>
+ <location filename="../askpassphrasedialog.cpp" line="+40"/>
<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 uzi pasfrazon kun &lt;b&gt;almenaŭ 10 hazardaj signoj&lt;/b&gt;, aŭ &lt;b&gt;almenaŭ ok vortoj&lt;/b&gt;.</translation>
</message>
@@ -322,22 +322,27 @@ Tiu ĉi produkto enhavas erojn kreitajn de la &quot;OpenSSL Project&quot; por uz
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+250"/>
+ <location filename="../bitcoingui.cpp" line="+295"/>
<source>Sign &amp;message...</source>
<translation>Subskribi &amp;mesaÄon...</translation>
</message>
<message>
- <location line="+254"/>
+ <location line="+335"/>
<source>Synchronizing with network...</source>
<translation>Sinkronigante kun reto...</translation>
</message>
<message>
- <location line="-324"/>
+ <location line="-407"/>
<source>&amp;Overview</source>
<translation>&amp;Superrigardo</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="-137"/>
+ <source>Node</source>
+ <translation>Nodo</translation>
+ </message>
+ <message>
+ <location line="+138"/>
<source>Show general overview of wallet</source>
<translation>Vidigi ĝeneralan superrigardon de la monujo</translation>
</message>
@@ -352,7 +357,7 @@ Tiu ĉi produkto enhavas erojn kreitajn de la &quot;OpenSSL Project&quot; por uz
<translation>Esplori historion de transakcioj</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>E&amp;xit</source>
<translation>&amp;Eliri</translation>
</message>
@@ -398,7 +403,22 @@ Tiu ĉi produkto enhavas erojn kreitajn de la &quot;OpenSSL Project&quot; por uz
<translation>Ŝanĝi &amp;Pasfrazon...</translation>
</message>
<message>
- <location line="+259"/>
+ <location line="+10"/>
+ <source>&amp;Sending addresses...</source>
+ <translation>&amp;Sendaj adresoj...</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Receiving addresses...</source>
+ <translation>&amp;Ricevaj adresoj...</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open &amp;URI...</source>
+ <translation>Malfermi &amp;URI-on...</translation>
+ </message>
+ <message>
+ <location line="+325"/>
<source>Importing blocks from disk...</source>
<translation>Importado de blokoj el disko...</translation>
</message>
@@ -408,12 +428,12 @@ Tiu ĉi produkto enhavas erojn kreitajn de la &quot;OpenSSL Project&quot; por uz
<translation>Reindeksado de blokoj sur disko...</translation>
</message>
<message>
- <location line="-322"/>
+ <location line="-405"/>
<source>Send coins to a Bitcoin address</source>
<translation>Sendi monon al Bitmon-adreso</translation>
</message>
<message>
- <location line="+47"/>
+ <location line="+49"/>
<source>Modify configuration options for Bitcoin</source>
<translation>Modifi agordaĵojn por Bitmono</translation>
</message>
@@ -443,20 +463,17 @@ Tiu ĉi produkto enhavas erojn kreitajn de la &quot;OpenSSL Project&quot; por uz
<translation>&amp;Kontroli mesaÄon...</translation>
</message>
<message>
- <location line="-180"/>
- <location line="+6"/>
- <location line="+513"/>
+ <location line="+430"/>
<source>Bitcoin</source>
<translation>Bitmono</translation>
</message>
<message>
- <location line="-519"/>
- <location line="+6"/>
+ <location line="-643"/>
<source>Wallet</source>
<translation>Monujo</translation>
</message>
<message>
- <location line="+109"/>
+ <location line="+146"/>
<source>&amp;Send</source>
<translation>&amp;Sendi</translation>
</message>
@@ -466,13 +483,7 @@ Tiu ĉi produkto enhavas erojn kreitajn de la &quot;OpenSSL Project&quot; por uz
<translation>&amp;Ricevi</translation>
</message>
<message>
- <location line="+28"/>
- <location line="+2"/>
- <source>&amp;About Bitcoin</source>
- <translation>&amp;Pri Bitmono</translation>
- </message>
- <message>
- <location line="+14"/>
+ <location line="+46"/>
<location line="+2"/>
<source>&amp;Show / Hide</source>
<translation>&amp;Montri / Kaŝi</translation>
@@ -498,64 +509,80 @@ Tiu ĉi produkto enhavas erojn kreitajn de la &quot;OpenSSL Project&quot; por uz
<translation>Kontroli mesaĝojn por kontroli ĉu ili estas subskribitaj per specifaj Bitmon-adresoj</translation>
</message>
<message>
- <location line="+35"/>
+ <location line="+48"/>
<source>&amp;File</source>
<translation>&amp;Dosiero</translation>
</message>
<message>
- <location line="+10"/>
+ <location line="+14"/>
<source>&amp;Settings</source>
<translation>&amp;Agordoj</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>&amp;Help</source>
<translation>&amp;Helpo</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+15"/>
<source>Tabs toolbar</source>
<translation>Langeto-breto</translation>
</message>
<message>
- <location line="-235"/>
- <location line="+294"/>
+ <location line="-284"/>
+ <location line="+376"/>
<source>[testnet]</source>
<translation>[testnet]</translation>
</message>
<message>
- <location line="-177"/>
+ <location line="-401"/>
+ <source>Bitcoin Core</source>
+ <translation>Kerno de Bitmono</translation>
+ </message>
+ <message>
+ <location line="+163"/>
<source>Request payments (generates QR codes and bitcoin: URIs)</source>
<translation>Peti pagon (kreas QR-kodojn kaj URI-ojn kun prefikso bitcoin:)</translation>
</message>
<message>
- <location line="+63"/>
- <source>&amp;Used sending addresses...</source>
- <translation>&amp;Uzitaj sendaj adresoj...</translation>
+ <location line="+29"/>
+ <location line="+2"/>
+ <source>&amp;About Bitcoin Core</source>
+ <translation>&amp;Pri la Bitmona Kerno</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+35"/>
<source>Show the list of used sending addresses and labels</source>
<translation>Vidigi la liston de uzitaj sendaj adresoj kaj etikedoj</translation>
</message>
<message>
- <location line="+1"/>
- <source>Used &amp;receiving addresses...</source>
- <translation>Uzitaj &amp;ricevaj adresoj...</translation>
+ <location line="+2"/>
+ <source>Show the list of used receiving addresses and labels</source>
+ <translation>Vidigi la liston de uzitaj ricevaj adresoj kaj etikedoj</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open a bitcoin: URI or payment request</source>
+ <translation>Malfermi bitcoin:-URI-on aÅ­ pagpeton</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Command-line options</source>
+ <translation>&amp;Komandliniaj agordaĵoj</translation>
</message>
<message>
<location line="+1"/>
- <source>Show the list of used receiving addresses and labels</source>
- <translation>Vidigi la liston de uzitaj ricevaj adresoj kaj etikedoj</translation>
+ <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+106"/>
+ <location line="+159"/>
<location line="+5"/>
<source>Bitcoin client</source>
<translation>Bitmon-kliento</translation>
</message>
<message numerus="yes">
- <location line="+120"/>
+ <location line="+142"/>
<source>%n active connection(s) to Bitcoin network</source>
<translation><numerusform>%n aktiva konekto al la bitmona reto</numerusform><numerusform>%n aktivaj konektoj al la bitmona reto</numerusform></translation>
</message>
@@ -575,7 +602,7 @@ Tiu ĉi produkto enhavas erojn kreitajn de la &quot;OpenSSL Project&quot; por uz
<translation>Traktis %1 blokoj de la transakcia historio.</translation>
</message>
<message numerus="yes">
- <location line="+20"/>
+ <location line="+23"/>
<source>%n hour(s)</source>
<translation><numerusform>%n horo</numerusform><numerusform>%n horoj</numerusform></translation>
</message>
@@ -595,7 +622,7 @@ Tiu ĉi produkto enhavas erojn kreitajn de la &quot;OpenSSL Project&quot; por uz
<translation>mankas %1</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="+21"/>
<source>Last received block was generated %1 ago.</source>
<translation>Lasta ricevita bloko kreiĝis antaŭ %1.</translation>
</message>
@@ -620,27 +647,17 @@ Tiu ĉi produkto enhavas erojn kreitajn de la &quot;OpenSSL Project&quot; por uz
<translation>Informoj</translation>
</message>
<message>
- <location line="+77"/>
- <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>Tiu ĉi transakcio estas pli granda ol la limo. Vi tamen rajtas sendi ĝin kontraŭ krompago de %1, kiu pagiĝas al la nodoj, kiuj traktas vian transakcion kaj helpas subteni la reton. Ĉu vi akceptas la krompagon?</translation>
- </message>
- <message>
- <location line="-152"/>
+ <location line="-85"/>
<source>Up to date</source>
<translation>Äœisdata</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Catching up...</source>
<translation>Äœisdatigante...</translation>
</message>
<message>
- <location line="+124"/>
- <source>Confirm transaction fee</source>
- <translation>Konfirmi la krompagon</translation>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+130"/>
<source>Sent transaction</source>
<translation>Sendita transakcio</translation>
</message>
@@ -663,17 +680,7 @@ Adreso: %4
</translation>
</message>
<message>
- <location line="+34"/>
- <source>URI handling</source>
- <translation>Traktado de URI-oj</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
- <translation>Fiaskis la analizon de la URI! Eble la Bitmon-adreso estas nevalida, aŭ povus esti problemo kun la parametroj de la URI.</translation>
- </message>
- <message>
- <location line="+45"/>
+ <location line="+69"/>
<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 aktuale &lt;b&gt;malÅlosita&lt;/b&gt;</translation>
</message>
@@ -683,7 +690,7 @@ Adreso: %4
<translation>Monujo estas &lt;b&gt;ĉifrita&lt;/b&gt; kaj aktuale &lt;b&gt;Ålosita&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+110"/>
+ <location filename="../bitcoin.cpp" line="+438"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation>Okazis neriparebla eraro. Bitmono ne plu povas sekure daŭri, do ĝi sekure ĉesos.</translation>
</message>
@@ -691,12 +698,304 @@ Adreso: %4
<context>
<name>ClientModel</name>
<message>
- <location filename="../clientmodel.cpp" line="+115"/>
+ <location filename="../clientmodel.cpp" line="+119"/>
<source>Network Alert</source>
<translation>Reta Averto</translation>
</message>
</context>
<context>
+ <name>CoinControlDialog</name>
+ <message>
+ <location filename="../forms/coincontroldialog.ui" line="+14"/>
+ <source>Coin Control Address Selection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>Quantity:</source>
+ <translation>Kvanto:</translation>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Bytes:</source>
+ <translation>Bajtoj:</translation>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>Amount:</source>
+ <translation>Sumo:</translation>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Priority:</source>
+ <translation>Prioritato:</translation>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>Fee:</source>
+ <translation>Krompago:</translation>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Low Output:</source>
+ <translation>Malalta Eligo:</translation>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>After Fee:</source>
+ <translation>Post krompago:</translation>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Change:</source>
+ <translation>Restmono:</translation>
+ </message>
+ <message>
+ <location line="+63"/>
+ <source>(un)select all</source>
+ <translation>(mal)elekti ĉion</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Tree mode</source>
+ <translation>ArboreÄimo</translation>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>List mode</source>
+ <translation>ListreÄimo</translation>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>Amount</source>
+ <translation>Sumo</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Address</source>
+ <translation>Adreso</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Date</source>
+ <translation>Dato</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Confirmations</source>
+ <translation>Konfirmoj</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Confirmed</source>
+ <translation>Konfirmita</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Priority</source>
+ <translation>Prioritato</translation>
+ </message>
+ <message>
+ <location filename="../coincontroldialog.cpp" line="+42"/>
+ <source>Copy address</source>
+ <translation>Kopii adreson</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy label</source>
+ <translation>Kopii etikedon</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+26"/>
+ <source>Copy amount</source>
+ <translation>Kopii sumon</translation>
+ </message>
+ <message>
+ <location line="-25"/>
+ <source>Copy transaction ID</source>
+ <translation>Kopii transakcian ID-on</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Lock unspent</source>
+ <translation>Åœlosi la neelspezitajn</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Unlock unspent</source>
+ <translation>MalÅlosi la neelspezitajn</translation>
+ </message>
+ <message>
+ <location line="+22"/>
+ <source>Copy quantity</source>
+ <translation>Kopii kvanton</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Copy fee</source>
+ <translation>Kopii krompagon</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy after fee</source>
+ <translation>Kopii post krompago</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy bytes</source>
+ <translation>Kopii bajtojn</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy priority</source>
+ <translation>Kopii prioritaton</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy low output</source>
+ <translation>Kopii malaltan eligon</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy change</source>
+ <translation>Kopii restmonon</translation>
+ </message>
+ <message>
+ <location line="+323"/>
+ <source>highest</source>
+ <translation>plej alta</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>higher</source>
+ <translation>pli alta</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>high</source>
+ <translation>alta</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>medium-high</source>
+ <translation>mezalta</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>medium</source>
+ <translation>meza</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>low-medium</source>
+ <translation>mezmalalta</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>low</source>
+ <translation>malalta</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>lower</source>
+ <translation>pli malalta</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>lowest</source>
+ <translation>plej malalta</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>(%1 locked)</source>
+ <translation>(%1 Ålosita)</translation>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>none</source>
+ <translation>neniu</translation>
+ </message>
+ <message>
+ <location line="+140"/>
+ <source>Dust</source>
+ <translation>Polvo</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>yes</source>
+ <translation>jes</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>no</source>
+ <translation>ne</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>This label turns red, if the transaction size is greater than 1000 bytes.</source>
+ <translation>Tiu ĉi etikedo ruÄiÄas se la grando de la transakcio estas pli ol 1000 bajtoj.</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+5"/>
+ <source>This means a fee of at least %1 per kB is required.</source>
+ <translation>Tio signifas, ke krompago de almenaŭ po %1 por ĉiu kB estas deviga.</translation>
+ </message>
+ <message>
+ <location line="-4"/>
+ <source>Can vary +/- 1 byte per input.</source>
+ <translation>Povas varii po +/- 1 bajton por ĉiu enigo.</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Transactions with higher priority are more likely to get included into a block.</source>
+ <translation>Transakcioj kun pli alta prioritato havas pli altan Åancon inkluziviÄi en bloko.</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>This label turns red, if the priority is smaller than &quot;medium&quot;.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>This label turns red, if any recipient receives an amount smaller than %1.</source>
+ <translation>Tiu ĉi etikedo ruÄiÄas se iu ajn ricevonto ricevos sumon malpli ol %1.</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+4"/>
+ <source>This means a fee of at least %1 is required.</source>
+ <translation>Tio signifas, ke krompago de almenaÅ­ %1 estas deviga.</translation>
+ </message>
+ <message>
+ <location line="-3"/>
+ <source>Amounts below 0.546 times the minimum relay fee are shown as dust.</source>
+ <translation>Sumoj, kiuj valoras malpli ol 0.545 oble la minimuman plusendan kromkoston vidiÄas kiel polvo.</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>This label turns red, if the change is smaller than %1.</source>
+ <translation>Tiu ĉi etikedo ruÄiÄas se la restmono estas malpli ol %1.</translation>
+ </message>
+ <message>
+ <location line="+43"/>
+ <location line="+66"/>
+ <source>(no label)</source>
+ <translation>(neniu etikedo)</translation>
+ </message>
+ <message>
+ <location line="-9"/>
+ <source>change from %1 (%2)</source>
+ <translation>restmono de %1 (%2)</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>(change)</source>
+ <translation>(restmono)</translation>
+ </message>
+</context>
+<context>
<name>EditAddressDialog</name>
<message>
<location filename="../forms/editaddressdialog.ui" line="+14"/>
@@ -724,7 +1023,7 @@ Adreso: %4
<translation>&amp;Adreso</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+21"/>
+ <location filename="../editaddressdialog.cpp" line="+28"/>
<source>New receiving address</source>
<translation>Nova adreso por ricevi</translation>
</message>
@@ -767,7 +1066,7 @@ Adreso: %4
<context>
<name>FreespaceChecker</name>
<message>
- <location filename="../intro.cpp" line="+61"/>
+ <location filename="../intro.cpp" line="+65"/>
<source>A new data directory will be created.</source>
<translation>Kreiĝos nova dosierujo por la datumoj.</translation>
</message>
@@ -793,15 +1092,19 @@ Adreso: %4
</message>
</context>
<context>
- <name>GUIUtil::HelpMessageBox</name>
+ <name>HelpMessageDialog</name>
<message>
- <location filename="../guiutil.cpp" line="+558"/>
- <location line="+13"/>
- <source>Bitcoin-Qt</source>
- <translation>Bitmono-Qt</translation>
+ <location filename="../forms/helpmessagedialog.ui" line="+19"/>
+ <source>Bitcoin Core - Command-line options</source>
+ <translation>Bitmona Kerno - Komandliniaj agordaĵoj</translation>
</message>
<message>
- <location line="-13"/>
+ <location filename="../utilitydialog.cpp" line="+38"/>
+ <source>Bitcoin Core</source>
+ <translation>Kerno de Bitmono</translation>
+ </message>
+ <message>
+ <location line="+0"/>
<source>version</source>
<translation>versio</translation>
</message>
@@ -850,18 +1153,18 @@ Adreso: %4
</message>
<message>
<location line="+9"/>
- <source>Welcome to Bitcoin-Qt.</source>
- <translation>Bonvenon al Bitmono-Qt.</translation>
+ <source>Welcome to Bitcoin Core.</source>
+ <translation>Bonvenon al la bitmona kerno, Bitcoin Core.</translation>
</message>
<message>
<location line="+26"/>
- <source>As this is the first time the program is launched, you can choose where Bitcoin-Qt will store its data.</source>
- <translation>Dum tiu ĉi unua lanĉo, vi povas elekti kie la aplikaĵo metos siajn datumojn.</translation>
+ <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
+ <translation>Dum tiu ĉi unua uzo de la programo, vi povas elekti lokon, kie Bitcoin Core stokos siajn datumojn.</translation>
</message>
<message>
<location line="+10"/>
- <source>Bitcoin-Qt will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
- <translation>Bitmono-Qt elÅutos kaj konservos kopion de la bitmona blokcÌ‚eno. Almenaŭ %1Gb de datumoj konservigÌ‚os en tiu dosierujo, kaj tio poiome kreskos. La monujo ankaŭ trovigÌ‚os en tiu dosierujo.</translation>
+ <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
+ <translation>Bitcoin Core elÅutos kaj konservos kopion de la bitmona blokĉeno. AlmenaÅ­ %1GB da datumoj konserviÄos en tiu loko, kaj tio poiome kreskos. AnkaÅ­ via monujo konserviÄos en tiu dosierujo.</translation>
</message>
<message>
<location line="+10"/>
@@ -874,7 +1177,17 @@ Adreso: %4
<translation>Uzi alian dosierujon por datumoj:</translation>
</message>
<message>
- <location filename="../intro.cpp" line="+105"/>
+ <location filename="../intro.cpp" line="+85"/>
+ <source>Bitcoin</source>
+ <translation>Bitmono</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error: Specified data directory &quot;%1&quot; can not be created.</source>
+ <translation>Eraro: ne eblas krei la elektitan dosierujon por datumoj &quot;%1&quot;.</translation>
+ </message>
+ <message>
+ <location line="+19"/>
<source>Error</source>
<translation>Eraro</translation>
</message>
@@ -890,6 +1203,34 @@ Adreso: %4
</message>
</context>
<context>
+ <name>OpenURIDialog</name>
+ <message>
+ <location filename="../forms/openuridialog.ui" line="+14"/>
+ <source>Open URI</source>
+ <translation>Malfermi URI-on</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Open payment request from URI or file</source>
+ <translation>Malfermi pagpeton el URI aÅ­ dosiero</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>URI:</source>
+ <translation>URI:</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Select payment request file</source>
+ <translation>Elektu la dosieron de la pagpeto</translation>
+ </message>
+ <message>
+ <location filename="../openuridialog.cpp" line="+47"/>
+ <source>Select payment request file to open</source>
+ <translation>Elektu la malfermotan dosieron de la pagpeto</translation>
+ </message>
+</context>
+<context>
<name>OptionsDialog</name>
<message>
<location filename="../forms/optionsdialog.ui" line="+14"/>
@@ -897,7 +1238,7 @@ Adreso: %4
<translation>Agordaĵoj</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+13"/>
<source>&amp;Main</source>
<translation>CÌ‚&amp;efa</translation>
</message>
@@ -922,7 +1263,52 @@ Adreso: %4
<translation>&amp;Lanĉi Bitmonon tuj post ensaluto al la sistemo</translation>
</message>
<message>
- <location line="+35"/>
+ <location line="+9"/>
+ <source>Size of &amp;database cache</source>
+ <translation>Dosiergrando de &amp;datumbasa kaÅmemoro</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set database cache size in megabytes (default: 25)</source>
+ <translation>Specifi grandon de datumbazo je megabajtoj (defaŭlte: 25)</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>MB</source>
+ <translation>MB</translation>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Number of script &amp;verification threads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
+ <translation>Agordi la nombron de fadenoj por skriptkontrolado (ĝis 16, 0 = aŭtomate, &lt;0 = lasi tiom da kernoj liberaj, defaŭlte: 0)</translation>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Connect to the Bitcoin network through a SOCKS proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Connect through SOCKS proxy (default proxy):</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+224"/>
+ <source>Active command-line options that override above options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
<source>Reset all client options to default.</source>
<translation>Reagordi ĉion al defaŭlataj valoroj.</translation>
</message>
@@ -932,7 +1318,7 @@ Adreso: %4
<translation>&amp;Rekomenci agordadon</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="-323"/>
<source>&amp;Network</source>
<translation>&amp;Reto</translation>
</message>
@@ -947,32 +1333,17 @@ Adreso: %4
<translation>Mapigi pordon per &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>Konekti al la bitmona reto per SOCKS-prokurilo (ekz. per Tor).</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>&amp;Connect through SOCKS proxy:</source>
- <translation>&amp;Konekti per SOCKS-prokurilo:</translation>
- </message>
- <message>
- <location line="+9"/>
+ <location line="+19"/>
<source>Proxy &amp;IP:</source>
<translation>Prokurila &amp;IP:</translation>
</message>
<message>
- <location line="+19"/>
- <source>IP address of the proxy (e.g. 127.0.0.1)</source>
- <translation>la IP-adreso de la prokurilo (ekz. 127.0.0.1)</translation>
- </message>
- <message>
- <location line="+7"/>
+ <location line="+32"/>
<source>&amp;Port:</source>
<translation>&amp;Pordo:</translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+25"/>
<source>Port of the proxy (e.g. 9050)</source>
<translation>la pordo de la prokurilo (ekz. 9050)</translation>
</message>
@@ -1047,7 +1418,17 @@ Adreso: %4
<translation>&amp;Montri adresojn en la listo de transakcioj</translation>
</message>
<message>
- <location line="+71"/>
+ <location line="+7"/>
+ <source>Whether to show coin control features or not.</source>
+ <translation>Ĉu montri detalan adres-regilon, aŭ ne.</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Display coin &amp;control features (experts only)</source>
+ <translation>Montri &amp;detalan adres-regilon (nur por spertuloj)</translation>
+ </message>
+ <message>
+ <location line="+136"/>
<source>&amp;OK</source>
<translation>&amp;Bone</translation>
</message>
@@ -1057,44 +1438,38 @@ Adreso: %4
<translation>&amp;Nuligi</translation>
</message>
<message>
- <location line="+10"/>
- <source>&amp;Apply</source>
- <translation>&amp;Apliki</translation>
- </message>
- <message>
- <location filename="../optionsdialog.cpp" line="+58"/>
+ <location filename="../optionsdialog.cpp" line="+67"/>
<source>default</source>
<translation>defaŭlta</translation>
</message>
<message>
- <location line="+130"/>
+ <location line="+57"/>
+ <source>none</source>
+ <translation>neniu</translation>
+ </message>
+ <message>
+ <location line="+75"/>
<source>Confirm options reset</source>
<translation>Konfirmi reŝargo de agordoj</translation>
</message>
<message>
<location line="+1"/>
- <source>Some settings may require a client restart to take effect.</source>
- <translation>Kelkaj agordoj bezonos relanĉo de la aplikaĵo por ekefiki.</translation>
+ <location line="+29"/>
+ <source>Client restart required to activate changes.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>Do you want to proceed?</source>
- <translation>Ĉu vi volas daŭrigi?</translation>
+ <location line="-29"/>
+ <source>Client will be shutdown, do you want to proceed?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
- <location line="+9"/>
- <source>Warning</source>
- <translation>Atentu</translation>
+ <location line="+33"/>
+ <source>This change would require a client restart.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="-9"/>
- <location line="+9"/>
- <source>This setting will take effect after restarting Bitcoin.</source>
- <translation>Tiu ĉi agordo ekefikos post relanĉo de Bitmono.</translation>
- </message>
- <message>
- <location line="+29"/>
+ <location line="+34"/>
<source>The supplied proxy address is invalid.</source>
<translation>La prokurila adreso estas malvalida.</translation>
</message>
@@ -1108,22 +1483,22 @@ Adreso: %4
</message>
<message>
<location line="+50"/>
- <location line="+202"/>
+ <location line="+231"/>
<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>Eblas, ke la informoj videblaj ĉi tie estas eksdataj. Via monujo aŭtomate sinkoniĝas kun la bitmona reto kiam ili konektiĝas, sed tiu procezo ankoraŭ ne finfariĝis.</translation>
</message>
<message>
- <location line="-131"/>
+ <location line="-155"/>
<source>Unconfirmed:</source>
<translation>Nekonfirmita:</translation>
</message>
<message>
- <location line="-78"/>
+ <location line="-83"/>
<source>Wallet</source>
<translation>Monujo</translation>
</message>
<message>
- <location line="+49"/>
+ <location line="+51"/>
<source>Confirmed:</source>
<translation>Konfirmita:</translation>
</message>
@@ -1133,12 +1508,12 @@ Adreso: %4
<translation>via aktuala elspezebla saldo</translation>
</message>
<message>
- <location line="+29"/>
+ <location line="+32"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation>la sumo de transakcioj ankoraŭ ne konfirmitaj, kiuj ankoraŭ ne elspezeblas</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+16"/>
<source>Immature:</source>
<translation>Nematura:</translation>
</message>
@@ -1148,7 +1523,7 @@ Adreso: %4
<translation>Minita saldo, kiu ankoraŭ ne maturiĝis</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+16"/>
<source>Total:</source>
<translation>Totalo:</translation>
</message>
@@ -1158,12 +1533,12 @@ Adreso: %4
<translation>via aktuala totala saldo</translation>
</message>
<message>
- <location line="+53"/>
+ <location line="+71"/>
<source>&lt;b&gt;Recent transactions&lt;/b&gt;</source>
<translation>&lt;b&gt;Lastaj transakcioj&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../overviewpage.cpp" line="+116"/>
+ <location filename="../overviewpage.cpp" line="+120"/>
<location line="+1"/>
<source>out of sync</source>
<translation>nesinkronigita</translation>
@@ -1172,7 +1547,8 @@ Adreso: %4
<context>
<name>PaymentServer</name>
<message>
- <location filename="../paymentserver.cpp" line="+392"/>
+ <location filename="../paymentserver.cpp" line="+403"/>
+ <location line="+13"/>
<source>URI handling</source>
<translation>Traktado de URI-oj</translation>
</message>
@@ -1182,45 +1558,82 @@ Adreso: %4
<translation>Fiaskis la analizon de la URI! Eble la Bitmon-adreso estas nevalida, aŭ povus esti problemo kun la parametroj de la URI.</translation>
</message>
<message>
- <location line="+69"/>
+ <location line="+96"/>
<source>Requested payment amount of %1 is too small (considered dust).</source>
<translation>La petita pagosumo de %1 estas tro malgranda (konsiderata kiel polvo).</translation>
</message>
<message>
- <location line="+4"/>
- <location line="+37"/>
+ <location line="-221"/>
+ <location line="+212"/>
+ <location line="+13"/>
+ <location line="+95"/>
+ <location line="+18"/>
+ <location line="+16"/>
<source>Payment request error</source>
<translation>Eraro dum pagopeto</translation>
</message>
<message>
+ <location line="-353"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
+ <translation>Ne eblas lanĉi la ilon &apos;klaki-por-pagi&apos;</translation>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Net manager warning</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+1"/>
- <source>Insecure requests to custom payment scripts unsupported</source>
- <translation>Nesekuraj petoj al tajloritaj pagskiptoj ne eblas</translation>
+ <source>Your active proxy doesn&apos;t support SOCKS5, which is required for payment requests via proxy.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+38"/>
+ <location line="+52"/>
+ <source>Payment request fetch URL is invalid: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Payment request file handling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Payment request file can not be read or processed! This can be caused by an invalid payment request file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+73"/>
+ <source>Unverified payment requests to custom payment scripts are unsupported.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+59"/>
<source>Refund from %1</source>
<translation>Repago de %1</translation>
</message>
<message>
- <location line="+42"/>
+ <location line="+43"/>
<source>Error communicating with %1: %2</source>
<translation>Eraro dum komunikado kun %1: %2</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+24"/>
+ <source>Payment request can not be parsed or processed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
<source>Bad response from server %1</source>
<translation>Malbona respondo de la servilo %1</translation>
</message>
<message>
- <location line="+32"/>
+ <location line="+33"/>
<source>Payment acknowledged</source>
<translation>Pago agnoskita</translation>
</message>
<message>
- <location line="-58"/>
- <location line="+30"/>
- <location line="+17"/>
+ <location line="-11"/>
<source>Network request error</source>
<translation>Eraro dum ret-peto</translation>
</message>
@@ -1228,32 +1641,26 @@ Adreso: %4
<context>
<name>QObject</name>
<message>
- <location filename="../bitcoin.cpp" line="+114"/>
- <location line="+5"/>
- <location filename="../intro.cpp" line="-32"/>
+ <location filename="../bitcoin.cpp" line="+71"/>
+ <location line="+11"/>
<source>Bitcoin</source>
<translation>Bitmono</translation>
</message>
<message>
- <location line="-4"/>
+ <location line="+1"/>
<source>Error: Specified data directory &quot;%1&quot; does not exist.</source>
<translation>Eraro: la elektita dosierujo por datumoj &quot;%1&quot; ne ekzistas.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="-12"/>
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation>Eraro: nevalida kunigo de -regtest kaj -testnet</translation>
</message>
- <message>
- <location filename="../intro.cpp" line="+1"/>
- <source>Error: Specified data directory &quot;%1&quot; can not be created.</source>
- <translation>Eraro: ne eblas krei la elektitan dosierujon por datumoj &quot;%1&quot;.</translation>
- </message>
</context>
<context>
<name>QRImageWidget</name>
<message>
- <location filename="../receiverequestdialog.cpp" line="+32"/>
+ <location filename="../receiverequestdialog.cpp" line="+36"/>
<source>&amp;Save Image...</source>
<translation>&amp;Konservi Bildon...</translation>
</message>
@@ -1269,8 +1676,8 @@ Adreso: %4
</message>
<message>
<location line="+0"/>
- <source>PNG Images (*.png)</source>
- <translation>PNG-bildo (*.png)</translation>
+ <source>PNG Image (*.png)</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1287,15 +1694,16 @@ Adreso: %4
<location line="+23"/>
<location line="+23"/>
<location line="+36"/>
- <location line="+53"/>
+ <location line="+23"/>
+ <location line="+36"/>
<location line="+23"/>
<location line="+23"/>
- <location filename="../rpcconsole.cpp" line="+352"/>
+ <location filename="../rpcconsole.cpp" line="+359"/>
<source>N/A</source>
<translation>neaplikebla</translation>
</message>
<message>
- <location line="-217"/>
+ <location line="-223"/>
<source>Client version</source>
<translation>Versio de kliento</translation>
</message>
@@ -1305,7 +1713,17 @@ Adreso: %4
<translation>&amp;Informoj</translation>
</message>
<message>
- <location line="+68"/>
+ <location line="-10"/>
+ <source>Debug window</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+25"/>
+ <source>General</source>
+ <translation>Äœenerala</translation>
+ </message>
+ <message>
+ <location line="+53"/>
<source>Using OpenSSL version</source>
<translation>uzas OpenSSL-version</translation>
</message>
@@ -1321,16 +1739,16 @@ Adreso: %4
</message>
<message>
<location line="+7"/>
- <source>Number of connections</source>
- <translation>Nombro de konektoj</translation>
+ <source>Name</source>
+ <translation>Nomo</translation>
</message>
<message>
<location line="+23"/>
- <source>On testnet</source>
- <translation>CÌ‚e testnet</translation>
+ <source>Number of connections</source>
+ <translation>Nombro de konektoj</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+29"/>
<source>Block chain</source>
<translation>Blokĉeno</translation>
</message>
@@ -1355,21 +1773,6 @@ Adreso: %4
<translation>&amp;Malfermi</translation>
</message>
<message>
- <location line="+16"/>
- <source>Command-line options</source>
- <translation>Komandliniaj agordaĵoj</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>Montri la helpmesaÄon de Bitmono-Qt por vidi liston de eblaj komandliniaj agordajÌ‚oj.</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>&amp;Show</source>
- <translation>&amp;Vidigi</translation>
- </message>
- <message>
<location line="+24"/>
<source>&amp;Console</source>
<translation>&amp;Konzolo</translation>
@@ -1400,22 +1803,12 @@ Adreso: %4
<translation>El:</translation>
</message>
<message>
- <location line="-541"/>
+ <location line="-521"/>
<source>Build date</source>
<translation>Dato de kompilado</translation>
</message>
<message>
- <location line="-104"/>
- <source>Bitcoin - Debug window</source>
- <translation>Bitmono - sencimiga fenestro</translation>
- </message>
- <message>
- <location line="+25"/>
- <source>Bitcoin Core</source>
- <translation>Kerno de Bitmono</translation>
- </message>
- <message>
- <location line="+279"/>
+ <location line="+206"/>
<source>Debug log file</source>
<translation>Sencimiga protokoldosiero</translation>
</message>
@@ -1425,7 +1818,7 @@ Adreso: %4
<translation>Malfermi la sencimiga protokoldosiero de Bitmono el la aktuala dosierujo por datumoj. Tio eble daŭros plurajn sekundojn por granda protokoldosiero.</translation>
</message>
<message>
- <location line="+102"/>
+ <location line="+76"/>
<source>Clear console</source>
<translation>Malplenigi konzolon</translation>
</message>
@@ -1445,7 +1838,7 @@ Adreso: %4
<translation>Tajpu &lt;b&gt;help&lt;/b&gt; por superrigardo de la disponeblaj komandoj.</translation>
</message>
<message>
- <location line="+128"/>
+ <location line="+122"/>
<source>%1 B</source>
<translation>%1 B</translation>
</message>
@@ -1483,37 +1876,22 @@ Adreso: %4
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+22"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
<source>&amp;Amount:</source>
<translation>&amp;Kvanto:</translation>
</message>
<message>
- <location line="+16"/>
- <source>The amount to request</source>
- <translation>La kvanto petota</translation>
- </message>
- <message>
- <location line="+7"/>
+ <location line="-13"/>
<source>&amp;Label:</source>
<translation>&amp;Etikedo:</translation>
</message>
<message>
- <location line="+10"/>
- <source>The label to associate with the receiving address</source>
- <translation>La etikedo por la riceva adreso</translation>
- </message>
- <message>
- <location line="+7"/>
+ <location line="-34"/>
<source>&amp;Message:</source>
<translation>&amp;MesaÄo:</translation>
</message>
<message>
- <location line="+10"/>
- <source>The message to attach to payment request</source>
- <translation>La mesaÄo sendota kun la pagopeto</translation>
- </message>
- <message>
- <location line="+14"/>
+ <location line="-17"/>
<source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation>Reuzi unu el la jam uzitaj ricevaj adresoj. Reuzo de adresoj povas krei problemojn pri sekureco kaj privateco. Ne uzu tiun ĉi funkcion krom por rekrei antaŭe faritan pagopeton.</translation>
</message>
@@ -1523,9 +1901,24 @@ Adreso: %4
<translation>R&amp;euzi ekzistantan ricevan adreson (malrekomendinda)</translation>
</message>
<message>
+ <location line="+27"/>
+ <source>An optional label to associate with the new receiving address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+7"/>
- <source>Use this form to request payments. All fields are optional.</source>
- <translation>Uzu tiun ĉi formularon por peti pagojn. Ĉiuj kampoaj estas nedevigaj.</translation>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+39"/>
+ <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+17"/>
@@ -1542,6 +1935,31 @@ Adreso: %4
<source>&amp;Request payment</source>
<translation>&amp;Peti pagon</translation>
</message>
+ <message>
+ <location line="+47"/>
+ <source>Requested payments</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Show the selected request (does the same as double clicking an entry)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Show</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Remove the selected entries from the list</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Remove</source>
+ <translation>Forigi</translation>
+ </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
@@ -1562,16 +1980,11 @@ Adreso: %4
</message>
<message>
<location line="+7"/>
- <source>&amp;Copy Image</source>
- <translation>Kopii &amp;Bildon</translation>
- </message>
- <message>
- <location line="+7"/>
<source>&amp;Save Image...</source>
<translation>&amp;Konservi Bildon...</translation>
</message>
<message>
- <location filename="../receiverequestdialog.cpp" line="+58"/>
+ <location filename="../receiverequestdialog.cpp" line="+56"/>
<source>Request payment to %1</source>
<translation>Peti pagon al %1</translation>
</message>
@@ -1617,16 +2030,119 @@ Adreso: %4
</message>
</context>
<context>
+ <name>RecentRequestsTableModel</name>
+ <message>
+ <location filename="../recentrequeststablemodel.cpp" line="+24"/>
+ <source>Date</source>
+ <translation>Dato</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Label</source>
+ <translation>Etikedo</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Message</source>
+ <translation>Mesaĝo</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Amount</source>
+ <translation>Sumo</translation>
+ </message>
+ <message>
+ <location line="+38"/>
+ <source>(no label)</source>
+ <translation>(neniu etikedo)</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>(no message)</source>
+ <translation>(neniu mesaÄo)</translation>
+ </message>
+</context>
+<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+140"/>
- <location line="+213"/>
+ <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location line="+80"/>
<source>Send Coins</source>
<translation>Sendi Monon</translation>
</message>
<message>
- <location line="+50"/>
+ <location line="+76"/>
+ <source>Coin Control Features</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Inputs...</source>
+ <translation>Enigoj...</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>automatically selected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Insufficient funds!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+89"/>
+ <source>Quantity:</source>
+ <translation>Kvanto:</translation>
+ </message>
+ <message>
+ <location line="+35"/>
+ <source>Bytes:</source>
+ <translation>Bajtoj:</translation>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Amount:</source>
+ <translation>Sumo:</translation>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Priority:</source>
+ <translation>Prioritato:</translation>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Fee:</source>
+ <translation>Krompago:</translation>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Low Output:</source>
+ <translation>Malalta Eligo:</translation>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>After Fee:</source>
+ <translation>Post krompago:</translation>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Change:</source>
+ <translation>Restmono:</translation>
+ </message>
+ <message>
+ <location line="+44"/>
+ <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Custom change address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+115"/>
<source>Send to multiple recipients at once</source>
<translation>Sendi samtempe al pluraj ricevantoj</translation>
</message>
@@ -1651,12 +2167,7 @@ Adreso: %4
<translation>Saldo:</translation>
</message>
<message>
- <location line="+10"/>
- <source>123.456 BTC</source>
- <translation>123,456 BTC</translation>
- </message>
- <message>
- <location line="+31"/>
+ <location line="+41"/>
<source>Confirm the send action</source>
<translation>Konfirmi la sendon</translation>
</message>
@@ -1666,49 +2177,125 @@ Adreso: %4
<translation>Åœendi</translation>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-154"/>
+ <location filename="../sendcoinsdialog.cpp" line="-228"/>
<source>Confirm send coins</source>
<translation>Konfirmi sendon de bitmono</translation>
</message>
<message>
- <location line="-90"/>
+ <location line="-74"/>
<location line="+5"/>
<location line="+5"/>
+ <location line="+4"/>
<source>%1 to %2</source>
<translation>%1 al %2</translation>
</message>
<message>
- <location line="+26"/>
+ <location line="-136"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation>Enigi Bitmon-adreson (ekz. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Copy quantity</source>
+ <translation>Kopii kvanton</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation>Kopii sumon</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy fee</source>
+ <translation>Kopii krompagon</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy after fee</source>
+ <translation>Kopii post krompago</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy bytes</source>
+ <translation>Kopii bajtojn</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy priority</source>
+ <translation>Kopii prioritaton</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy low output</source>
+ <translation>Kopii malaltan eligon</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy change</source>
+ <translation>Kopii restmonon</translation>
+ </message>
+ <message>
+ <location line="+170"/>
+ <source>Total Amount %1 (= %2)</source>
+ <translation>Totala Sumo %1 (= %2)</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>or</source>
+ <translation>aÅ­</translation>
+ </message>
+ <message>
+ <location line="+202"/>
<source>The recipient address is not valid, please recheck.</source>
<translation>La adreso de la ricevonto ne validas. Bonvolu kontroli.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The amount to pay must be larger than 0.</source>
<translation>La pagenda sumo devas esti pli ol 0.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The amount exceeds your balance.</source>
<translation>La sumo estas pli granda ol via saldo.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The total exceeds your balance when the %1 transaction fee is included.</source>
<translation>La sumo kun la %1 krompago estas pli granda ol via saldo.</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+3"/>
<source>Duplicate address found, can only send to each address once per send operation.</source>
<translation>Iu adreso estas ripetita. Vi povas sendi al ĉiu adreso po unufoje en iu send-operacio.</translation>
</message>
<message>
+ <location line="+3"/>
+ <source>Transaction creation failed!</source>
+ <translation>Kreo de transakcio fiaskis!</translation>
+ </message>
+ <message>
<location line="+4"/>
- <source>Error: Transaction creation failed!</source>
- <translation>Eraro: kreo de transakcio fiaskis!</translation>
+ <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+15"/>
+ <location line="+112"/>
+ <source>Warning: Invalid Bitcoin address</source>
+ <translation>Averto: Nevalida Bitmon-adreso</translation>
+ </message>
+ <message>
+ <location line="+21"/>
+ <source>(no label)</source>
+ <translation>(neniu etikedo)</translation>
+ </message>
+ <message>
+ <location line="-11"/>
+ <source>Warning: Unknown change address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-366"/>
<source>Are you sure you want to send?</source>
<translation>Ĉu vi certas, ke vi volas sendi?</translation>
</message>
@@ -1718,17 +2305,7 @@ Adreso: %4
<translation>aldonita kiel krompago</translation>
</message>
<message>
- <location line="+6"/>
- <source>Total Amount %1</source>
- <translation>Totala sumo %1</translation>
- </message>
- <message>
- <location line="+20"/>
- <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>Eraro: la transakcio estas rifuzita. Tio povas okazi se iom da Bitmono en via monujo jam elspeziÄis (ekz. se vi uzis kopion de wallet.dat kies Bitmono jam elspeziÄis, sed ne estis markita kiel elspezita cÌ‚i tie).</translation>
- </message>
- <message>
- <location line="+144"/>
+ <location line="+170"/>
<source>Payment request expired</source>
<translation>Pagopeto nun estas eksdata</translation>
</message>
@@ -1741,39 +2318,44 @@ Adreso: %4
<context>
<name>SendCoinsEntry</name>
<message>
- <location filename="../forms/sendcoinsentry.ui" line="+33"/>
- <location line="+585"/>
+ <location filename="../forms/sendcoinsentry.ui" line="+131"/>
+ <location line="+521"/>
+ <location line="+536"/>
<source>A&amp;mount:</source>
<translation>&amp;Sumo:</translation>
</message>
<message>
- <location line="-572"/>
- <location line="+585"/>
+ <location line="-1152"/>
<source>Pay &amp;To:</source>
<translation>&amp;Ricevonto:</translation>
</message>
<message>
- <location line="-551"/>
+ <location line="+18"/>
<source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>La adreso kie vi sendos la pagon (ekz. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location filename="../sendcoinsentry.cpp" line="+28"/>
+ <location filename="../sendcoinsentry.cpp" line="+30"/>
<source>Enter a label for this address to add it to your address book</source>
<translation>Tajpu etikedon por tiu ĉi adreso kaj aldonu ĝin al via adresaro</translation>
</message>
<message>
- <location filename="../forms/sendcoinsentry.ui" line="-18"/>
+ <location filename="../forms/sendcoinsentry.ui" line="+57"/>
<source>&amp;Label:</source>
<translation>&amp;Etikedo:</translation>
</message>
<message>
- <location line="+28"/>
+ <location line="-50"/>
<source>Choose previously used address</source>
<translation>Elektu la jam uzitan adreson</translation>
</message>
<message>
- <location line="+10"/>
+ <location line="-40"/>
+ <source>This is a normal payment.</source>
+ <translation>Tio estas normala pago.</translation>
+ </message>
+ <message>
+ <location line="+50"/>
<source>Alt+A</source>
<translation>Alt+A</translation>
</message>
@@ -1789,16 +2371,45 @@ Adreso: %4
</message>
<message>
<location line="+7"/>
- <source>Remove this recipient</source>
- <translation>Forigi ĉi tiun ricevanton</translation>
+ <location line="+524"/>
+ <location line="+536"/>
+ <source>Remove this entry</source>
+ <translation>Forigu ĉi tiun enskribon</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="-1008"/>
+ <source>Message:</source>
+ <translation>Mesaĝo:</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+958"/>
+ <source>This is a verified payment request.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-991"/>
<source>Enter a label for this address to add it to the list of used addresses</source>
<translation>Tajpu etikedon por tiu ĉi adreso por aldoni Äin al la listo de uzitaj adresoj</translation>
</message>
<message>
- <location line="+465"/>
+ <location line="+459"/>
+ <source>This is an unverified payment request.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+18"/>
+ <location line="+532"/>
+ <source>Pay To:</source>
+ <translation>Pagi Al:</translation>
+ </message>
+ <message>
+ <location line="-498"/>
+ <location line="+536"/>
<source>Memo:</source>
<translation>Memorando:</translation>
</message>
@@ -1809,6 +2420,19 @@ Adreso: %4
</message>
</context>
<context>
+ <name>ShutdownWindow</name>
+ <message>
+ <location filename="../utilitydialog.cpp" line="+48"/>
+ <source>Bitcoin Core is shutting down...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Do not shut down the computer until this window disappears.</source>
+ <translation>Ne sistemfermu Äis ĉi tiu fenestro malaperas.</translation>
+ </message>
+</context>
+<context>
<name>SignVerifyMessageDialog</name>
<message>
<location filename="../forms/signverifymessagedialog.ui" line="+14"/>
@@ -1816,7 +2440,7 @@ Adreso: %4
<translation>Subskriboj - Subskribi / Kontroli mesaĝon</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+10"/>
<source>&amp;Sign Message</source>
<translation>&amp;Subskribi Mesaĝon</translation>
</message>
@@ -1919,7 +2543,7 @@ Adreso: %4
<translation>Reagordigi ĉiujn prikontrolajn kampojn</translation>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+27"/>
+ <location filename="../signverifymessagedialog.cpp" line="+29"/>
<location line="+3"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>Enigi Bitmon-adreson (ekz. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
@@ -1935,7 +2559,7 @@ Adreso: %4
<translation>Enigi Bitmon-subskribon</translation>
</message>
<message>
- <location line="+85"/>
+ <location line="+84"/>
<location line="+81"/>
<source>The entered address is invalid.</source>
<translation>La adreso, kiun vi enmetis, estas nevalida.</translation>
@@ -2004,9 +2628,14 @@ Adreso: %4
<context>
<name>SplashScreen</name>
<message>
- <location filename="../splashscreen.cpp" line="+23"/>
- <source>The Bitcoin developers</source>
- <translation>La programistoj de Bitmono</translation>
+ <location filename="../splashscreen.cpp" line="+28"/>
+ <source>Bitcoin Core</source>
+ <translation>Kerno de Bitmono</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>The Bitcoin Core developers</source>
+ <translation>La programistoj de Bitmona Kerno</translation>
</message>
<message>
<location line="+1"/>
@@ -2017,7 +2646,7 @@ Adreso: %4
<context>
<name>TrafficGraphWidget</name>
<message>
- <location filename="../trafficgraphwidget.cpp" line="+75"/>
+ <location filename="../trafficgraphwidget.cpp" line="+79"/>
<source>KB/s</source>
<translation>KB/s</translation>
</message>
@@ -2025,7 +2654,7 @@ Adreso: %4
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="+22"/>
+ <location filename="../transactiondesc.cpp" line="+28"/>
<source>Open until %1</source>
<translation>Malferma ĝis %1</translation>
</message>
@@ -2098,12 +2727,12 @@ Adreso: %4
<location line="+12"/>
<location line="+45"/>
<location line="+17"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Credit</source>
<translation>Kredito</translation>
</message>
<message numerus="yes">
- <location line="-120"/>
+ <location line="-125"/>
<source>matures in %n more block(s)</source>
<translation><numerusform>maturiĝos post %n bloko</numerusform><numerusform>maturiĝos post %n blokoj</numerusform></translation>
</message>
@@ -2116,12 +2745,12 @@ Adreso: %4
<location line="+44"/>
<location line="+8"/>
<location line="+15"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Debit</source>
<translation>Debeto</translation>
</message>
<message>
- <location line="-57"/>
+ <location line="-62"/>
<source>Transaction fee</source>
<translation>Krompago</translation>
</message>
@@ -2132,11 +2761,12 @@ Adreso: %4
</message>
<message>
<location line="+6"/>
+ <location line="+9"/>
<source>Message</source>
<translation>Mesaĝo</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="-7"/>
<source>Comment</source>
<translation>Komento</translation>
</message>
@@ -2146,7 +2776,7 @@ Adreso: %4
<translation>Transakcia ID</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+18"/>
<source>Merchant</source>
<translation>Vendisto</translation>
</message>
@@ -2186,7 +2816,7 @@ Adreso: %4
<translation>malvera</translation>
</message>
<message>
- <location line="-227"/>
+ <location line="-232"/>
<source>, has not been successfully broadcast yet</source>
<translation>, ankoraÅ­ ne elsendita sukcese</translation>
</message>
@@ -2217,7 +2847,7 @@ Adreso: %4
<context>
<name>TransactionTableModel</name>
<message>
- <location filename="../transactiontablemodel.cpp" line="+227"/>
+ <location filename="../transactiontablemodel.cpp" line="+234"/>
<source>Date</source>
<translation>Dato</translation>
</message>
@@ -2236,8 +2866,13 @@ Adreso: %4
<source>Amount</source>
<translation>Sumo</translation>
</message>
+ <message>
+ <location line="+59"/>
+ <source>Immature (%1 confirmations, will be available after %2)</source>
+ <translation type="unfinished"/>
+ </message>
<message numerus="yes">
- <location line="+57"/>
+ <location line="+16"/>
<source>Open for %n more block(s)</source>
<translation><numerusform>Malferma dum ankoraŭ %n bloko</numerusform><numerusform>Malferma dum ankoraŭ %n blokoj</numerusform></translation>
</message>
@@ -2257,17 +2892,13 @@ Adreso: %4
<translation>Nekonfirmita (%1 el %2 konfirmoj)</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="-22"/>
+ <location line="+25"/>
<source>Confirmed (%1 confirmations)</source>
<translation>Konfirmita (%1 konfirmoj)</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>La sumo minita disponeblos kiam ĝi maturiĝos post ankoraŭ %n bloko</numerusform><numerusform>La sumo minita disponeblos kiam ĝi maturiĝos post ankoraŭ %n blokoj</numerusform></translation>
- </message>
<message>
- <location line="+5"/>
+ <location line="-22"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation>Tiun ĉi blokon ne ricevis ajna alia nodo, kaj ĝi verŝajne ne akceptiĝos!</translation>
</message>
@@ -2277,7 +2908,7 @@ Adreso: %4
<translation>Kreita sed ne akceptita</translation>
</message>
<message>
- <location line="+43"/>
+ <location line="+62"/>
<source>Received with</source>
<translation>Ricevita kun</translation>
</message>
@@ -2335,7 +2966,7 @@ Adreso: %4
<context>
<name>TransactionView</name>
<message>
- <location filename="../transactionview.cpp" line="+52"/>
+ <location filename="../transactionview.cpp" line="+57"/>
<location line="+16"/>
<source>All</source>
<translation>Ĉiuj</translation>
@@ -2396,12 +3027,12 @@ Adreso: %4
<translation>Aliaj</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+6"/>
<source>Enter address or label to search</source>
<translation>Tajpu adreson aŭ etikedon por serĉi</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+6"/>
<source>Min amount</source>
<translation>Minimuma sumo</translation>
</message>
@@ -2436,17 +3067,37 @@ Adreso: %4
<translation>Montri detalojn de transakcio</translation>
</message>
<message>
- <location line="+143"/>
- <source>Export Transaction Data</source>
- <translation>Eksporti datumojn de transakcio</translation>
+ <location line="+142"/>
+ <source>Export Transaction History</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="+19"/>
+ <source>Exporting Failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>There was an error trying to save the transaction history to %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Exporting Successful</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The transaction history was successfully saved to %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-22"/>
<source>Comma separated file (*.csv)</source>
<translation>Perkome disigita dosiero (*.csv)</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+9"/>
<source>Confirmed</source>
<translation>Konfirmita</translation>
</message>
@@ -2481,17 +3132,7 @@ Adreso: %4
<translation>ID</translation>
</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"/>
+ <location line="+107"/>
<source>Range:</source>
<translation>Intervalo:</translation>
</message>
@@ -2502,9 +3143,17 @@ Adreso: %4
</message>
</context>
<context>
+ <name>WalletFrame</name>
+ <message>
+ <location filename="../walletframe.cpp" line="+26"/>
+ <source>No wallet has been loaded.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>WalletModel</name>
<message>
- <location filename="../walletmodel.cpp" line="+218"/>
+ <location filename="../walletmodel.cpp" line="+245"/>
<source>Send Coins</source>
<translation>Sendi Bitmonon</translation>
</message>
@@ -2512,7 +3161,7 @@ Adreso: %4
<context>
<name>WalletView</name>
<message>
- <location filename="../walletview.cpp" line="+46"/>
+ <location filename="../walletview.cpp" line="+43"/>
<source>&amp;Export</source>
<translation>&amp;Eksporti</translation>
</message>
@@ -2522,65 +3171,60 @@ Adreso: %4
<translation>Eksporti la datumojn el la aktuala langeto al dosiero</translation>
</message>
<message>
- <location line="+183"/>
+ <location line="+181"/>
<source>Backup Wallet</source>
<translation>Krei sekurkopion de monujo</translation>
</message>
<message>
- <location line="+0"/>
+ <location line="+1"/>
<source>Wallet Data (*.dat)</source>
<translation>Monuj-datumoj (*.dat)</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="+6"/>
<source>Backup Failed</source>
<translation>Malsukcesis sekurkopio</translation>
</message>
<message>
<location line="+0"/>
- <source>There was an error trying to save the wallet data to the new location.</source>
- <translation>Okazis eraro dum konservo de monuj-datumoj al la nova loko.</translation>
+ <source>There was an error trying to save the wallet data to %1.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+4"/>
- <source>Backup Successful</source>
- <translation>Sukcesis krei sekurkopion</translation>
+ <source>The wallet data was successfully saved to %1.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+0"/>
- <source>The wallet data was successfully saved to the new location.</source>
- <translation>La monuj-datumoj sukcese konserviÄis al la nova loko.</translation>
+ <source>Backup Successful</source>
+ <translation>Sukcesis krei sekurkopion</translation>
</message>
</context>
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+102"/>
- <source>Bitcoin version</source>
- <translation>Versio de Bitmono</translation>
- </message>
- <message>
- <location line="+107"/>
+ <location filename="../bitcoinstrings.cpp" line="+221"/>
<source>Usage:</source>
<translation>Uzado:</translation>
</message>
<message>
- <location line="-55"/>
+ <location line="-54"/>
<source>List commands</source>
<translation>Listigi komandojn</translation>
</message>
<message>
- <location line="-13"/>
+ <location line="-14"/>
<source>Get help for a command</source>
<translation>Vidigi helpon pri iu komando</translation>
</message>
<message>
- <location line="+25"/>
+ <location line="+26"/>
<source>Options:</source>
<translation>Agordoj:</translation>
</message>
<message>
- <location line="+24"/>
+ <location line="+22"/>
<source>Specify configuration file (default: bitcoin.conf)</source>
<translation>Specifi konfiguran dosieron (defaŭlte: bitcoin.conf)</translation>
</message>
@@ -2600,7 +3244,7 @@ Adreso: %4
<translation>Specifi grandon de datumbazo je megabajtoj (defaŭlte: 25)</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-26"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
<translation>Aŭskulti al &lt;port&gt; por konektoj (defaŭlte: 8333 aŭ testnet: 18333)</translation>
</message>
@@ -2610,7 +3254,7 @@ Adreso: %4
<translation>Subteni maksimume &lt;n&gt; konektojn al samtavolanoj (defaŭlte: 125)</translation>
</message>
<message>
- <location line="-49"/>
+ <location line="-51"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation>Konekti al nodo por ricevi adresojn de samtavolanoj, kaj malkonekti</translation>
</message>
@@ -2620,37 +3264,37 @@ Adreso: %4
<translation>Specifi vian propran publikan adreson</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation>Sojlo por malkonekti misagantajn samtavolanojn (defaŭlte: 100)</translation>
</message>
<message>
- <location line="-142"/>
+ <location line="-148"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation>Nombro da sekundoj por rifuzi rekonekton de misagantaj samtavolanoj (defaŭlte: 86400)</translation>
</message>
<message>
- <location line="-33"/>
+ <location line="-36"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
<translation>Eraro okazis dum estigo de RPC-pordo %u por aŭskulti per IPv4: %s</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation>Aŭskulti al &lt;port&gt; por JSON-RPC-konektoj (defaŭlte: 8332 aŭ testnet: 18332)</translation>
</message>
<message>
- <location line="+40"/>
+ <location line="+45"/>
<source>Accept command line and JSON-RPC commands</source>
<translation>Akcepti komandojn JSON-RPC kaj el komandlinio</translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>Ruli fone kiel demono kaj akcepti komandojn</translation>
</message>
<message>
- <location line="+40"/>
+ <location line="+39"/>
<source>Use the test network</source>
<translation>Uzi la test-reton</translation>
</message>
@@ -2660,7 +3304,7 @@ Adreso: %4
<translation>Akcepti konektojn el ekstere (defaŭlte: 1 se ne estas -proxy nek -connect)</translation>
</message>
<message>
- <location line="-87"/>
+ <location line="-95"/>
<source>%s, you must set a rpcpassword in the configuration file:
%s
It is recommended you use the following random password:
@@ -2711,6 +3355,11 @@ ekzemple: alertnotify=echo %%s | mail -s &quot;Averto de Bitmono&quot; admin@foo
</message>
<message>
<location line="+4"/>
+ <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</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>Eraro: la transakcio estas rifuzita. Tio povas okazi se iom da Bitmono en via monujo jam elspeziÄis (ekz. se vi uzis kopion de wallet.dat kies Bitmono jam elspeziÄis, sed ne estis markita kiel elspezita cÌ‚i tie).</translation>
</message>
@@ -2725,17 +3374,17 @@ ekzemple: alertnotify=echo %%s | mail -s &quot;Averto de Bitmono&quot; admin@foo
<translation>Plenumi komandon kiam monuja transakcio ŝanĝiĝas (%s en cmd anstataŭiĝas per TxID)</translation>
</message>
<message>
- <location line="+11"/>
- <source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source>
- <translation>Agordi maksimuman grandon de altprioritataj/malalt-krompagaj transakcioj je bajtoj (defaŭlte: 27000)</translation>
- </message>
- <message>
- <location line="+6"/>
+ <location line="+18"/>
<source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
<translation>Tiu ĉi estas antaŭeldona testa versio - uzu laŭ via propra risko - ne uzu por minado aŭ por aplikaĵoj por vendistoj</translation>
</message>
<message>
<location line="+5"/>
+ <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
<source>Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source>
<translation>Averto: -paytxfee estas agordita per tre alta valoro! Tio estas la krompago, kion vi pagos se vi sendas la transakcion.</translation>
</message>
@@ -2765,17 +3414,27 @@ ekzemple: alertnotify=echo %%s | mail -s &quot;Averto de Bitmono&quot; admin@foo
<translation>Averto: via wallet.dat estas difektita, sed la datumoj sukcese saviĝis! La originala wallet.dat estas nun konservita kiel wallet.{timestamp}.bak en %s; se via saldo aŭ transakcioj estas malĝustaj vi devus restaŭri per alia sekurkopio.</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="+9"/>
+ <source>&lt;category&gt; can be:</source>
+ <translation>&lt;category&gt; povas esti:</translation>
+ </message>
+ <message>
+ <location line="+6"/>
<source>Attempt to recover private keys from a corrupt wallet.dat</source>
<translation>Provo ripari privatajn ŝlosilojn el difektita wallet.dat</translation>
</message>
<message>
<location line="+1"/>
+ <source>Bitcoin Core Daemon</source>
+ <translation>Bitmonakerna Demono</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Bitcoin RPC client version</source>
<translation>Versio de la Bitmono-RPC-kliento</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
<source>Block creation options:</source>
<translation>Blok-kreaj agordaĵoj:</translation>
</message>
@@ -2785,7 +3444,12 @@ ekzemple: alertnotify=echo %%s | mail -s &quot;Averto de Bitmono&quot; admin@foo
<translation>Konekti nur al specifita(j) nodo(j)</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
+ <source>Connect through SOCKS proxy</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect to JSON-RPC on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation>Konekti al la JSON-RPC per &lt;port&gt; (defaÅ­lte: 8332 aÅ­ testnet: 18332)</translation>
</message>
@@ -2801,6 +3465,11 @@ ekzemple: alertnotify=echo %%s | mail -s &quot;Averto de Bitmono&quot; admin@foo
</message>
<message>
<location line="+1"/>
+ <source>Do not load the wallet and disable wallet RPC calls</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Do you want to rebuild the block database now?</source>
<translation>CÌ‚u vi volas rekonstrui la blokdatumbazon nun?</translation>
</message>
@@ -2895,7 +3564,12 @@ ekzemple: alertnotify=echo %%s | mail -s &quot;Averto de Bitmono&quot; admin@foo
<translation>Malsukcesis skribi malfarajn datumojn</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
+ <source>Fee per kB to add to transactions you send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Find peers using DNS lookup (default: 1 unless -connect)</source>
<translation>Trovi samtavolanojn per DNS-elserĉo (defaŭlte: 1 krom kaze de -connect)</translation>
</message>
@@ -2915,6 +3589,11 @@ ekzemple: alertnotify=echo %%s | mail -s &quot;Averto de Bitmono&quot; admin@foo
<translation>Kiom prizorgema estu la blokkontrolado (0-4, defaŭlte: 3)</translation>
</message>
<message>
+ <location line="+1"/>
+ <source>If &lt;category&gt; is not supplied, output all debugging information.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+2"/>
<source>Incorrect or no genesis block found. Wrong datadir for network?</source>
<translation>Geneza bloko aŭ netrovita aŭ neĝusta. Ĉu eble la datadir de la reto malĝustas?</translation>
@@ -2930,17 +3609,37 @@ ekzemple: alertnotify=echo %%s | mail -s &quot;Averto de Bitmono&quot; admin@foo
<translation>Nesufiĉa nombro de dosierpriskribiloj disponeblas.</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+5"/>
+ <source>Prepend debug output with timestamp (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>RPC client options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Rebuild block chain index from current blk000??.dat files</source>
<translation>Rekontrui blokĉenan indekson el la aktualaj blk000??.dat dosieroj</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+5"/>
+ <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Send command to Bitcoin server</source>
<translation>Sendi komandon al bitmona servilo</translation>
</message>
<message>
- <location line="+10"/>
+ <location line="+7"/>
+ <source>Set maximum block size in bytes (default: %d)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Set the number of threads to service RPC calls (default: 4)</source>
<translation>Specifi la nombron de fadenoj por priatenti RPC-alvokojn (defaŭlte: 4)</translation>
</message>
@@ -2955,12 +3654,17 @@ ekzemple: alertnotify=echo %%s | mail -s &quot;Averto de Bitmono&quot; admin@foo
<translation>Starti bitmonan servilon</translation>
</message>
<message>
- <location line="+12"/>
+ <location line="+3"/>
+ <source>This is intended for regression testing tools and app development.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Usage (deprecated, use bitcoin-cli):</source>
<translation>Uzado (malaktuala, uzu anstataÅ­e bitcoin-cli):</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+7"/>
<source>Verifying blocks...</source>
<translation>Kontrolado de blokoj...</translation>
</message>
@@ -2971,31 +3675,56 @@ ekzemple: alertnotify=echo %%s | mail -s &quot;Averto de Bitmono&quot; admin@foo
</message>
<message>
<location line="+1"/>
+ <source>Wait for RPC server to start</source>
+ <translation>Atendu por RPC-an servilo komenci</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Wallet %s resides outside data directory %s</source>
<translation>Monujo %s troviĝas ekster la dosierujo por datumoj %s</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+2"/>
+ <source>Wallet options:</source>
+ <translation>Monujaj opcioj:</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>You need to rebuild the database using -reindex to change -txindex</source>
<translation>Vi devas rekontrui la datumbazon kun -reindex por ŝanĝi -txindex</translation>
</message>
<message>
- <location line="-78"/>
+ <location line="-79"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation>Importas blokojn el ekstera dosiero blk000??.dat</translation>
</message>
<message>
- <location line="-98"/>
+ <location line="-105"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation>Plenumi komandon kiam rilata alerto riceviÄas, aÅ­ kiam ni vidas tre longan forkon (%s en cms anstataÅ­iÄas per mesaÄo)</translation>
</message>
<message>
- <location line="+17"/>
+ <location line="+14"/>
+ <source>Output debugging information (default: 0, supplying &lt;category&gt; is optional)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
<translation>Agordi la nombron de fadenoj por skriptkontrolado (ĝis 16, 0 = aŭtomate, &lt;0 = lasi tiom da kernoj liberaj, defaŭlte: 0)</translation>
</message>
<message>
- <location line="+83"/>
+ <location line="+89"/>
<source>Information</source>
<translation>Informoj</translation>
</message>
@@ -3035,47 +3764,17 @@ ekzemple: alertnotify=echo %%s | mail -s &quot;Averto de Bitmono&quot; admin@foo
<translation>Konekti nur la nodoj en la reto &lt;net&gt; (IPv4, IPv6 aŭ Tor)</translation>
</message>
<message>
- <location line="+2"/>
- <source>Output extra debugging information. Implies all other -debug* options</source>
- <translation>Eligi kromajn sencimigajn informojn. Implicas ĉiujn aliajn agordaĵojn -debug*</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Output extra network debugging information</source>
- <translation>Eligi kromajn priretajn sencimigajn informojn</translation>
- </message>
- <message>
- <location line="+2"/>
- <source>Prepend debug output with timestamp</source>
- <translation>Antaŭglui sencimigajn informojn per tempindiko</translation>
- </message>
- <message>
- <location line="+5"/>
+ <location line="+9"/>
<source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
<translation>SSL-agordaĵoj: (vidu la vikio de Bitmono por instrukcioj pri agordado de SSL)</translation>
</message>
<message>
- <location line="+1"/>
- <source>Select the version of socks proxy to use (4-5, default: 5)</source>
- <translation>Elekti la version de SOCKS ĉe la prokurilo (4-5, defaŭlte: 5)</translation>
- </message>
- <message>
- <location line="+3"/>
+ <location line="+4"/>
<source>Send trace/debug info to console instead of debug.log file</source>
<translation>Sendi spurajn/sencimigajn informojn al la konzolo anstataŭ al dosiero debug.log</translation>
</message>
<message>
- <location line="+1"/>
- <source>Send trace/debug info to debugger</source>
- <translation>Sendi spurajn/sencimigajn informojn al sencimigilo</translation>
- </message>
- <message>
- <location line="+5"/>
- <source>Set maximum block size in bytes (default: 250000)</source>
- <translation>Agordi maksimuman grandon de blokoj je bajtoj (defaŭlte: 250000)</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+6"/>
<source>Set minimum block size in bytes (default: 0)</source>
<translation>Agordi minimuman grandon de blokoj je bajtoj (defaŭlte: 0)</translation>
</message>
@@ -3100,7 +3799,7 @@ ekzemple: alertnotify=echo %%s | mail -s &quot;Averto de Bitmono&quot; admin@foo
<translation>Sistema eraro: </translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Transaction amount too small</source>
<translation>Transakcia sumo tro malgranda</translation>
</message>
@@ -3125,32 +3824,32 @@ ekzemple: alertnotify=echo %%s | mail -s &quot;Averto de Bitmono&quot; admin@foo
<translation>Uzi UPnP por mapi la aŭskultan pordon (defaŭlte: 1 dum aŭskultado)</translation>
</message>
<message>
- <location line="+1"/>
- <source>Use proxy to reach tor hidden services (default: same as -proxy)</source>
- <translation>Uzi prokurilon por atingi kaŝitajn Tor-servojn (defaŭlte: samkiel -proxy)</translation>
- </message>
- <message>
<location line="+2"/>
<source>Username for JSON-RPC connections</source>
<translation>Salutnomo por konektoj JSON-RPC</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+7"/>
<source>Warning</source>
<translation>Averto</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Warning: This version is obsolete, upgrade required!</source>
<translation>Averto: tiu ĉi versio estas eksdata. Vi bezonas ĝisdatigon!</translation>
</message>
<message>
<location line="+2"/>
+ <source>version</source>
+ <translation>versio</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>wallet.dat corrupt, salvage failed</source>
<translation>wallet.dat estas difektita, riparo malsukcesis</translation>
</message>
<message>
- <location line="-54"/>
+ <location line="-58"/>
<source>Password for JSON-RPC connections</source>
<translation>Pasvorto por konektoj JSON-RPC</translation>
</message>
@@ -3160,27 +3859,27 @@ ekzemple: alertnotify=echo %%s | mail -s &quot;Averto de Bitmono&quot; admin@foo
<translation>Permesi konektojn JSON-RPC de specifa IP-adreso</translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation>Sendi komandon al nodo ĉe &lt;ip&gt; (defaŭlte: 127.0.0.1)</translation>
</message>
<message>
- <location line="-126"/>
+ <location line="-132"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation>Plenumi komandon kiam plej bona bloko ŝanĝiĝas (%s en cmd anstataŭiĝas per bloka haketaĵo)</translation>
</message>
<message>
- <location line="+155"/>
+ <location line="+161"/>
<source>Upgrade wallet to latest format</source>
<translation>GÌ‚isdatigi monujon al plej lasta formato</translation>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation>Agordi la grandon de la ŝlosilo-vico al &lt;n&gt; (defaŭlte: 100)</translation>
</message>
<message>
- <location line="-12"/>
+ <location line="-11"/>
<source>Rescan the block chain for missing wallet transactions</source>
<translation>Reskani la blokĉenon por mankantaj monujaj transakcioj</translation>
</message>
@@ -3190,7 +3889,7 @@ ekzemple: alertnotify=echo %%s | mail -s &quot;Averto de Bitmono&quot; admin@foo
<translation>Uzi OpenSSL (https) por konektoj JSON-RPC</translation>
</message>
<message>
- <location line="-29"/>
+ <location line="-30"/>
<source>Server certificate file (default: server.cert)</source>
<translation>Dosiero de servila atestilo (defaŭlte: server.cert)</translation>
</message>
@@ -3205,27 +3904,22 @@ ekzemple: alertnotify=echo %%s | mail -s &quot;Averto de Bitmono&quot; admin@foo
<translation>Tiu ĉi helpmesaĝo</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Unable to bind to %s on this computer (bind returned error %d, %s)</source>
<translation>Ne eblis bindi al %s en tiu ĉi komputilo (bind resendis eraron %d, %s)</translation>
</message>
<message>
- <location line="-95"/>
- <source>Connect through socks proxy</source>
- <translation>Konekti per SOCKS-prokurilo</translation>
- </message>
- <message>
- <location line="-11"/>
+ <location line="-107"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation>Permesi DNS-elserĉojn por -addnote, -seednote kaj -connect</translation>
</message>
<message>
- <location line="+58"/>
+ <location line="+60"/>
<source>Loading addresses...</source>
<translation>ÅœarÄante adresojn...</translation>
</message>
<message>
- <location line="-36"/>
+ <location line="-37"/>
<source>Error loading wallet.dat: Wallet corrupted</source>
<translation>Eraro dum ŝargado de wallet.dat: monujo difektita</translation>
</message>
@@ -3245,12 +3939,12 @@ ekzemple: alertnotify=echo %%s | mail -s &quot;Averto de Bitmono&quot; admin@foo
<translation>Eraro dum ŝargado de wallet.dat</translation>
</message>
<message>
- <location line="+30"/>
+ <location line="+31"/>
<source>Invalid -proxy address: &apos;%s&apos;</source>
<translation>Nevalid adreso -proxy: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+57"/>
+ <location line="+56"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation>Nekonata reto specifita en -onlynet: &apos;%s&apos;</translation>
</message>
@@ -3260,7 +3954,7 @@ ekzemple: alertnotify=echo %%s | mail -s &quot;Averto de Bitmono&quot; admin@foo
<translation>Nekonata versio de -socks petita: %i</translation>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation>Ne eblas trovi la adreson -bind: &apos;%s&apos;</translation>
</message>
@@ -3270,7 +3964,7 @@ ekzemple: alertnotify=echo %%s | mail -s &quot;Averto de Bitmono&quot; admin@foo
<translation>Ne eblas trovi la adreson -externalip: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+46"/>
+ <location line="+48"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation>Nevalida sumo por -paytxfee=&lt;amount&gt;: &apos;%s&apos;</translation>
</message>
@@ -3290,27 +3984,22 @@ ekzemple: alertnotify=echo %%s | mail -s &quot;Averto de Bitmono&quot; admin@foo
<translation>ÅœarÄante blok-indekson...</translation>
</message>
<message>
- <location line="-60"/>
+ <location line="-62"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation>Aldoni nodon por alkonekti kaj provi daŭrigi la malferman konekton</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-32"/>
<source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source>
<translation>Ne eblas bindi al %s ĉe tiu ĉi komputilo. Bitmono verŝajne jam rulas.</translation>
</message>
<message>
- <location line="+69"/>
- <source>Fee per KB to add to transactions you send</source>
- <translation>Kromkosto por ĉiu KB, kiu aldoniĝos al via sendotaj transakcioj</translation>
- </message>
- <message>
- <location line="+20"/>
+ <location line="+95"/>
<source>Loading wallet...</source>
<translation>Åœargado de monujo...</translation>
</message>
<message>
- <location line="-54"/>
+ <location line="-56"/>
<source>Cannot downgrade wallet</source>
<translation>Ne eblas malpromocii monujon</translation>
</message>
@@ -3320,7 +4009,7 @@ ekzemple: alertnotify=echo %%s | mail -s &quot;Averto de Bitmono&quot; admin@foo
<translation>Ne eblas skribi defaŭltan adreson</translation>
</message>
<message>
- <location line="+66"/>
+ <location line="+67"/>
<source>Rescanning...</source>
<translation>Reskanado...</translation>
</message>
@@ -3340,7 +4029,7 @@ ekzemple: alertnotify=echo %%s | mail -s &quot;Averto de Bitmono&quot; admin@foo
<translation>Eraro</translation>
</message>
<message>
- <location line="-33"/>
+ <location line="-35"/>
<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.ts b/src/qt/locale/bitcoin_es.ts
index d5afe854b0..98c99a32ed 100644
--- a/src/qt/locale/bitcoin_es.ts
+++ b/src/qt/locale/bitcoin_es.ts
@@ -30,14 +30,14 @@ el OpenSSL Toolkit (http://www.openssl.org/) y software criptográfico escrito p
Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</translation>
</message>
<message>
- <location filename="../aboutdialog.cpp" line="+19"/>
+ <location filename="../utilitydialog.cpp" line="+29"/>
<source>Copyright</source>
<translation>Copyright</translation>
</message>
<message>
<location line="+0"/>
- <source>The Bitcoin developers</source>
- <translation>Los programadores Bitcoin</translation>
+ <source>The Bitcoin Core developers</source>
+ <translation>Los desarrolladores del Núcleo de Bitcoin</translation>
</message>
</context>
<context>
@@ -154,13 +154,13 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t
</message>
<message>
<location line="+13"/>
- <source>Error exporting</source>
- <translation>Error al exportar</translation>
+ <source>Exporting Failed</source>
+ <translation>Error exportando</translation>
</message>
<message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation>No se pudo escribir en el archivo %1.</translation>
+ <location line="+1"/>
+ <source>There was an error trying to save the address list to %1.</source>
+ <translation>Ha habido un error al intentar guardar los datos del monedero en %1.</translation>
</message>
</context>
<context>
@@ -325,22 +325,27 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+260"/>
+ <location filename="../bitcoingui.cpp" line="+295"/>
<source>Sign &amp;message...</source>
<translation>Firmar &amp;mensaje...</translation>
</message>
<message>
- <location line="+290"/>
+ <location line="+335"/>
<source>Synchronizing with network...</source>
<translation>Sincronizando con la red…</translation>
</message>
<message>
- <location line="-360"/>
+ <location line="-407"/>
<source>&amp;Overview</source>
<translation>&amp;Vista general</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="-137"/>
+ <source>Node</source>
+ <translation>Nodo</translation>
+ </message>
+ <message>
+ <location line="+138"/>
<source>Show general overview of wallet</source>
<translation>Mostrar vista general del monedero</translation>
</message>
@@ -355,7 +360,7 @@ 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="+15"/>
+ <location line="+17"/>
<source>E&amp;xit</source>
<translation>&amp;Salir</translation>
</message>
@@ -401,7 +406,22 @@ 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="+295"/>
+ <location line="+10"/>
+ <source>&amp;Sending addresses...</source>
+ <translation>&amp;Enviando direcciones...</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Receiving addresses...</source>
+ <translation>&amp;Recibiendo direcciones...</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open &amp;URI...</source>
+ <translation>Abrir &amp;URI...</translation>
+ </message>
+ <message>
+ <location line="+325"/>
<source>Importing blocks from disk...</source>
<translation>Importando bloques de disco...</translation>
</message>
@@ -411,12 +431,12 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t
<translation>Reindexando bloques en disco...</translation>
</message>
<message>
- <location line="-358"/>
+ <location line="-405"/>
<source>Send coins to a Bitcoin address</source>
<translation>Enviar monedas a una dirección Bitcoin</translation>
</message>
<message>
- <location line="+47"/>
+ <location line="+49"/>
<source>Modify configuration options for Bitcoin</source>
<translation>Modificar las opciones de configuración de Bitcoin</translation>
</message>
@@ -446,18 +466,17 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t
<translation>&amp;Verificar mensaje...</translation>
</message>
<message>
- <location line="+375"/>
+ <location line="+430"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-563"/>
- <location line="+10"/>
+ <location line="-643"/>
<source>Wallet</source>
<translation>Monedero</translation>
</message>
<message>
- <location line="+113"/>
+ <location line="+146"/>
<source>&amp;Send</source>
<translation>&amp;Enviar</translation>
</message>
@@ -467,7 +486,7 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t
<translation>&amp;Recibir</translation>
</message>
<message>
- <location line="+44"/>
+ <location line="+46"/>
<location line="+2"/>
<source>&amp;Show / Hide</source>
<translation>Mo&amp;strar/ocultar</translation>
@@ -493,86 +512,80 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t
<translation>Verificar mensajes comprobando que están firmados con direcciones Bitcoin concretas</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+48"/>
<source>&amp;File</source>
<translation>&amp;Archivo</translation>
</message>
<message>
- <location line="+11"/>
+ <location line="+14"/>
<source>&amp;Settings</source>
<translation>&amp;Configuración</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>&amp;Help</source>
<translation>A&amp;yuda</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+15"/>
<source>Tabs toolbar</source>
<translation>Barra de pestañas</translation>
</message>
<message>
- <location line="-244"/>
- <location line="+321"/>
+ <location line="-284"/>
+ <location line="+376"/>
<source>[testnet]</source>
<translation>[testnet]</translation>
</message>
<message>
- <location line="-331"/>
- <location line="+10"/>
+ <location line="-401"/>
<source>Bitcoin Core</source>
<translation>Núcleo de Bitcoin</translation>
</message>
<message>
- <location line="+121"/>
+ <location line="+163"/>
<source>Request payments (generates QR codes and bitcoin: URIs)</source>
<translation>Solicitar pagos (genera codigo QR y URL&apos;s de Bitcoin)</translation>
</message>
<message>
- <location line="+27"/>
+ <location line="+29"/>
<location line="+2"/>
<source>&amp;About Bitcoin Core</source>
<translation>&amp;Acerca del Núcleo de Bitcoin</translation>
</message>
<message>
- <location line="+34"/>
- <source>&amp;Used sending addresses...</source>
- <translation>Direcciones para enviar &amp;usadas...</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+35"/>
<source>Show the list of used sending addresses and labels</source>
<translation>Mostrar la lista de direcciones de envío y etiquetas</translation>
</message>
<message>
- <location line="+1"/>
- <source>Used &amp;receiving addresses...</source>
- <translation>Direcciones para &amp;recibir usadas...</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Show the list of used receiving addresses and labels</source>
<translation>Muestra la lista de direcciones de recepción y etiquetas</translation>
</message>
<message>
+ <location line="+3"/>
+ <source>Open a bitcoin: URI or payment request</source>
+ <translation>Abrir un bitcoin: URI o petición de pago</translation>
+ </message>
+ <message>
<location line="+2"/>
- <source>Open URI...</source>
- <translation>Abrir URI...</translation>
+ <source>&amp;Command-line options</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
- <source>Open a bitcoin: URI or payment request</source>
- <translation>Abrir un bitcoin: URI o petición de pago</translation>
+ <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+126"/>
+ <location line="+159"/>
<location line="+5"/>
<source>Bitcoin client</source>
<translation>Cliente Bitcoin</translation>
</message>
<message numerus="yes">
- <location line="+133"/>
+ <location line="+142"/>
<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>
@@ -592,7 +605,7 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t
<translation>Procesados %1 bloques del historial de transacciones.</translation>
</message>
<message numerus="yes">
- <location line="+20"/>
+ <location line="+23"/>
<source>%n hour(s)</source>
<translation><numerusform>%n hora</numerusform><numerusform>%n horas</numerusform></translation>
</message>
@@ -612,7 +625,7 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t
<translation>%1 atrás</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="+21"/>
<source>Last received block was generated %1 ago.</source>
<translation>El último bloque recibido fue generado hace %1.</translation>
</message>
@@ -637,27 +650,17 @@ Eric Young (eay@cryptsoft.com) y el software UPnP escrito por Thomas Bernard.</t
<translation>Información</translation>
</message>
<message>
- <location line="+77"/>
- <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="-152"/>
+ <location line="-85"/>
<source>Up to date</source>
<translation>Actualizado</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Catching up...</source>
<translation>Actualizando...</translation>
</message>
<message>
- <location line="+124"/>
- <source>Confirm transaction fee</source>
- <translation>Confirme la tarifa de la transacción</translation>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+130"/>
<source>Sent transaction</source>
<translation>Transacción enviada</translation>
</message>
@@ -680,7 +683,7 @@ Dirección: %4
</translation>
</message>
<message>
- <location line="+67"/>
+ <location line="+69"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation>El monedero está &lt;b&gt;cifrado&lt;/b&gt; y actualmente &lt;b&gt;desbloqueado&lt;/b&gt;</translation>
</message>
@@ -690,7 +693,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 filename="../bitcoin.cpp" line="+116"/>
+ <location filename="../bitcoin.cpp" line="+438"/>
<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>
@@ -912,7 +915,12 @@ Dirección: %4
<translation>(%1 bloqueado)</translation>
</message>
<message>
- <location line="+171"/>
+ <location line="+31"/>
+ <source>none</source>
+ <translation>nada</translation>
+ </message>
+ <message>
+ <location line="+140"/>
<source>Dust</source>
<translation>Basura</translation>
</message>
@@ -949,8 +957,8 @@ Dirección: %4
</message>
<message>
<location line="+1"/>
- <source>This label turns red, if the priority is smaller than &quot;medium&quot;</source>
- <translation>Esta etiqueta se torna roja si la prioridad es menor a &quot;media&quot;</translation>
+ <source>This label turns red, if the priority is smaller than &quot;medium&quot;.</source>
+ <translation>Esta etiqueta se muestra en rojo si la prioridad es menor que &quot;media&quot;.</translation>
</message>
<message>
<location line="+3"/>
@@ -1018,7 +1026,7 @@ Dirección: %4
<translation>&amp;Dirección</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+25"/>
+ <location filename="../editaddressdialog.cpp" line="+28"/>
<source>New receiving address</source>
<translation>Nueva dirección de recepción</translation>
</message>
@@ -1087,20 +1095,24 @@ Dirección: %4
</message>
</context>
<context>
- <name>GUIUtil::HelpMessageBox</name>
+ <name>HelpMessageDialog</name>
<message>
- <location filename="../guiutil.cpp" line="+597"/>
- <source>version</source>
- <translation>versión</translation>
+ <location filename="../forms/helpmessagedialog.ui" line="+19"/>
+ <source>Bitcoin Core - Command-line options</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <location line="+13"/>
+ <location filename="../utilitydialog.cpp" line="+38"/>
<source>Bitcoin Core</source>
<translation>Núcleo de Bitcoin</translation>
</message>
<message>
- <location line="-11"/>
+ <location line="+0"/>
+ <source>version</source>
+ <translation>versión</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Usage:</source>
<translation>Uso:</translation>
</message>
@@ -1229,7 +1241,7 @@ Dirección: %4
<translation>Opciones</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+13"/>
<source>&amp;Main</source>
<translation>&amp;Principal</translation>
</message>
@@ -1254,7 +1266,52 @@ Dirección: %4
<translation>&amp;Iniciar Bitcoin al iniciar el sistema</translation>
</message>
<message>
- <location line="+35"/>
+ <location line="+9"/>
+ <source>Size of &amp;database cache</source>
+ <translation>Tamaño de cache de la &amp;base de datos</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set database cache size in megabytes (default: 25)</source>
+ <translation>Establecer el tamaño de caché de la base de datos en megabytes (predeterminado: 25)</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>MB</source>
+ <translation>MB</translation>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Number of script &amp;verification threads</source>
+ <translation>Número de hilos de &amp;verificación de scripts</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
+ <translation>Configura el número de hilos para el script de verificación (hasta 16, 0 = auto, &lt;0 = leave that many cores free, por fecto: 0)</translation>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Connect to the Bitcoin network through a SOCKS proxy.</source>
+ <translation>Conectarse a la red Bitcoin a través de un proxy SOCKS.</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Connect through SOCKS proxy (default proxy):</source>
+ <translation>&amp;Conectarse a través de proxy SOCKS (proxy predeterminado):</translation>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
+ <translation>Dirección IP del proxy (p. ej. IPv4: 127.0.0.1 / IPv6: ::1)</translation>
+ </message>
+ <message>
+ <location line="+224"/>
+ <source>Active command-line options that override above options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
<source>Reset all client options to default.</source>
<translation>Restablecer todas las opciones del cliente a las predeterminadas.</translation>
</message>
@@ -1264,7 +1321,7 @@ Dirección: %4
<translation>&amp;Restablecer opciones</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="-323"/>
<source>&amp;Network</source>
<translation>&amp;Red</translation>
</message>
@@ -1279,32 +1336,17 @@ Dirección: %4
<translation>Mapear el puerto usando &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>Conectar a la red Bitcoin a través de un proxy SOCKS (ej. para conectar con la red Tor)</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>&amp;Connect through SOCKS proxy:</source>
- <translation>&amp;Conectar a través de un proxy SOCKS:</translation>
- </message>
- <message>
- <location line="+9"/>
+ <location line="+19"/>
<source>Proxy &amp;IP:</source>
<translation>Dirección &amp;IP del proxy:</translation>
</message>
<message>
- <location line="+19"/>
- <source>IP address of the proxy (e.g. 127.0.0.1)</source>
- <translation>Dirección IP del proxy (ej. 127.0.0.1)</translation>
- </message>
- <message>
- <location line="+7"/>
+ <location line="+32"/>
<source>&amp;Port:</source>
<translation>&amp;Puerto:</translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+25"/>
<source>Port of the proxy (e.g. 9050)</source>
<translation>Puerto del servidor proxy (ej. 9050)</translation>
</message>
@@ -1389,7 +1431,7 @@ Dirección: %4
<translation>Mostrar moneda y características de control (Avanzado)</translation>
</message>
<message>
- <location line="+71"/>
+ <location line="+136"/>
<source>&amp;OK</source>
<translation>&amp;Aceptar</translation>
</message>
@@ -1399,44 +1441,38 @@ Dirección: %4
<translation>&amp;Cancelar</translation>
</message>
<message>
- <location line="+10"/>
- <source>&amp;Apply</source>
- <translation>&amp;Aplicar</translation>
- </message>
- <message>
- <location filename="../optionsdialog.cpp" line="+63"/>
+ <location filename="../optionsdialog.cpp" line="+67"/>
<source>default</source>
<translation>predeterminado</translation>
</message>
<message>
- <location line="+131"/>
+ <location line="+57"/>
+ <source>none</source>
+ <translation>nada</translation>
+ </message>
+ <message>
+ <location line="+75"/>
<source>Confirm options reset</source>
<translation>Confirme el restablecimiento de las opciones</translation>
</message>
<message>
<location line="+1"/>
- <source>Some settings may require a client restart to take effect.</source>
- <translation>Algunas configuraciones pueden requerir un reinicio del cliente para que sean efectivas.</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Do you want to proceed?</source>
- <translation>¿Quiere proceder?</translation>
+ <location line="+29"/>
+ <source>Client restart required to activate changes.</source>
+ <translation>Se necesita reiniciar el cliente para activar los cambios.</translation>
</message>
<message>
- <location line="+42"/>
- <location line="+9"/>
- <source>Warning</source>
- <translation>Aviso</translation>
+ <location line="-29"/>
+ <source>Client will be shutdown, do you want to proceed?</source>
+ <translation>El cliente se cerrará. ¿Desea continuar?</translation>
</message>
<message>
- <location line="-9"/>
- <location line="+9"/>
- <source>This setting will take effect after restarting Bitcoin.</source>
- <translation>Esta configuración tendrá efecto tras reiniciar Bitcoin.</translation>
+ <location line="+33"/>
+ <source>This change would require a client restart.</source>
+ <translation>Este cambio exige el reinicio del cliente.</translation>
</message>
<message>
- <location line="+29"/>
+ <location line="+34"/>
<source>The supplied proxy address is invalid.</source>
<translation>La dirección proxy indicada es inválida.</translation>
</message>
@@ -1450,22 +1486,22 @@ Dirección: %4
</message>
<message>
<location line="+50"/>
- <location line="+214"/>
+ <location line="+231"/>
<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="-140"/>
+ <location line="-155"/>
<source>Unconfirmed:</source>
<translation>No confirmado(s):</translation>
</message>
<message>
- <location line="-81"/>
+ <location line="-83"/>
<source>Wallet</source>
<translation>Monedero</translation>
</message>
<message>
- <location line="+49"/>
+ <location line="+51"/>
<source>Confirmed:</source>
<translation>Confirmado:</translation>
</message>
@@ -1500,7 +1536,7 @@ Dirección: %4
<translation>Su balance actual total</translation>
</message>
<message>
- <location line="+56"/>
+ <location line="+71"/>
<source>&lt;b&gt;Recent transactions&lt;/b&gt;</source>
<translation>&lt;b&gt;Movimientos recientes&lt;/b&gt;</translation>
</message>
@@ -1514,7 +1550,8 @@ Dirección: %4
<context>
<name>PaymentServer</name>
<message>
- <location filename="../paymentserver.cpp" line="+397"/>
+ <location filename="../paymentserver.cpp" line="+403"/>
+ <location line="+13"/>
<source>URI handling</source>
<translation>Gestión de URI</translation>
</message>
@@ -1524,24 +1561,52 @@ Dirección: %4
<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>
<message>
- <location line="+91"/>
+ <location line="+96"/>
<source>Requested payment amount of %1 is too small (considered dust).</source>
<translation>La cantidad del pago solicitado (%1) es demasiado pequeña (considerada polvo).</translation>
</message>
<message>
- <location line="-204"/>
- <location line="+195"/>
+ <location line="-221"/>
+ <location line="+212"/>
<location line="+13"/>
+ <location line="+95"/>
+ <location line="+18"/>
+ <location line="+16"/>
<source>Payment request error</source>
<translation>Error en petición de pago</translation>
</message>
<message>
- <location line="-207"/>
+ <location line="-353"/>
<source>Cannot start bitcoin: click-to-pay handler</source>
<translation>No se pudo iniciar bitcoin: manejador de pago-al-clic</translation>
</message>
<message>
- <location line="+195"/>
+ <location line="+58"/>
+ <source>Net manager warning</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Your active proxy doesn&apos;t support SOCKS5, which is required for payment requests via proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>Payment request fetch URL is invalid: %1</source>
+ <translation>La URL de obtención de la solicitud de pago es inválida: %1</translation>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Payment request file handling</source>
+ <translation>Procesado del archivo de solicitud de pago</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Payment request file can not be read or processed! This can be caused by an invalid payment request file.</source>
+ <translation>¡No se ha podido leer o procesar el archivo de solicitud de pago! Esto puede deberse a un archivo inválido de solicitud de pago.</translation>
+ </message>
+ <message>
+ <location line="+73"/>
<source>Unverified payment requests to custom payment scripts are unsupported.</source>
<translation>No están soportadas las peticiones inseguras a scripts de pago personalizados</translation>
</message>
@@ -1551,24 +1616,27 @@ Dirección: %4
<translation>Devolución de %1</translation>
</message>
<message>
- <location line="+42"/>
+ <location line="+43"/>
<source>Error communicating with %1: %2</source>
<translation>Error en la comunicación con %1: %2</translation>
</message>
<message>
- <location line="+28"/>
+ <location line="+24"/>
+ <source>Payment request can not be parsed or processed!</source>
+ <translation>¡La solicitud de pago no puede leerse ni procesarse!</translation>
+ </message>
+ <message>
+ <location line="+11"/>
<source>Bad response from server %1</source>
<translation>Respuesta errónea del servidor %1</translation>
</message>
<message>
- <location line="+32"/>
+ <location line="+33"/>
<source>Payment acknowledged</source>
<translation>Pago aceptado</translation>
</message>
<message>
- <location line="-55"/>
- <location line="+27"/>
- <location line="+17"/>
+ <location line="-11"/>
<source>Network request error</source>
<translation>Error en petición de red</translation>
</message>
@@ -1576,18 +1644,18 @@ Dirección: %4
<context>
<name>QObject</name>
<message>
- <location filename="../bitcoin.cpp" line="+119"/>
- <location line="+5"/>
+ <location filename="../bitcoin.cpp" line="+71"/>
+ <location line="+11"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-4"/>
+ <location line="+1"/>
<source>Error: Specified data directory &quot;%1&quot; does not exist.</source>
<translation>Error: El directorio de datos especificado &quot;%1&quot; no existe.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="-12"/>
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation>Error: Combinación no válida de -regtest y -testnet.</translation>
</message>
@@ -1629,15 +1697,16 @@ Dirección: %4
<location line="+23"/>
<location line="+23"/>
<location line="+36"/>
- <location line="+53"/>
+ <location line="+23"/>
+ <location line="+36"/>
<location line="+23"/>
<location line="+23"/>
- <location filename="../rpcconsole.cpp" line="+360"/>
+ <location filename="../rpcconsole.cpp" line="+359"/>
<source>N/A</source>
<translation>N/D</translation>
</message>
<message>
- <location line="-217"/>
+ <location line="-223"/>
<source>Client version</source>
<translation>Versión del cliente</translation>
</message>
@@ -1652,7 +1721,12 @@ Dirección: %4
<translation>Ventana de depuración</translation>
</message>
<message>
- <location line="+78"/>
+ <location line="+25"/>
+ <source>General</source>
+ <translation>General</translation>
+ </message>
+ <message>
+ <location line="+53"/>
<source>Using OpenSSL version</source>
<translation>Utilizando la versión OpenSSL</translation>
</message>
@@ -1668,16 +1742,16 @@ Dirección: %4
</message>
<message>
<location line="+7"/>
- <source>Number of connections</source>
- <translation>Número de conexiones</translation>
+ <source>Name</source>
+ <translation>Nombre</translation>
</message>
<message>
<location line="+23"/>
- <source>On testnet</source>
- <translation>En la red de pruebas</translation>
+ <source>Number of connections</source>
+ <translation>Número de conexiones</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+29"/>
<source>Block chain</source>
<translation>Cadena de bloques</translation>
</message>
@@ -1702,16 +1776,6 @@ Dirección: %4
<translation>&amp;Abrir</translation>
</message>
<message>
- <location line="+16"/>
- <source>Command-line options</source>
- <translation>Opciones de la línea de órdenes</translation>
- </message>
- <message>
- <location line="+10"/>
- <source>&amp;Show</source>
- <translation>&amp;Mostrar</translation>
- </message>
- <message>
<location line="+24"/>
<source>&amp;Console</source>
<translation>&amp;Consola</translation>
@@ -1742,17 +1806,12 @@ Dirección: %4
<translation>Fuera:</translation>
</message>
<message>
- <location line="-541"/>
+ <location line="-521"/>
<source>Build date</source>
<translation>Fecha de compilación</translation>
</message>
<message>
- <location line="-79"/>
- <source>Bitcoin Core</source>
- <translation>Núcleo de Bitcoin</translation>
- </message>
- <message>
- <location line="+279"/>
+ <location line="+206"/>
<source>Debug log file</source>
<translation>Archivo de registro de depuración</translation>
</message>
@@ -1762,11 +1821,6 @@ Dirección: %4
<translation>Abrir el archivo de registro de depuración en el directorio actual de datos. Esto puede llevar varios segundos para archivos de registro grandes.</translation>
</message>
<message>
- <location line="+26"/>
- <source>Show the Bitcoin-Core help message to get a list with possible Bitcoin command-line options.</source>
- <translation>Mostrar el mensaje de ayuda de Bitcoin-Qt que enumera las opciones disponibles de línea de órdenes para Bitcoin.</translation>
- </message>
- <message>
<location line="+76"/>
<source>Clear console</source>
<translation>Borrar consola</translation>
@@ -1787,7 +1841,7 @@ Dirección: %4
<translation>Escriba &lt;b&gt;help&lt;/b&gt; para ver un resumen de los comandos disponibles.</translation>
</message>
<message>
- <location line="+128"/>
+ <location line="+122"/>
<source>%1 B</source>
<translation>%1 B</translation>
</message>
@@ -1830,12 +1884,7 @@ Dirección: %4
<translation>Cantidad</translation>
</message>
<message>
- <location line="+19"/>
- <source>The amount to request</source>
- <translation>La cantidad a solicitar</translation>
- </message>
- <message>
- <location line="-32"/>
+ <location line="-13"/>
<source>&amp;Label:</source>
<translation>&amp;Etiqueta:</translation>
</message>
@@ -1845,12 +1894,7 @@ Dirección: %4
<translation>Mensaje:</translation>
</message>
<message>
- <location line="+20"/>
- <source>The message to attach to payment request</source>
- <translation>El mensaje a adjuntar a la solicitud de pago</translation>
- </message>
- <message>
- <location line="-37"/>
+ <location line="-17"/>
<source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation>Reutilizar una de las direcciones previamente usadas para recibir. Reutilizar direcciones tiene problemas de seguridad y privacidad. No lo uses a menos que antes regeneres una solicitud de pago.</translation>
</message>
@@ -1861,16 +1905,26 @@ Dirección: %4
</message>
<message>
<location line="+27"/>
- <source>The label to associate with the new receiving address</source>
- <translation>La etiqueta a asociar con la dirección para recibir</translation>
+ <source>An optional label to associate with the new receiving address</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
- <source>Use this form to request payments. All fields are optional.</source>
- <translation>Utiliza este formulario para solicitar pagos. Todos los campos son opcionales.</translation>
+ <location line="+7"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+56"/>
+ <location line="+7"/>
+ <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+39"/>
+ <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+17"/>
<source>Clear all fields of the form.</source>
<translation>Limpiar todos los campos del formulario.</translation>
</message>
@@ -1886,11 +1940,11 @@ Dirección: %4
</message>
<message>
<location line="+47"/>
- <source>Previously requested payments</source>
- <translation>Pagos solicitados anteriormente</translation>
+ <source>Requested payments</source>
+ <translation>Pagos solicitados</translation>
</message>
<message>
- <location line="+12"/>
+ <location line="+16"/>
<source>Show the selected request (does the same as double clicking an entry)</source>
<translation>Muestra la petición seleccionada (También doble clic)</translation>
</message>
@@ -1981,7 +2035,7 @@ Dirección: %4
<context>
<name>RecentRequestsTableModel</name>
<message>
- <location filename="../recentrequeststablemodel.cpp" line="+14"/>
+ <location filename="../recentrequeststablemodel.cpp" line="+24"/>
<source>Date</source>
<translation>Fecha</translation>
</message>
@@ -2001,7 +2055,7 @@ Dirección: %4
<translation>Cantidad</translation>
</message>
<message>
- <location line="+36"/>
+ <location line="+38"/>
<source>(no label)</source>
<translation>(sin etiqueta)</translation>
</message>
@@ -2016,7 +2070,7 @@ Dirección: %4
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
<location filename="../sendcoinsdialog.cpp" line="+381"/>
- <location line="+81"/>
+ <location line="+80"/>
<source>Send Coins</source>
<translation>Enviar monedas</translation>
</message>
@@ -2126,7 +2180,7 @@ Dirección: %4
<translation>&amp;Enviar</translation>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-229"/>
+ <location filename="../sendcoinsdialog.cpp" line="-228"/>
<source>Confirm send coins</source>
<translation>Confirmar el envío de monedas</translation>
</message>
@@ -2229,22 +2283,22 @@ Dirección: %4
<translation>La transacción fue rechazada. Esto puede haber ocurrido si alguna de las monedas ya estaba gastada o si ha usado una copia de wallet.dat y las monedas se gastaron en la copia pero no se han marcado como gastadas aqui.</translation>
</message>
<message>
- <location line="+113"/>
+ <location line="+112"/>
<source>Warning: Invalid Bitcoin address</source>
<translation>Alerta: Dirección de Bitcoin inválida</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+21"/>
<source>(no label)</source>
<translation>(sin etiqueta)</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="-11"/>
<source>Warning: Unknown change address</source>
<translation>Alerta: Dirección de Bitcoin inválida</translation>
</message>
<message>
- <location line="-378"/>
+ <location line="-366"/>
<source>Are you sure you want to send?</source>
<translation>¿Está seguro que desea enviar?</translation>
</message>
@@ -2268,13 +2322,13 @@ Dirección: %4
<name>SendCoinsEntry</name>
<message>
<location filename="../forms/sendcoinsentry.ui" line="+131"/>
- <location line="+501"/>
+ <location line="+521"/>
<location line="+536"/>
<source>A&amp;mount:</source>
<translation>Ca&amp;ntidad:</translation>
</message>
<message>
- <location line="-1132"/>
+ <location line="-1152"/>
<source>Pay &amp;To:</source>
<translation>&amp;Pagar a:</translation>
</message>
@@ -2320,23 +2374,33 @@ Dirección: %4
</message>
<message>
<location line="+7"/>
- <location line="+504"/>
+ <location line="+524"/>
<location line="+536"/>
<source>Remove this entry</source>
<translation>Eliminar esta transacción</translation>
</message>
<message>
- <location line="-40"/>
+ <location line="-1008"/>
+ <source>Message:</source>
+ <translation>Mensaje:</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+958"/>
<source>This is a verified payment request.</source>
<translation>Esto es una petición de pago verificado.</translation>
</message>
<message>
- <location line="-971"/>
+ <location line="-991"/>
<source>Enter a label for this address to add it to the list of used addresses</source>
<translation>Introduce una etiqueta para esta dirección para añadirla a la lista de direcciones utilizadas</translation>
</message>
<message>
- <location line="+439"/>
+ <location line="+459"/>
<source>This is an unverified payment request.</source>
<translation>Esto es una petición de pago no verificado.</translation>
</message>
@@ -2359,6 +2423,19 @@ Dirección: %4
</message>
</context>
<context>
+ <name>ShutdownWindow</name>
+ <message>
+ <location filename="../utilitydialog.cpp" line="+48"/>
+ <source>Bitcoin Core is shutting down...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Do not shut down the computer until this window disappears.</source>
+ <translation>No apague la máquina hasta que desaparezca esta ventana.</translation>
+ </message>
+</context>
+<context>
<name>SignVerifyMessageDialog</name>
<message>
<location filename="../forms/signverifymessagedialog.ui" line="+14"/>
@@ -2366,7 +2443,7 @@ Dirección: %4
<translation>Firmas - Firmar / verificar un mensaje</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+10"/>
<source>&amp;Sign Message</source>
<translation>&amp;Firmar mensaje</translation>
</message>
@@ -2554,7 +2631,7 @@ Dirección: %4
<context>
<name>SplashScreen</name>
<message>
- <location filename="../splashscreen.cpp" line="+26"/>
+ <location filename="../splashscreen.cpp" line="+28"/>
<source>Bitcoin Core</source>
<translation>Núcleo de Bitcoin</translation>
</message>
@@ -2653,12 +2730,12 @@ Dirección: %4
<location line="+12"/>
<location line="+45"/>
<location line="+17"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Credit</source>
<translation>Crédito</translation>
</message>
<message numerus="yes">
- <location line="-120"/>
+ <location line="-125"/>
<source>matures in %n more block(s)</source>
<translation><numerusform>disponible en %n bloque más</numerusform><numerusform>disponible en %n bloques más</numerusform></translation>
</message>
@@ -2671,12 +2748,12 @@ Dirección: %4
<location line="+44"/>
<location line="+8"/>
<location line="+15"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Debit</source>
<translation>Débito</translation>
</message>
<message>
- <location line="-57"/>
+ <location line="-62"/>
<source>Transaction fee</source>
<translation>Comisión de transacción</translation>
</message>
@@ -2687,11 +2764,12 @@ Dirección: %4
</message>
<message>
<location line="+6"/>
+ <location line="+9"/>
<source>Message</source>
<translation>Mensaje</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="-7"/>
<source>Comment</source>
<translation>Comentario</translation>
</message>
@@ -2701,7 +2779,7 @@ Dirección: %4
<translation>Identificador de transacción</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+18"/>
<source>Merchant</source>
<translation>Vendedor</translation>
</message>
@@ -2741,7 +2819,7 @@ Dirección: %4
<translation>falso</translation>
</message>
<message>
- <location line="-227"/>
+ <location line="-232"/>
<source>, has not been successfully broadcast yet</source>
<translation>, todavía no se ha sido difundido satisfactoriamente</translation>
</message>
@@ -2791,8 +2869,13 @@ Dirección: %4
<source>Amount</source>
<translation>Cantidad</translation>
</message>
+ <message>
+ <location line="+59"/>
+ <source>Immature (%1 confirmations, will be available after %2)</source>
+ <translation>No vencidos (%1 confirmaciones. Estarán disponibles al cabo de %2)</translation>
+ </message>
<message numerus="yes">
- <location line="+57"/>
+ <location line="+16"/>
<source>Open for %n more block(s)</source>
<translation><numerusform>Abrir para %n bloque más</numerusform><numerusform>Abrir para %n bloques más</numerusform></translation>
</message>
@@ -2812,17 +2895,13 @@ Dirección: %4
<translation>No confirmado (%1 de %2 confirmaciones)</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="-22"/>
+ <location line="+25"/>
<source>Confirmed (%1 confirmations)</source>
<translation>Confirmado (%1 confirmaciones)</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>El saldo recién minado estará disponible cuando venza el plazo en %n bloque más</numerusform><numerusform>El saldo recién minado estará disponible cuando venza el plazo en %n bloques más</numerusform></translation>
- </message>
<message>
- <location line="+5"/>
+ <location line="-22"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation>Este bloque no ha sido recibido por otros nodos y probablemente no sea aceptado!</translation>
</message>
@@ -2832,7 +2911,7 @@ Dirección: %4
<translation>Generado pero no aceptado</translation>
</message>
<message>
- <location line="+43"/>
+ <location line="+62"/>
<source>Received with</source>
<translation>Recibido con</translation>
</message>
@@ -3128,7 +3207,7 @@ Dirección: %4
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+217"/>
+ <location filename="../bitcoinstrings.cpp" line="+221"/>
<source>Usage:</source>
<translation>Uso:</translation>
</message>
@@ -3151,7 +3230,7 @@ Dirección: %4
</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+22"/>
<source>Specify configuration file (default: bitcoin.conf)</source>
<translation>Especificar archivo de configuración (predeterminado: bitcoin.conf)
</translation>
@@ -3173,7 +3252,7 @@ Dirección: %4
<translation>Establecer el tamaño de caché de la base de datos en megabytes (predeterminado: 25)</translation>
</message>
<message>
- <location line="-27"/>
+ <location line="-26"/>
<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>
@@ -3183,7 +3262,7 @@ Dirección: %4
<translation>Mantener como máximo &lt;n&gt; conexiones a pares (predeterminado: 125)</translation>
</message>
<message>
- <location line="-50"/>
+ <location line="-51"/>
<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>
@@ -3193,22 +3272,22 @@ Dirección: %4
<translation>Especifique su propia dirección pública</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<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="-147"/>
+ <location line="-148"/>
<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="-33"/>
+ <location line="-36"/>
<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="+31"/>
+ <location line="+34"/>
<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>
@@ -3219,7 +3298,7 @@ Dirección: %4
</translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>Ejecutar en segundo plano como daemon y aceptar comandos
</translation>
@@ -3231,12 +3310,12 @@ Dirección: %4
</translation>
</message>
<message>
- <location line="-117"/>
+ <location line="-118"/>
<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="-92"/>
+ <location line="-95"/>
<source>%s, you must set a rpcpassword in the configuration file:
%s
It is recommended you use the following random password:
@@ -3287,6 +3366,11 @@ Por ejemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+4"/>
+ <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</source>
+ <translation>Ingresar en el modo de prueba de regresión, que utiliza una cadena especial en la que los bloques se pueden resolver instantáneamente.</translation>
+ </message>
+ <message>
+ <location line="+3"/>
<source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
<translation>¡Error: se ha rechazado la transacción! Esto puede ocurrir si ya se han gastado algunas de las monedas del monedero, como ocurriría si hubiera hecho una copia de wallet.dat y se hubieran gastado monedas a partir de la copia, con lo que no se habrían marcado aquí como gastadas.</translation>
</message>
@@ -3392,6 +3476,11 @@ Por ejemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+1"/>
+ <source>Do not load the wallet and disable wallet RPC calls</source>
+ <translation>No cargar el monedero y desactivar las llamadas RPC del monedero</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>
@@ -3556,7 +3645,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Enviar comando a servidor Bitcoin</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+7"/>
<source>Set maximum block size in bytes (default: %d)</source>
<translation>Establecer tamaño máximo de bloque en bytes (por defecto: %d)</translation>
</message>
@@ -3576,7 +3665,12 @@ Por ejemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Iniciar servidor Bitcoin</translation>
</message>
<message>
- <location line="+12"/>
+ <location line="+3"/>
+ <source>This is intended for regression testing tools and app development.</source>
+ <translation>Esto afecta a las herramientas de prueba de regresión y al desarrollo informático de la aplicación.</translation>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Usage (deprecated, use bitcoin-cli):</source>
<translation>Uso (desaconsejado, usar bitcoin-cli)</translation>
</message>
@@ -3601,7 +3695,12 @@ Por ejemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>El monedero %s se encuentra fuera del directorio de datos %s</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="+2"/>
+ <source>Wallet options:</source>
+ <translation>Opciones de monedero:</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source>
<translation>Aviso: Argumento -debugnet anticuado, utilice -debug=net</translation>
</message>
@@ -3611,12 +3710,12 @@ Por ejemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Usted necesita reconstruir la base de datos utilizando -reindex para cambiar -txindex</translation>
</message>
<message>
- <location line="-78"/>
+ <location line="-79"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation>Importa los bloques desde un archivo blk000??.dat externo</translation>
</message>
<message>
- <location line="-104"/>
+ <location line="-105"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation>Ejecutar un comando cuando se reciba una alerta importante o cuando veamos un fork demasiado largo (%s en cmd se reemplazará por el mensaje)</translation>
</message>
@@ -3636,7 +3735,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Configura el número de hilos para el script de verificación (hasta 16, 0 = auto, &lt;0 = leave that many cores free, por fecto: 0)</translation>
</message>
<message>
- <location line="+88"/>
+ <location line="+89"/>
<source>Information</source>
<translation>Información</translation>
</message>
@@ -3686,11 +3785,6 @@ Por ejemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Enviar información de trazas/depuración a la consola en lugar de al archivo debug.log</translation>
</message>
<message>
- <location line="+1"/>
- <source>Send trace/debug info to debugger</source>
- <translation>Enviar información de trazas/depuración al depurador</translation>
- </message>
- <message>
<location line="+6"/>
<source>Set minimum block size in bytes (default: 0)</source>
<translation>Establecer tamaño mínimo de bloque en bytes (predeterminado: 0)</translation>
@@ -3716,7 +3810,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Error de sistema: </translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Transaction amount too small</source>
<translation>Monto de la transacción muy pequeño</translation>
</message>
@@ -3747,7 +3841,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Warning</source>
<translation>Aviso</translation>
</message>
@@ -3767,41 +3861,41 @@ Por ejemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>wallet.dat corrupto. Ha fallado la recuperación.</translation>
</message>
<message>
- <location line="-57"/>
+ <location line="-58"/>
<source>Password for JSON-RPC connections</source>
<translation>Contraseña para las conexiones JSON-RPC
</translation>
</message>
<message>
- <location line="-69"/>
+ <location line="-70"/>
<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="+79"/>
+ <location line="+80"/>
<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="-131"/>
+ <location line="-132"/>
<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="+160"/>
+ <location line="+161"/>
<source>Upgrade wallet to latest format</source>
<translation>Actualizar el monedero al último formato</translation>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<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>
</message>
<message>
- <location line="-12"/>
+ <location line="-11"/>
<source>Rescan the block chain for missing wallet transactions</source>
<translation>Volver a examinar la cadena de bloques en busca de transacciones del monedero perdidas</translation>
</message>
@@ -3812,7 +3906,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</translation>
</message>
<message>
- <location line="-29"/>
+ <location line="-30"/>
<source>Server certificate file (default: server.cert)</source>
<translation>Certificado del servidor (predeterminado: server.cert)
</translation>
@@ -3830,17 +3924,17 @@ Por ejemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Unable to bind to %s on this computer (bind returned error %d, %s)</source>
<translation>No es posible conectar con %s en este sistema (bind ha dado el error %d, %s)</translation>
</message>
<message>
- <location line="-106"/>
+ <location line="-107"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation>Permitir búsquedas DNS para -addnode, -seednode y -connect</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+60"/>
<source>Loading addresses...</source>
<translation>Cargando direcciones...</translation>
</message>
@@ -3880,7 +3974,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Solicitada versión de proxy -socks desconocida: %i</translation>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation>No se puede resolver la dirección de -bind: &apos;%s&apos;</translation>
</message>
@@ -3890,7 +3984,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>No se puede resolver la dirección de -externalip: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+47"/>
+ <location line="+48"/>
<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>
@@ -3910,7 +4004,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Cargando el índice de bloques...</translation>
</message>
<message>
- <location line="-61"/>
+ <location line="-62"/>
<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>
@@ -3920,12 +4014,12 @@ Por ejemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>No es posible conectar con %s en este sistema. Probablemente Bitcoin ya está ejecutándose.</translation>
</message>
<message>
- <location line="+94"/>
+ <location line="+95"/>
<source>Loading wallet...</source>
<translation>Cargando monedero...</translation>
</message>
<message>
- <location line="-55"/>
+ <location line="-56"/>
<source>Cannot downgrade wallet</source>
<translation>No se puede rebajar el monedero</translation>
</message>
@@ -3935,7 +4029,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>No se puede escribir la dirección predeterminada</translation>
</message>
<message>
- <location line="+66"/>
+ <location line="+67"/>
<source>Rescanning...</source>
<translation>Reexplorando...</translation>
</message>
@@ -3955,7 +4049,7 @@ Por ejemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Error</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-35"/>
<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 4aa88cec76..8188513826 100644
--- a/src/qt/locale/bitcoin_es_CL.ts
+++ b/src/qt/locale/bitcoin_es_CL.ts
@@ -3,13 +3,13 @@
<name>AboutDialog</name>
<message>
<location filename="../forms/aboutdialog.ui" line="+14"/>
- <source>About Bitcoin</source>
- <translation>Sobre Bitcoin</translation>
+ <source>About Bitcoin Core</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+39"/>
- <source>&lt;b&gt;Bitcoin&lt;/b&gt; version</source>
- <translation>&lt;b&gt;Bitcoin&lt;/b&gt; - versión </translation>
+ <source>&lt;b&gt;Bitcoin Core&lt;/b&gt; version</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+57"/>
@@ -30,13 +30,13 @@ el OpenSSL Toolkit (http://www.openssl.org/), software criptográfico escrito po
Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.</translation>
</message>
<message>
- <location filename="../aboutdialog.cpp" line="+14"/>
+ <location filename="../utilitydialog.cpp" line="+29"/>
<source>Copyright</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+0"/>
- <source>The Bitcoin developers</source>
+ <source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
</context>
@@ -73,7 +73,7 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.</tran
<translation type="unfinished"/>
</message>
<message>
- <location filename="../addressbookpage.cpp" line="+72"/>
+ <location filename="../addressbookpage.cpp" line="+74"/>
<source>&amp;Copy Address</source>
<translation>&amp;Copia dirección</translation>
</message>
@@ -143,7 +143,7 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.</tran
<translation>&amp;Editar</translation>
</message>
<message>
- <location line="+197"/>
+ <location line="+194"/>
<source>Export Address List</source>
<translation type="unfinished"/>
</message>
@@ -154,19 +154,19 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.</tran
</message>
<message>
<location line="+13"/>
- <source>Error exporting</source>
- <translation>Exportar errores</translation>
+ <source>Exporting Failed</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation>No se pudo escribir al archivo %1.</translation>
+ <location line="+1"/>
+ <source>There was an error trying to save the address list to %1.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<name>AddressTableModel</name>
<message>
- <location filename="../addresstablemodel.cpp" line="+164"/>
+ <location filename="../addresstablemodel.cpp" line="+168"/>
<source>Label</source>
<translation>Etiqueta</translation>
</message>
@@ -204,7 +204,7 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.</tran
<translation>Repite nueva contraseña:</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="+34"/>
+ <location filename="../askpassphrasedialog.cpp" line="+40"/>
<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>Introduce la nueva contraseña para la billetera.&lt;br/&gt;Por favor utiliza un contraseña &lt;b&gt;de 10 o mas caracteres aleatorios&lt;/b&gt;, u &lt;b&gt;ocho o mas palabras&lt;/b&gt;.</translation>
</message>
@@ -261,7 +261,7 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.</tran
<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: Cualquier versión anterior que hayas realizado de tu archivo de billetera será reemplazada por el nuevo archivo de billetera encriptado. Por razones de seguridad, los respaldos anteriores de los archivos de billetera se volverán inútiles en tanto comiences a usar la nueva billetera encriptada.</translation>
</message>
<message>
<location line="+100"/>
@@ -325,22 +325,27 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.</tran
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+250"/>
+ <location filename="../bitcoingui.cpp" line="+295"/>
<source>Sign &amp;message...</source>
<translation>Firmar &amp;Mensaje...</translation>
</message>
<message>
- <location line="+254"/>
+ <location line="+335"/>
<source>Synchronizing with network...</source>
<translation>Sincronizando con la red...</translation>
</message>
<message>
- <location line="-324"/>
+ <location line="-407"/>
<source>&amp;Overview</source>
<translation>&amp;Vista general</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="-137"/>
+ <source>Node</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+138"/>
<source>Show general overview of wallet</source>
<translation>Muestra una vista general de la billetera</translation>
</message>
@@ -355,7 +360,7 @@ 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="+15"/>
+ <location line="+17"/>
<source>E&amp;xit</source>
<translation>&amp;Salir</translation>
</message>
@@ -401,22 +406,37 @@ 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="+10"/>
+ <source>&amp;Sending addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Receiving addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open &amp;URI...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+325"/>
<source>Importing blocks from disk...</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
<source>Reindexing blocks on disk...</source>
- <translation type="unfinished"/>
+ <translation>Cargando el index de bloques...</translation>
</message>
<message>
- <location line="-322"/>
+ <location line="-405"/>
<source>Send coins to a Bitcoin address</source>
<translation>Enviar monedas a una dirección bitcoin</translation>
</message>
<message>
- <location line="+47"/>
+ <location line="+49"/>
<source>Modify configuration options for Bitcoin</source>
<translation>Modifica las opciones de configuración de bitcoin</translation>
</message>
@@ -446,20 +466,17 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.</tran
<translation type="unfinished"/>
</message>
<message>
- <location line="-180"/>
- <location line="+6"/>
- <location line="+513"/>
+ <location line="+430"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-519"/>
- <location line="+6"/>
+ <location line="-643"/>
<source>Wallet</source>
<translation>Cartera</translation>
</message>
<message>
- <location line="+109"/>
+ <location line="+146"/>
<source>&amp;Send</source>
<translation type="unfinished"/>
</message>
@@ -469,13 +486,7 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.</tran
<translation type="unfinished"/>
</message>
<message>
- <location line="+28"/>
- <location line="+2"/>
- <source>&amp;About Bitcoin</source>
- <translation>&amp;Sobre Bitcoin</translation>
- </message>
- <message>
- <location line="+14"/>
+ <location line="+46"/>
<location line="+2"/>
<source>&amp;Show / Hide</source>
<translation>&amp;Mostrar/Ocultar</translation>
@@ -493,7 +504,7 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.</tran
<message>
<location line="+7"/>
<source>Sign messages with your Bitcoin addresses to prove you own them</source>
- <translation type="unfinished"/>
+ <translation>Firmar un mensaje para provar que usted es dueño de esta dirección</translation>
</message>
<message>
<location line="+2"/>
@@ -501,64 +512,80 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.</tran
<translation type="unfinished"/>
</message>
<message>
- <location line="+35"/>
+ <location line="+48"/>
<source>&amp;File</source>
<translation>&amp;Archivo</translation>
</message>
<message>
- <location line="+10"/>
+ <location line="+14"/>
<source>&amp;Settings</source>
<translation>&amp;Configuración</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>&amp;Help</source>
<translation>&amp;Ayuda</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+15"/>
<source>Tabs toolbar</source>
<translation>Barra de pestañas</translation>
</message>
<message>
- <location line="-235"/>
- <location line="+294"/>
+ <location line="-284"/>
+ <location line="+376"/>
<source>[testnet]</source>
<translation>[red-de-pruebas]</translation>
</message>
<message>
- <location line="-177"/>
+ <location line="-401"/>
+ <source>Bitcoin Core</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+163"/>
<source>Request payments (generates QR codes and bitcoin: URIs)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+63"/>
- <source>&amp;Used sending addresses...</source>
+ <location line="+29"/>
+ <location line="+2"/>
+ <source>&amp;About Bitcoin Core</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="+35"/>
<source>Show the list of used sending addresses and labels</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Used &amp;receiving addresses...</source>
+ <location line="+2"/>
+ <source>Show the list of used receiving addresses and labels</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open a bitcoin: URI or payment request</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Command-line options</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
- <source>Show the list of used receiving addresses and labels</source>
+ <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+106"/>
+ <location line="+159"/>
<location line="+5"/>
<source>Bitcoin client</source>
<translation>Cliente Bitcoin</translation>
</message>
<message numerus="yes">
- <location line="+120"/>
+ <location line="+142"/>
<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>
@@ -578,7 +605,7 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.</tran
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+20"/>
+ <location line="+23"/>
<source>%n hour(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -598,7 +625,7 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.</tran
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
+ <location line="+21"/>
<source>Last received block was generated %1 ago.</source>
<translation type="unfinished"/>
</message>
@@ -615,35 +642,25 @@ Eric Young (eay@cryptsoft.com) y UPnP software escrito por Thomas Bernard.</tran
<message>
<location line="+3"/>
<source>Warning</source>
- <translation type="unfinished"/>
+ <translation>Atención</translation>
</message>
<message>
<location line="+3"/>
<source>Information</source>
- <translation type="unfinished"/>
+ <translation>Información</translation>
</message>
<message>
- <location line="+77"/>
- <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="-152"/>
+ <location line="-85"/>
<source>Up to date</source>
<translation>Actualizado</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Catching up...</source>
<translation>Recuperando...</translation>
</message>
<message>
- <location line="+124"/>
- <source>Confirm transaction fee</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+130"/>
<source>Sent transaction</source>
<translation>Transacción enviada</translation>
</message>
@@ -665,17 +682,7 @@ Tipo: %3
Dirección: %4</translation>
</message>
<message>
- <location line="+34"/>
- <source>URI handling</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+0"/>
- <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="+45"/>
+ <location line="+69"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation>La billetera esta &lt;b&gt;codificada&lt;/b&gt; y actualmente &lt;b&gt;desbloqueda&lt;/b&gt;</translation>
</message>
@@ -685,7 +692,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 filename="../bitcoin.cpp" line="+110"/>
+ <location filename="../bitcoin.cpp" line="+438"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation type="unfinished"/>
</message>
@@ -693,8 +700,300 @@ Dirección: %4</translation>
<context>
<name>ClientModel</name>
<message>
- <location filename="../clientmodel.cpp" line="+115"/>
+ <location filename="../clientmodel.cpp" line="+119"/>
<source>Network Alert</source>
+ <translation>Alerta de Red</translation>
+ </message>
+</context>
+<context>
+ <name>CoinControlDialog</name>
+ <message>
+ <location filename="../forms/coincontroldialog.ui" line="+14"/>
+ <source>Coin Control Address Selection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>Quantity:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Bytes:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>Amount:</source>
+ <translation>Cantidad:</translation>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Priority:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Low Output:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>After Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Change:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+63"/>
+ <source>(un)select all</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Tree mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>List mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>Amount</source>
+ <translation>Cantidad</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Address</source>
+ <translation>Dirección</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Date</source>
+ <translation>Fecha</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Confirmations</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Confirmed</source>
+ <translation>Confirmado</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../coincontroldialog.cpp" line="+42"/>
+ <source>Copy address</source>
+ <translation>Copia dirección</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy label</source>
+ <translation>Copia etiqueta</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+26"/>
+ <source>Copy amount</source>
+ <translation>Copiar Cantidad</translation>
+ </message>
+ <message>
+ <location line="-25"/>
+ <source>Copy transaction ID</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Lock unspent</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Unlock unspent</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+22"/>
+ <source>Copy quantity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Copy fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy after fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy bytes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy low output</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy change</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+323"/>
+ <source>highest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>higher</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>high</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>medium-high</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>medium</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>low-medium</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>low</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>lower</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>lowest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>(%1 locked)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+140"/>
+ <source>Dust</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>yes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>no</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>This label turns red, if the transaction size is greater than 1000 bytes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+5"/>
+ <source>This means a fee of at least %1 per kB is required.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-4"/>
+ <source>Can vary +/- 1 byte per input.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Transactions with higher priority are more likely to get included into a block.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>This label turns red, if the priority is smaller than &quot;medium&quot;.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>This label turns red, if any recipient receives an amount smaller than %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+4"/>
+ <source>This means a fee of at least %1 is required.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-3"/>
+ <source>Amounts below 0.546 times the minimum relay fee are shown as dust.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>This label turns red, if the change is smaller than %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
+ <location line="+66"/>
+ <source>(no label)</source>
+ <translation>(sin etiqueta)</translation>
+ </message>
+ <message>
+ <location line="-9"/>
+ <source>change from %1 (%2)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>(change)</source>
<translation type="unfinished"/>
</message>
</context>
@@ -726,7 +1025,7 @@ Dirección: %4</translation>
<translation>&amp;Dirección</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+21"/>
+ <location filename="../editaddressdialog.cpp" line="+28"/>
<source>New receiving address</source>
<translation>Nueva dirección para recibir</translation>
</message>
@@ -769,14 +1068,14 @@ Dirección: %4</translation>
<context>
<name>FreespaceChecker</name>
<message>
- <location filename="../intro.cpp" line="+61"/>
+ <location filename="../intro.cpp" line="+65"/>
<source>A new data directory will be created.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+22"/>
<source>name</source>
- <translation type="unfinished"/>
+ <translation>Nombre</translation>
</message>
<message>
<location line="+2"/>
@@ -795,15 +1094,19 @@ Dirección: %4</translation>
</message>
</context>
<context>
- <name>GUIUtil::HelpMessageBox</name>
+ <name>HelpMessageDialog</name>
<message>
- <location filename="../guiutil.cpp" line="+558"/>
- <location line="+13"/>
- <source>Bitcoin-Qt</source>
+ <location filename="../forms/helpmessagedialog.ui" line="+19"/>
+ <source>Bitcoin Core - Command-line options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-13"/>
+ <location filename="../utilitydialog.cpp" line="+38"/>
+ <source>Bitcoin Core</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
<source>version</source>
<translation>versión</translation>
</message>
@@ -853,17 +1156,17 @@ Dirección: %4</translation>
</message>
<message>
<location line="+9"/>
- <source>Welcome to Bitcoin-Qt.</source>
+ <source>Welcome to Bitcoin Core.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+26"/>
- <source>As this is the first time the program is launched, you can choose where Bitcoin-Qt will store its data.</source>
+ <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+10"/>
- <source>Bitcoin-Qt will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
+ <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -877,7 +1180,17 @@ Dirección: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../intro.cpp" line="+105"/>
+ <location filename="../intro.cpp" line="+85"/>
+ <source>Bitcoin</source>
+ <translation>Bitcoin</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error: Specified data directory &quot;%1&quot; can not be created.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+19"/>
<source>Error</source>
<translation>Error</translation>
</message>
@@ -893,6 +1206,34 @@ Dirección: %4</translation>
</message>
</context>
<context>
+ <name>OpenURIDialog</name>
+ <message>
+ <location filename="../forms/openuridialog.ui" line="+14"/>
+ <source>Open URI</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Open payment request from URI or file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>URI:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Select payment request file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../openuridialog.cpp" line="+47"/>
+ <source>Select payment request file to open</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OptionsDialog</name>
<message>
<location filename="../forms/optionsdialog.ui" line="+14"/>
@@ -900,7 +1241,7 @@ Dirección: %4</translation>
<translation>Opciones</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+13"/>
<source>&amp;Main</source>
<translation>&amp;Principal</translation>
</message>
@@ -925,7 +1266,52 @@ Dirección: %4</translation>
<translation>&amp;Inicia Bitcoin al iniciar el sistema</translation>
</message>
<message>
- <location line="+35"/>
+ <location line="+9"/>
+ <source>Size of &amp;database cache</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set database cache size in megabytes (default: 25)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>MB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Number of script &amp;verification threads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Connect to the Bitcoin network through a SOCKS proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Connect through SOCKS proxy (default proxy):</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+224"/>
+ <source>Active command-line options that override above options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
<source>Reset all client options to default.</source>
<translation type="unfinished"/>
</message>
@@ -935,9 +1321,9 @@ Dirección: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="-323"/>
<source>&amp;Network</source>
- <translation type="unfinished"/>
+ <translation>&amp;Red</translation>
</message>
<message>
<location line="+6"/>
@@ -950,32 +1336,17 @@ Dirección: %4</translation>
<translation>Direcciona el puerto usando &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>Conecta a la red Bitcoin a través de un proxy SOCKS (ej. cuando te conectas por la red Tor)</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>&amp;Connect through SOCKS proxy:</source>
- <translation>&amp;Conecta a traves de un proxy SOCKS:</translation>
- </message>
- <message>
- <location line="+9"/>
+ <location line="+19"/>
<source>Proxy &amp;IP:</source>
<translation>&amp;IP Proxy:</translation>
</message>
<message>
- <location line="+19"/>
- <source>IP address of the proxy (e.g. 127.0.0.1)</source>
- <translation>Dirección IP del servidor proxy (ej. 127.0.0.1)</translation>
- </message>
- <message>
- <location line="+7"/>
+ <location line="+32"/>
<source>&amp;Port:</source>
<translation>&amp;Puerto:</translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+25"/>
<source>Port of the proxy (e.g. 9050)</source>
<translation>Puerto del servidor proxy (ej. 9050)</translation>
</message>
@@ -1050,7 +1421,17 @@ Dirección: %4</translation>
<translation>&amp;Muestra direcciones en el listado de transaccioines</translation>
</message>
<message>
- <location line="+71"/>
+ <location line="+7"/>
+ <source>Whether to show coin control features or not.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Display coin &amp;control features (experts only)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+136"/>
<source>&amp;OK</source>
<translation type="unfinished"/>
</message>
@@ -1060,44 +1441,38 @@ Dirección: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>&amp;Apply</source>
+ <location filename="../optionsdialog.cpp" line="+67"/>
+ <source>default</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+58"/>
- <source>default</source>
+ <location line="+57"/>
+ <source>none</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+130"/>
+ <location line="+75"/>
<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>
+ <location line="+29"/>
+ <source>Client restart required to activate changes.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>Do you want to proceed?</source>
+ <location line="-29"/>
+ <source>Client will be shutdown, do you want to proceed?</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
- <location line="+9"/>
- <source>Warning</source>
- <translation>Atención</translation>
- </message>
- <message>
- <location line="-9"/>
- <location line="+9"/>
- <source>This setting will take effect after restarting Bitcoin.</source>
+ <location line="+33"/>
+ <source>This change would require a client restart.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+29"/>
+ <location line="+34"/>
<source>The supplied proxy address is invalid.</source>
<translation type="unfinished"/>
</message>
@@ -1111,22 +1486,22 @@ Dirección: %4</translation>
</message>
<message>
<location line="+50"/>
- <location line="+202"/>
+ <location line="+231"/>
<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="-131"/>
+ <location line="-155"/>
<source>Unconfirmed:</source>
<translation>No confirmados:</translation>
</message>
<message>
- <location line="-78"/>
+ <location line="-83"/>
<source>Wallet</source>
<translation>Cartera</translation>
</message>
<message>
- <location line="+49"/>
+ <location line="+51"/>
<source>Confirmed:</source>
<translation type="unfinished"/>
</message>
@@ -1136,12 +1511,12 @@ Dirección: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="+29"/>
+ <location line="+32"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+16"/>
<source>Immature:</source>
<translation type="unfinished"/>
</message>
@@ -1151,9 +1526,9 @@ Dirección: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+16"/>
<source>Total:</source>
- <translation type="unfinished"/>
+ <translation>Total:</translation>
</message>
<message>
<location line="+16"/>
@@ -1161,21 +1536,22 @@ Dirección: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="+53"/>
+ <location line="+71"/>
<source>&lt;b&gt;Recent transactions&lt;/b&gt;</source>
<translation>&lt;b&gt;Transacciones recientes&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../overviewpage.cpp" line="+116"/>
+ <location filename="../overviewpage.cpp" line="+120"/>
<location line="+1"/>
<source>out of sync</source>
- <translation type="unfinished"/>
+ <translation>desincronizado</translation>
</message>
</context>
<context>
<name>PaymentServer</name>
<message>
- <location filename="../paymentserver.cpp" line="+392"/>
+ <location filename="../paymentserver.cpp" line="+403"/>
+ <location line="+13"/>
<source>URI handling</source>
<translation type="unfinished"/>
</message>
@@ -1185,45 +1561,82 @@ Dirección: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="+69"/>
+ <location line="+96"/>
<source>Requested payment amount of %1 is too small (considered dust).</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
- <location line="+37"/>
+ <location line="-221"/>
+ <location line="+212"/>
+ <location line="+13"/>
+ <location line="+95"/>
+ <location line="+18"/>
+ <location line="+16"/>
<source>Payment request error</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="-353"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Net manager warning</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+1"/>
- <source>Insecure requests to custom payment scripts unsupported</source>
+ <source>Your active proxy doesn&apos;t support SOCKS5, which is required for payment requests via proxy.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+38"/>
+ <location line="+52"/>
+ <source>Payment request fetch URL is invalid: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Payment request file handling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Payment request file can not be read or processed! This can be caused by an invalid payment request file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+73"/>
+ <source>Unverified payment requests to custom payment scripts are unsupported.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+59"/>
<source>Refund from %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
+ <location line="+43"/>
<source>Error communicating with %1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+24"/>
+ <source>Payment request can not be parsed or processed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
<source>Bad response from server %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+32"/>
+ <location line="+33"/>
<source>Payment acknowledged</source>
- <translation type="unfinished"/>
+ <translation>Pago completado</translation>
</message>
<message>
- <location line="-58"/>
- <location line="+30"/>
- <location line="+17"/>
+ <location line="-11"/>
<source>Network request error</source>
<translation type="unfinished"/>
</message>
@@ -1231,39 +1644,33 @@ Dirección: %4</translation>
<context>
<name>QObject</name>
<message>
- <location filename="../bitcoin.cpp" line="+114"/>
- <location line="+5"/>
- <location filename="../intro.cpp" line="-32"/>
+ <location filename="../bitcoin.cpp" line="+71"/>
+ <location line="+11"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-4"/>
+ <location line="+1"/>
<source>Error: Specified data directory &quot;%1&quot; does not exist.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="-12"/>
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../intro.cpp" line="+1"/>
- <source>Error: Specified data directory &quot;%1&quot; can not be created.</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>QRImageWidget</name>
<message>
- <location filename="../receiverequestdialog.cpp" line="+32"/>
+ <location filename="../receiverequestdialog.cpp" line="+36"/>
<source>&amp;Save Image...</source>
- <translation type="unfinished"/>
+ <translation>Guardar imagen...</translation>
</message>
<message>
<location line="+3"/>
<source>&amp;Copy Image</source>
- <translation type="unfinished"/>
+ <translation>Copiar Imagen</translation>
</message>
<message>
<location line="+28"/>
@@ -1272,8 +1679,8 @@ Dirección: %4</translation>
</message>
<message>
<location line="+0"/>
- <source>PNG Images (*.png)</source>
- <translation>Imágenes PNG (*.png)</translation>
+ <source>PNG Image (*.png)</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1290,32 +1697,43 @@ Dirección: %4</translation>
<location line="+23"/>
<location line="+23"/>
<location line="+36"/>
- <location line="+53"/>
<location line="+23"/>
+ <location line="+36"/>
<location line="+23"/>
- <location filename="../rpcconsole.cpp" line="+352"/>
+ <location line="+23"/>
+ <location filename="../rpcconsole.cpp" line="+359"/>
<source>N/A</source>
- <translation type="unfinished"/>
+ <translation>N/A</translation>
</message>
<message>
- <location line="-217"/>
+ <location line="-223"/>
<source>Client version</source>
- <translation type="unfinished"/>
+ <translation>Versión del Cliente</translation>
</message>
<message>
<location line="-45"/>
<source>&amp;Information</source>
+ <translation>&amp;Información</translation>
+ </message>
+ <message>
+ <location line="-10"/>
+ <source>Debug window</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+25"/>
+ <source>General</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+68"/>
+ <location line="+53"/>
<source>Using OpenSSL version</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+49"/>
<source>Startup time</source>
- <translation type="unfinished"/>
+ <translation>Tiempo de inicio</translation>
</message>
<message>
<location line="+29"/>
@@ -1324,16 +1742,16 @@ Dirección: %4</translation>
</message>
<message>
<location line="+7"/>
- <source>Number of connections</source>
- <translation type="unfinished"/>
+ <source>Name</source>
+ <translation>Nombre</translation>
</message>
<message>
<location line="+23"/>
- <source>On testnet</source>
- <translation type="unfinished"/>
+ <source>Number of connections</source>
+ <translation>Número de conexiones</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+29"/>
<source>Block chain</source>
<translation type="unfinished"/>
</message>
@@ -1355,27 +1773,12 @@ Dirección: %4</translation>
<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"/>
+ <translation>&amp;Abrir</translation>
</message>
<message>
<location line="+24"/>
<source>&amp;Console</source>
- <translation type="unfinished"/>
+ <translation>&amp;Consola</translation>
</message>
<message>
<location line="+72"/>
@@ -1403,22 +1806,12 @@ Dirección: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="-541"/>
+ <location line="-521"/>
<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"/>
+ <location line="+206"/>
<source>Debug log file</source>
<translation type="unfinished"/>
</message>
@@ -1428,9 +1821,9 @@ Dirección: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="+102"/>
+ <location line="+76"/>
<source>Clear console</source>
- <translation type="unfinished"/>
+ <translation>Limpiar Consola</translation>
</message>
<message>
<location filename="../rpcconsole.cpp" line="-30"/>
@@ -1448,7 +1841,7 @@ Dirección: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="+128"/>
+ <location line="+122"/>
<source>%1 B</source>
<translation type="unfinished"/>
</message>
@@ -1486,48 +1879,48 @@ Dirección: %4</translation>
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+22"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
<source>&amp;Amount:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
- <source>The amount to request</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+7"/>
+ <location line="-13"/>
<source>&amp;Label:</source>
<translation>&amp;Etiqueta:</translation>
</message>
<message>
- <location line="+10"/>
- <source>The label to associate with the receiving address</source>
- <translation type="unfinished"/>
+ <location line="-34"/>
+ <source>&amp;Message:</source>
+ <translation>&amp;mensaje</translation>
</message>
<message>
- <location line="+7"/>
- <source>&amp;Message:</source>
+ <location line="-17"/>
+ <source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>The message to attach to payment request</source>
+ <location line="+3"/>
+ <source>R&amp;euse an existing receiving address (not recommended)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
- <source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
+ <location line="+27"/>
+ <source>An optional label to associate with the new receiving address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>R&amp;euse an existing receiving address (not recommended)</source>
+ <location line="+7"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+7"/>
- <source>Use this form to request payments. All fields are optional.</source>
+ <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+39"/>
+ <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1545,6 +1938,31 @@ Dirección: %4</translation>
<source>&amp;Request payment</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+47"/>
+ <source>Requested payments</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Show the selected request (does the same as double clicking an entry)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Show</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Remove the selected entries from the list</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Remove</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
@@ -1561,20 +1979,15 @@ Dirección: %4</translation>
<message>
<location line="+7"/>
<source>Copy &amp;Address</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+7"/>
- <source>&amp;Copy Image</source>
- <translation type="unfinished"/>
+ <translation>&amp;Copia dirección</translation>
</message>
<message>
<location line="+7"/>
<source>&amp;Save Image...</source>
- <translation type="unfinished"/>
+ <translation>Guardar imagen...</translation>
</message>
<message>
- <location filename="../receiverequestdialog.cpp" line="+58"/>
+ <location filename="../receiverequestdialog.cpp" line="+56"/>
<source>Request payment to %1</source>
<translation type="unfinished"/>
</message>
@@ -1620,16 +2033,119 @@ Dirección: %4</translation>
</message>
</context>
<context>
+ <name>RecentRequestsTableModel</name>
+ <message>
+ <location filename="../recentrequeststablemodel.cpp" line="+24"/>
+ <source>Date</source>
+ <translation>Fecha</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Label</source>
+ <translation>Etiqueta</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Message</source>
+ <translation>Mensaje</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Amount</source>
+ <translation>Cantidad</translation>
+ </message>
+ <message>
+ <location line="+38"/>
+ <source>(no label)</source>
+ <translation>(sin etiqueta)</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>(no message)</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+140"/>
- <location line="+213"/>
+ <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location line="+80"/>
<source>Send Coins</source>
<translation>Enviar monedas</translation>
</message>
<message>
- <location line="+50"/>
+ <location line="+76"/>
+ <source>Coin Control Features</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Inputs...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>automatically selected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Insufficient funds!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+89"/>
+ <source>Quantity:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+35"/>
+ <source>Bytes:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Amount:</source>
+ <translation>Cantidad:</translation>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Priority:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Low Output:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>After Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Change:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+44"/>
+ <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Custom change address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+115"/>
<source>Send to multiple recipients at once</source>
<translation>Enviar a múltiples destinatarios</translation>
</message>
@@ -1654,12 +2170,7 @@ Dirección: %4</translation>
<translation>Balance:</translation>
</message>
<message>
- <location line="+10"/>
- <source>123.456 BTC</source>
- <translation>123.456 BTC</translation>
- </message>
- <message>
- <location line="+31"/>
+ <location line="+41"/>
<source>Confirm the send action</source>
<translation>Confirma el envio</translation>
</message>
@@ -1669,69 +2180,135 @@ Dirección: %4</translation>
<translation>&amp;Envía</translation>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-154"/>
+ <location filename="../sendcoinsdialog.cpp" line="-228"/>
<source>Confirm send coins</source>
<translation>Confirmar el envio de monedas</translation>
</message>
<message>
- <location line="-90"/>
+ <location line="-74"/>
<location line="+5"/>
<location line="+5"/>
+ <location line="+4"/>
<source>%1 to %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+26"/>
+ <location line="-136"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation>Introduce una dirección Bitcoin (ej. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Copy quantity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation>Copiar Cantidad</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy after fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy bytes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy low output</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy change</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+170"/>
+ <source>Total Amount %1 (= %2)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>or</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+202"/>
<source>The recipient address is not valid, please recheck.</source>
<translation>La dirección de destinatarion no es valida, comprueba otra vez.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The amount to pay must be larger than 0.</source>
<translation>La cantidad por pagar tiene que ser mayor 0.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The amount exceeds your balance.</source>
<translation>La cantidad sobrepasa tu saldo.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The total exceeds your balance when the %1 transaction fee is included.</source>
<translation>El total sobrepasa tu saldo cuando se incluyen %1 como tasa de envio.</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+3"/>
<source>Duplicate address found, can only send to each address once per send operation.</source>
<translation>Tienes una dirección duplicada, solo puedes enviar a direcciónes individuales de una sola vez.</translation>
</message>
<message>
+ <location line="+3"/>
+ <source>Transaction creation failed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+4"/>
- <source>Error: Transaction creation failed!</source>
+ <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+15"/>
- <source>Are you sure you want to send?</source>
+ <location line="+112"/>
+ <source>Warning: Invalid Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+9"/>
- <source>added as transaction fee</source>
+ <location line="+21"/>
+ <source>(no label)</source>
+ <translation>(sin etiqueta)</translation>
+ </message>
+ <message>
+ <location line="-11"/>
+ <source>Warning: Unknown change address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
- <source>Total Amount %1</source>
+ <location line="-366"/>
+ <source>Are you sure you want to send?</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+20"/>
- <source>Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
- <translation>Error: La transacción fue rechazada. Esto puede haber ocurrido si alguna de las monedas ya estaba gastada o si ha usado una copia de wallet.dat y las monedas se gastaron en la copia pero no se han marcado como gastadas aqui.</translation>
+ <location line="+9"/>
+ <source>added as transaction fee</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+144"/>
+ <location line="+170"/>
<source>Payment request expired</source>
<translation type="unfinished"/>
</message>
@@ -1744,39 +2321,44 @@ Dirección: %4</translation>
<context>
<name>SendCoinsEntry</name>
<message>
- <location filename="../forms/sendcoinsentry.ui" line="+33"/>
- <location line="+585"/>
+ <location filename="../forms/sendcoinsentry.ui" line="+131"/>
+ <location line="+521"/>
+ <location line="+536"/>
<source>A&amp;mount:</source>
<translation>Cantidad:</translation>
</message>
<message>
- <location line="-572"/>
- <location line="+585"/>
+ <location line="-1152"/>
<source>Pay &amp;To:</source>
<translation>&amp;Pagar a:</translation>
</message>
<message>
- <location line="-551"/>
+ <location line="+18"/>
<source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation type="unfinished"/>
+ <translation>La dirección donde enviar el pago (ej. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location filename="../sendcoinsentry.cpp" line="+28"/>
+ <location filename="../sendcoinsentry.cpp" line="+30"/>
<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>
<message>
- <location filename="../forms/sendcoinsentry.ui" line="-18"/>
+ <location filename="../forms/sendcoinsentry.ui" line="+57"/>
<source>&amp;Label:</source>
<translation>&amp;Etiqueta:</translation>
</message>
<message>
- <location line="+28"/>
+ <location line="-50"/>
<source>Choose previously used address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
+ <location line="-40"/>
+ <source>This is a normal payment.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+50"/>
<source>Alt+A</source>
<translation>Alt+A</translation>
</message>
@@ -1792,16 +2374,45 @@ Dirección: %4</translation>
</message>
<message>
<location line="+7"/>
- <source>Remove this recipient</source>
- <translation>Elimina destinatario</translation>
+ <location line="+524"/>
+ <location line="+536"/>
+ <source>Remove this entry</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="-1008"/>
+ <source>Message:</source>
+ <translation>Mensaje:</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+958"/>
+ <source>This is a verified payment request.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-991"/>
<source>Enter a label for this address to add it to the list of used addresses</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+465"/>
+ <location line="+459"/>
+ <source>This is an unverified payment request.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+18"/>
+ <location line="+532"/>
+ <source>Pay To:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-498"/>
+ <location line="+536"/>
<source>Memo:</source>
<translation type="unfinished"/>
</message>
@@ -1812,6 +2423,19 @@ Dirección: %4</translation>
</message>
</context>
<context>
+ <name>ShutdownWindow</name>
+ <message>
+ <location filename="../utilitydialog.cpp" line="+48"/>
+ <source>Bitcoin Core is shutting down...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Do not shut down the computer until this window disappears.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>SignVerifyMessageDialog</name>
<message>
<location filename="../forms/signverifymessagedialog.ui" line="+14"/>
@@ -1819,7 +2443,7 @@ Dirección: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+10"/>
<source>&amp;Sign Message</source>
<translation>&amp;Firmar Mensaje</translation>
</message>
@@ -1863,7 +2487,7 @@ Dirección: %4</translation>
<message>
<location line="+7"/>
<source>Signature</source>
- <translation type="unfinished"/>
+ <translation>Firma</translation>
</message>
<message>
<location line="+27"/>
@@ -1878,7 +2502,7 @@ Dirección: %4</translation>
<message>
<location line="+3"/>
<source>Sign &amp;Message</source>
- <translation type="unfinished"/>
+ <translation>Firmar Mensaje</translation>
</message>
<message>
<location line="+14"/>
@@ -1894,7 +2518,7 @@ Dirección: %4</translation>
<message>
<location line="-87"/>
<source>&amp;Verify Message</source>
- <translation type="unfinished"/>
+ <translation>&amp;Firmar Mensaje</translation>
</message>
<message>
<location line="+6"/>
@@ -1914,7 +2538,7 @@ Dirección: %4</translation>
<message>
<location line="+3"/>
<source>Verify &amp;Message</source>
- <translation type="unfinished"/>
+ <translation>&amp;Firmar Mensaje</translation>
</message>
<message>
<location line="+14"/>
@@ -1922,7 +2546,7 @@ Dirección: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+27"/>
+ <location filename="../signverifymessagedialog.cpp" line="+29"/>
<location line="+3"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>Introduce una dirección Bitcoin (ej. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
@@ -1935,13 +2559,13 @@ Dirección: %4</translation>
<message>
<location line="+3"/>
<source>Enter Bitcoin signature</source>
- <translation type="unfinished"/>
+ <translation>Ingresar firma Bicoin</translation>
</message>
<message>
- <location line="+85"/>
+ <location line="+84"/>
<location line="+81"/>
<source>The entered address is invalid.</source>
- <translation type="unfinished"/>
+ <translation>La dirección introducida &quot;%1&quot; no es una dirección Bitcoin valida.</translation>
</message>
<message>
<location line="-81"/>
@@ -1949,7 +2573,7 @@ Dirección: %4</translation>
<location line="+73"/>
<location line="+8"/>
<source>Please check the address and try again.</source>
- <translation type="unfinished"/>
+ <translation>Por favor, revise la dirección Bitcoin e inténtelo denuevo</translation>
</message>
<message>
<location line="-81"/>
@@ -1960,7 +2584,7 @@ Dirección: %4</translation>
<message>
<location line="-73"/>
<source>Wallet unlock was cancelled.</source>
- <translation type="unfinished"/>
+ <translation>Ha fallado el desbloqueo de la billetera</translation>
</message>
<message>
<location line="+8"/>
@@ -1970,12 +2594,12 @@ Dirección: %4</translation>
<message>
<location line="+12"/>
<source>Message signing failed.</source>
- <translation type="unfinished"/>
+ <translation>Firma fallida</translation>
</message>
<message>
<location line="+5"/>
<source>Message signed.</source>
- <translation type="unfinished"/>
+ <translation>Mensaje firmado</translation>
</message>
<message>
<location line="+59"/>
@@ -2001,14 +2625,19 @@ Dirección: %4</translation>
<message>
<location line="+5"/>
<source>Message verified.</source>
- <translation type="unfinished"/>
+ <translation>Mensaje comprobado</translation>
</message>
</context>
<context>
<name>SplashScreen</name>
<message>
- <location filename="../splashscreen.cpp" line="+23"/>
- <source>The Bitcoin developers</source>
+ <location filename="../splashscreen.cpp" line="+28"/>
+ <source>Bitcoin Core</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
<message>
@@ -2020,15 +2649,15 @@ Dirección: %4</translation>
<context>
<name>TrafficGraphWidget</name>
<message>
- <location filename="../trafficgraphwidget.cpp" line="+75"/>
+ <location filename="../trafficgraphwidget.cpp" line="+79"/>
<source>KB/s</source>
- <translation type="unfinished"/>
+ <translation>KB/s</translation>
</message>
</context>
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="+22"/>
+ <location filename="../transactiondesc.cpp" line="+28"/>
<source>Open until %1</source>
<translation>Abierto hasta %1</translation>
</message>
@@ -2083,13 +2712,13 @@ Dirección: %4</translation>
<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>propia dirección</translation>
</message>
<message>
<location line="-2"/>
@@ -2101,12 +2730,12 @@ Dirección: %4</translation>
<location line="+12"/>
<location line="+45"/>
<location line="+17"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Credit</source>
<translation>Credito</translation>
</message>
<message numerus="yes">
- <location line="-120"/>
+ <location line="-125"/>
<source>matures in %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -2119,12 +2748,12 @@ Dirección: %4</translation>
<location line="+44"/>
<location line="+8"/>
<location line="+15"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Debit</source>
<translation>Debito</translation>
</message>
<message>
- <location line="-57"/>
+ <location line="-62"/>
<source>Transaction fee</source>
<translation>Comisión transacción</translation>
</message>
@@ -2135,11 +2764,12 @@ Dirección: %4</translation>
</message>
<message>
<location line="+6"/>
+ <location line="+9"/>
<source>Message</source>
<translation>Mensaje</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="-7"/>
<source>Comment</source>
<translation>Comentario</translation>
</message>
@@ -2149,7 +2779,7 @@ Dirección: %4</translation>
<translation>ID de Transacción</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+18"/>
<source>Merchant</source>
<translation type="unfinished"/>
</message>
@@ -2189,7 +2819,7 @@ Dirección: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="-227"/>
+ <location line="-232"/>
<source>, has not been successfully broadcast yet</source>
<translation>, no ha sido emitido satisfactoriamente todavía</translation>
</message>
@@ -2220,7 +2850,7 @@ Dirección: %4</translation>
<context>
<name>TransactionTableModel</name>
<message>
- <location filename="../transactiontablemodel.cpp" line="+227"/>
+ <location filename="../transactiontablemodel.cpp" line="+234"/>
<source>Date</source>
<translation>Fecha</translation>
</message>
@@ -2239,8 +2869,13 @@ Dirección: %4</translation>
<source>Amount</source>
<translation>Cantidad</translation>
</message>
+ <message>
+ <location line="+59"/>
+ <source>Immature (%1 confirmations, will be available after %2)</source>
+ <translation type="unfinished"/>
+ </message>
<message numerus="yes">
- <location line="+57"/>
+ <location line="+16"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -2260,17 +2895,13 @@ Dirección: %4</translation>
<translation>No confirmado (%1 de %2 confirmaciónes)</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="-22"/>
+ <location line="+25"/>
<source>Confirmed (%1 confirmations)</source>
<translation>Confirmado (%1 confirmaciones)</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></translation>
- </message>
<message>
- <location line="+5"/>
+ <location line="-22"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation>Este bloque no ha sido recibido por otros nodos y probablemente no sea aceptado !</translation>
</message>
@@ -2280,7 +2911,7 @@ Dirección: %4</translation>
<translation>Generado pero no acceptado</translation>
</message>
<message>
- <location line="+43"/>
+ <location line="+62"/>
<source>Received with</source>
<translation>Recibido con</translation>
</message>
@@ -2338,7 +2969,7 @@ Dirección: %4</translation>
<context>
<name>TransactionView</name>
<message>
- <location filename="../transactionview.cpp" line="+52"/>
+ <location filename="../transactionview.cpp" line="+57"/>
<location line="+16"/>
<source>All</source>
<translation>Todo</translation>
@@ -2399,12 +3030,12 @@ Dirección: %4</translation>
<translation>Otra</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+6"/>
<source>Enter address or label to search</source>
<translation>Introduce una dirección o etiqueta para buscar</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+6"/>
<source>Min amount</source>
<translation>Cantidad minima</translation>
</message>
@@ -2436,20 +3067,40 @@ Dirección: %4</translation>
<message>
<location line="+1"/>
<source>Show transaction details</source>
+ <translation>Mostrar detalles de la transacción</translation>
+ </message>
+ <message>
+ <location line="+142"/>
+ <source>Export Transaction History</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+143"/>
- <source>Export Transaction Data</source>
- <translation>Exportar datos de transacción</translation>
+ <location line="+19"/>
+ <source>Exporting Failed</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="+0"/>
+ <source>There was an error trying to save the transaction history to %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Exporting Successful</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The transaction history was successfully saved to %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-22"/>
<source>Comma separated file (*.csv)</source>
<translation>Archivos separados por coma (*.csv)</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+9"/>
<source>Confirmed</source>
<translation>Confirmado</translation>
</message>
@@ -2484,17 +3135,7 @@ Dirección: %4</translation>
<translation>ID</translation>
</message>
<message>
- <location line="+4"/>
- <source>Error exporting</source>
- <translation>Error exportando</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation>No se pudo escribir en el archivo %1.</translation>
- </message>
- <message>
- <location line="+100"/>
+ <location line="+107"/>
<source>Range:</source>
<translation>Rango:</translation>
</message>
@@ -2505,9 +3146,17 @@ Dirección: %4</translation>
</message>
</context>
<context>
+ <name>WalletFrame</name>
+ <message>
+ <location filename="../walletframe.cpp" line="+26"/>
+ <source>No wallet has been loaded.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>WalletModel</name>
<message>
- <location filename="../walletmodel.cpp" line="+218"/>
+ <location filename="../walletmodel.cpp" line="+245"/>
<source>Send Coins</source>
<translation>Enviar monedas</translation>
</message>
@@ -2515,7 +3164,7 @@ Dirección: %4</translation>
<context>
<name>WalletView</name>
<message>
- <location filename="../walletview.cpp" line="+46"/>
+ <location filename="../walletview.cpp" line="+43"/>
<source>&amp;Export</source>
<translation type="unfinished"/>
</message>
@@ -2525,68 +3174,63 @@ Dirección: %4</translation>
<translation>Exportar los datos de la pestaña actual a un archivo</translation>
</message>
<message>
- <location line="+183"/>
+ <location line="+181"/>
<source>Backup Wallet</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
+ <location line="+1"/>
<source>Wallet Data (*.dat)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
+ <location line="+6"/>
<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>
+ <source>There was an error trying to save the wallet data to %1.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+4"/>
- <source>Backup Successful</source>
+ <source>The wallet data was successfully saved to %1.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+0"/>
- <source>The wallet data was successfully saved to the new location.</source>
+ <source>Backup Successful</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+102"/>
- <source>Bitcoin version</source>
- <translation>Versión Bitcoin</translation>
- </message>
- <message>
- <location line="+107"/>
+ <location filename="../bitcoinstrings.cpp" line="+221"/>
<source>Usage:</source>
<translation>Uso:</translation>
</message>
<message>
- <location line="-55"/>
+ <location line="-54"/>
<source>List commands</source>
<translation>Muestra comandos
</translation>
</message>
<message>
- <location line="-13"/>
+ <location line="-14"/>
<source>Get help for a command</source>
<translation>Recibir ayuda para un comando
</translation>
</message>
<message>
- <location line="+25"/>
+ <location line="+26"/>
<source>Options:</source>
<translation>Opciones:
</translation>
</message>
<message>
- <location line="+24"/>
+ <location line="+22"/>
<source>Specify configuration file (default: bitcoin.conf)</source>
<translation>Especifica archivo de configuración (predeterminado: bitcoin.conf)
</translation>
@@ -2609,7 +3253,7 @@ Dirección: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="-28"/>
+ <location line="-26"/>
<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>
@@ -2619,7 +3263,7 @@ Dirección: %4</translation>
<translation>Mantener al menos &lt;n&gt; conecciones por cliente (por defecto: 125) </translation>
</message>
<message>
- <location line="-49"/>
+ <location line="-51"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation type="unfinished"/>
</message>
@@ -2629,39 +3273,39 @@ Dirección: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<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="-142"/>
+ <location line="-148"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-33"/>
+ <location line="-36"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<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="+40"/>
+ <location line="+45"/>
<source>Accept command line and JSON-RPC commands</source>
<translation>Aceptar comandos consola y JSON-RPC
</translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>Correr como demonio y acepta comandos
</translation>
</message>
<message>
- <location line="+40"/>
+ <location line="+39"/>
<source>Use the test network</source>
<translation>Usa la red de pruebas
</translation>
@@ -2672,7 +3316,7 @@ Dirección: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="-87"/>
+ <location line="-95"/>
<source>%s, you must set a rpcpassword in the configuration file:
%s
It is recommended you use the following random password:
@@ -2713,6 +3357,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+4"/>
+ <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</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>
@@ -2727,17 +3376,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+11"/>
- <source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source>
+ <location line="+18"/>
+ <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="+6"/>
- <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
+ <location line="+5"/>
+ <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+3"/>
<source>Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source>
<translation>Precaución: -paytxfee es muy alta. Esta es la comisión que pagarás si envias una transacción.</translation>
</message>
@@ -2767,17 +3416,27 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
+ <location line="+9"/>
+ <source>&lt;category&gt; can be:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
<source>Attempt to recover private keys from a corrupt wallet.dat</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
+ <source>Bitcoin Core Daemon</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Bitcoin RPC client version</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
<source>Block creation options:</source>
<translation type="unfinished"/>
</message>
@@ -2788,7 +3447,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
+ <source>Connect through SOCKS proxy</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect to JSON-RPC on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation type="unfinished"/>
</message>
@@ -2804,6 +3468,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+1"/>
+ <source>Do not load the wallet and disable wallet RPC calls</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Do you want to rebuild the block database now?</source>
<translation type="unfinished"/>
</message>
@@ -2820,7 +3489,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<message>
<location line="+1"/>
<source>Error loading block database</source>
- <translation type="unfinished"/>
+ <translation>Error cargando blkindex.dat</translation>
</message>
<message>
<location line="+4"/>
@@ -2830,7 +3499,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<message>
<location line="+2"/>
<source>Error: Disk space is low!</source>
- <translation type="unfinished"/>
+ <translation>Atención: Poco espacio en el disco duro</translation>
</message>
<message>
<location line="+1"/>
@@ -2898,7 +3567,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
+ <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="+1"/>
<source>Find peers using DNS lookup (default: 1 unless -connect)</source>
<translation type="unfinished"/>
</message>
@@ -2918,6 +3592,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
+ <location line="+1"/>
+ <source>If &lt;category&gt; is not supplied, output all debugging information.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+2"/>
<source>Incorrect or no genesis block found. Wrong datadir for network?</source>
<translation type="unfinished"/>
@@ -2933,17 +3612,37 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+8"/>
+ <location line="+5"/>
+ <source>Prepend debug output with timestamp (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>RPC client options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Rebuild block chain index from current blk000??.dat files</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+5"/>
+ <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Send command to Bitcoin server</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
+ <location line="+7"/>
+ <source>Set maximum block size in bytes (default: %d)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Set the number of threads to service RPC calls (default: 4)</source>
<translation type="unfinished"/>
</message>
@@ -2955,15 +3654,20 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<message>
<location line="+2"/>
<source>Start Bitcoin server</source>
+ <translation>Iniciar Bitcoin</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>This is intended for regression testing tools and app development.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+12"/>
+ <location line="+10"/>
<source>Usage (deprecated, use bitcoin-cli):</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+8"/>
+ <location line="+7"/>
<source>Verifying blocks...</source>
<translation type="unfinished"/>
</message>
@@ -2974,33 +3678,58 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+1"/>
+ <source>Wait for RPC server to start</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Wallet %s resides outside data directory %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+2"/>
+ <source>Wallet options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>You need to rebuild the database using -reindex to change -txindex</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-78"/>
+ <location line="-79"/>
<source>Imports blocks from external blk000??.dat file</source>
- <translation type="unfinished"/>
+ <translation>Importar bloques desde el archivo externo blk000??.dat </translation>
</message>
<message>
- <location line="-98"/>
+ <location line="-105"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+17"/>
+ <location line="+14"/>
+ <source>Output debugging information (default: 0, supplying &lt;category&gt; is optional)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+83"/>
+ <location line="+89"/>
<source>Information</source>
- <translation type="unfinished"/>
+ <translation>Información</translation>
</message>
<message>
<location line="+4"/>
@@ -3038,49 +3767,19 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
- <source>Output extra debugging information. Implies all other -debug* options</source>
- <translation>Adjuntar informacion extra de depuracion. Implies all other -debug* options</translation>
- </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>Anteponer salida de depuracion con marca de tiempo</translation>
- </message>
- <message>
- <location line="+5"/>
+ <location line="+9"/>
<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>
<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"/>
+ <location line="+4"/>
<source>Send trace/debug info to console instead of debug.log file</source>
<translation>Enviar informacion de seguimiento a la consola en vez del archivo debug.log</translation>
</message>
<message>
- <location line="+1"/>
- <source>Send trace/debug info to debugger</source>
- <translation>Enviar informacion de seguimiento al depurador</translation>
- </message>
- <message>
- <location line="+5"/>
- <source>Set maximum block size in bytes (default: 250000)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+6"/>
<source>Set minimum block size in bytes (default: 0)</source>
- <translation type="unfinished"/>
+ <translation>Establezca el tamaño mínimo del bloque en bytes (por defecto: 0)</translation>
</message>
<message>
<location line="+2"/>
@@ -3103,7 +3802,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Transaction amount too small</source>
<translation type="unfinished"/>
</message>
@@ -3128,33 +3827,33 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Intenta usar UPnP para mapear el puerto de escucha (default: 1 when listening)</translation>
</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>Usuario para las conexiones JSON-RPC
</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+7"/>
<source>Warning</source>
- <translation type="unfinished"/>
+ <translation>Atención</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Warning: This version is obsolete, upgrade required!</source>
- <translation type="unfinished"/>
+ <translation>Advertencia: Esta versión está obsoleta, se necesita actualizar!</translation>
</message>
<message>
<location line="+2"/>
+ <source>version</source>
+ <translation>versión</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>wallet.dat corrupt, salvage failed</source>
- <translation type="unfinished"/>
+ <translation>wallet.dat corrompió, guardado fallido</translation>
</message>
<message>
- <location line="-54"/>
+ <location line="-58"/>
<source>Password for JSON-RPC connections</source>
<translation>Contraseña para las conexiones JSON-RPC
</translation>
@@ -3166,29 +3865,29 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<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="-126"/>
+ <location line="-132"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+155"/>
+ <location line="+161"/>
<source>Upgrade wallet to latest format</source>
<translation>Actualizar billetera al formato actual</translation>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<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>
</message>
<message>
- <location line="-12"/>
+ <location line="-11"/>
<source>Rescan the block chain for missing wallet transactions</source>
<translation>Rescanea la cadena de bloques para transacciones perdidas de la cartera
</translation>
@@ -3200,7 +3899,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</translation>
</message>
<message>
- <location line="-29"/>
+ <location line="-30"/>
<source>Server certificate file (default: server.cert)</source>
<translation>Certificado del servidor (Predeterminado: server.cert)
</translation>
@@ -3218,28 +3917,23 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Unable to bind to %s on this computer (bind returned error %d, %s)</source>
<translation>No es posible escuchar en el %s en este ordenador (bind returned error %d, %s)</translation>
</message>
<message>
- <location line="-95"/>
- <source>Connect through socks proxy</source>
- <translation>Conecta mediante proxy socks</translation>
- </message>
- <message>
- <location line="-11"/>
+ <location line="-107"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation>Permite búsqueda DNS para addnode y connect
</translation>
</message>
<message>
- <location line="+58"/>
+ <location line="+60"/>
<source>Loading addresses...</source>
<translation>Cargando direcciónes...</translation>
</message>
<message>
- <location line="-36"/>
+ <location line="-37"/>
<source>Error loading wallet.dat: Wallet corrupted</source>
<translation>Error cargando wallet.dat: Billetera corrupta</translation>
</message>
@@ -3259,12 +3953,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Error cargando wallet.dat</translation>
</message>
<message>
- <location line="+30"/>
+ <location line="+31"/>
<source>Invalid -proxy address: &apos;%s&apos;</source>
<translation>Dirección -proxy invalida: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+57"/>
+ <location line="+56"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3274,7 +3968,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3284,7 +3978,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+46"/>
+ <location line="+48"/>
<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>
@@ -3304,27 +3998,22 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Cargando el index de bloques...</translation>
</message>
<message>
- <location line="-60"/>
+ <location line="-62"/>
<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>
<message>
- <location line="-28"/>
+ <location line="-32"/>
<source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source>
<translation>No es posible escuchar en el %s en este ordenador. Probablemente Bitcoin ya se está ejecutando.</translation>
</message>
<message>
- <location line="+69"/>
- <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="+20"/>
+ <location line="+95"/>
<source>Loading wallet...</source>
<translation>Cargando cartera...</translation>
</message>
<message>
- <location line="-54"/>
+ <location line="-56"/>
<source>Cannot downgrade wallet</source>
<translation type="unfinished"/>
</message>
@@ -3334,7 +4023,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+66"/>
+ <location line="+67"/>
<source>Rescanning...</source>
<translation>Rescaneando...</translation>
</message>
@@ -3354,7 +4043,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Error</translation>
</message>
<message>
- <location line="-33"/>
+ <location line="-35"/>
<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_MX.ts b/src/qt/locale/bitcoin_es_MX.ts
index 5530114fd7..cb0a3bc5cf 100644
--- a/src/qt/locale/bitcoin_es_MX.ts
+++ b/src/qt/locale/bitcoin_es_MX.ts
@@ -22,13 +22,13 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location filename="../aboutdialog.cpp" line="+19"/>
+ <location filename="../utilitydialog.cpp" line="+29"/>
<source>Copyright</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+0"/>
- <source>The Bitcoin developers</source>
+ <source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
</context>
@@ -146,13 +146,13 @@ This product includes software developed by the OpenSSL Project for use in the O
</message>
<message>
<location line="+13"/>
- <source>Error exporting</source>
- <translation>Error de exportación</translation>
+ <source>Exporting Failed</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation>No se puede excribir en el archivo %1.</translation>
+ <location line="+1"/>
+ <source>There was an error trying to save the address list to %1.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -317,22 +317,27 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+260"/>
+ <location filename="../bitcoingui.cpp" line="+295"/>
<source>Sign &amp;message...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+290"/>
+ <location line="+335"/>
<source>Synchronizing with network...</source>
<translation>Sincronizando con la red...</translation>
</message>
<message>
- <location line="-360"/>
+ <location line="-407"/>
<source>&amp;Overview</source>
<translation>&amp;Vista previa</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="-137"/>
+ <source>Node</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+138"/>
<source>Show general overview of wallet</source>
<translation>Mostrar la vista previa general de la cartera</translation>
</message>
@@ -347,7 +352,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Explorar el historial de transacciones</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>E&amp;xit</source>
<translation>S&amp;alir</translation>
</message>
@@ -393,7 +398,22 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+295"/>
+ <location line="+10"/>
+ <source>&amp;Sending addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Receiving addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open &amp;URI...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+325"/>
<source>Importing blocks from disk...</source>
<translation type="unfinished"/>
</message>
@@ -403,12 +423,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="-358"/>
+ <location line="-405"/>
<source>Send coins to a Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+47"/>
+ <location line="+49"/>
<source>Modify configuration options for Bitcoin</source>
<translation type="unfinished"/>
</message>
@@ -438,18 +458,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+375"/>
+ <location line="+430"/>
<source>Bitcoin</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-563"/>
- <location line="+10"/>
+ <location line="-643"/>
<source>Wallet</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+113"/>
+ <location line="+146"/>
<source>&amp;Send</source>
<translation type="unfinished"/>
</message>
@@ -459,7 +478,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+44"/>
+ <location line="+46"/>
<location line="+2"/>
<source>&amp;Show / Hide</source>
<translation type="unfinished"/>
@@ -485,86 +504,80 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+39"/>
+ <location line="+48"/>
<source>&amp;File</source>
<translation>&amp;Archivo</translation>
</message>
<message>
- <location line="+11"/>
+ <location line="+14"/>
<source>&amp;Settings</source>
<translation>&amp;Configuraciones</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>&amp;Help</source>
<translation>&amp;Ayuda</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+15"/>
<source>Tabs toolbar</source>
<translation>Pestañas</translation>
</message>
<message>
- <location line="-244"/>
- <location line="+321"/>
+ <location line="-284"/>
+ <location line="+376"/>
<source>[testnet]</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-331"/>
- <location line="+10"/>
+ <location line="-401"/>
<source>Bitcoin Core</source>
- <translation type="unfinished"/>
+ <translation>nucleo Bitcoin</translation>
</message>
<message>
- <location line="+121"/>
+ <location line="+163"/>
<source>Request payments (generates QR codes and bitcoin: URIs)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+27"/>
+ <location line="+29"/>
<location line="+2"/>
<source>&amp;About Bitcoin Core</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+34"/>
- <source>&amp;Used sending addresses...</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+35"/>
<source>Show the list of used sending addresses and labels</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Used &amp;receiving addresses...</source>
+ <location line="+2"/>
+ <source>Show the list of used receiving addresses and labels</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Show the list of used receiving addresses and labels</source>
+ <location line="+3"/>
+ <source>Open a bitcoin: URI or payment request</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+2"/>
- <source>Open URI...</source>
+ <source>&amp;Command-line options</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
- <source>Open a bitcoin: URI or payment request</source>
+ <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+126"/>
+ <location line="+159"/>
<location line="+5"/>
<source>Bitcoin client</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+133"/>
+ <location line="+142"/>
<source>%n active connection(s) to Bitcoin network</source>
<translation><numerusform>%n Activar conexión a la red de Bitcoin</numerusform><numerusform>%n Activar conexiones a la red de Bitcoin</numerusform></translation>
</message>
@@ -584,7 +597,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+20"/>
+ <location line="+23"/>
<source>%n hour(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -604,7 +617,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
+ <location line="+21"/>
<source>Last received block was generated %1 ago.</source>
<translation type="unfinished"/>
</message>
@@ -629,27 +642,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+77"/>
- <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="-152"/>
+ <location line="-85"/>
<source>Up to date</source>
<translation>Actualizado al dia </translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Catching up...</source>
<translation>Resiviendo...</translation>
</message>
<message>
- <location line="+124"/>
- <source>Confirm transaction fee</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+130"/>
<source>Sent transaction</source>
<translation>Enviar Transacción</translation>
</message>
@@ -668,7 +671,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+67"/>
+ <location line="+69"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation>La cartera esta &lt;b&gt;encriptada&lt;/b&gt; y &lt;b&gt;desbloqueada&lt;/b&gt; actualmente </translation>
</message>
@@ -678,7 +681,7 @@ Address: %4
<translation>La cartera esta &lt;b&gt;encriptada&lt;/b&gt; y &lt;b&gt;bloqueada&lt;/b&gt; actualmente </translation>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+116"/>
+ <location filename="../bitcoin.cpp" line="+438"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation type="unfinished"/>
</message>
@@ -706,22 +709,22 @@ Address: %4
<message>
<location line="+29"/>
<source>Bytes:</source>
- <translation type="unfinished"/>
+ <translation>Bytes:</translation>
</message>
<message>
<location line="+45"/>
<source>Amount:</source>
- <translation type="unfinished"/>
+ <translation>Monto:</translation>
</message>
<message>
<location line="+29"/>
<source>Priority:</source>
- <translation type="unfinished"/>
+ <translation>Prioridad:</translation>
</message>
<message>
<location line="+45"/>
<source>Fee:</source>
- <translation type="unfinished"/>
+ <translation>Cuota:</translation>
</message>
<message>
<location line="+32"/>
@@ -900,7 +903,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+171"/>
+ <location line="+31"/>
+ <source>none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+140"/>
<source>Dust</source>
<translation type="unfinished"/>
</message>
@@ -937,7 +945,7 @@ Address: %4
</message>
<message>
<location line="+1"/>
- <source>This label turns red, if the priority is smaller than &quot;medium&quot;</source>
+ <source>This label turns red, if the priority is smaller than &quot;medium&quot;.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1006,7 +1014,7 @@ Address: %4
<translation>&amp;Dirección</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+25"/>
+ <location filename="../editaddressdialog.cpp" line="+28"/>
<source>New receiving address</source>
<translation>Nueva dirección de entregas</translation>
</message>
@@ -1075,52 +1083,56 @@ Address: %4
</message>
</context>
<context>
- <name>GUIUtil::HelpMessageBox</name>
+ <name>HelpMessageDialog</name>
<message>
- <location filename="../guiutil.cpp" line="+597"/>
- <source>version</source>
+ <location filename="../forms/helpmessagedialog.ui" line="+19"/>
+ <source>Bitcoin Core - Command-line options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <location line="+13"/>
+ <location filename="../utilitydialog.cpp" line="+38"/>
<source>Bitcoin Core</source>
- <translation type="unfinished"/>
+ <translation>nucleo Bitcoin</translation>
</message>
<message>
- <location line="-11"/>
+ <location line="+0"/>
+ <source>version</source>
+ <translation>Versión</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Usage:</source>
- <translation type="unfinished"/>
+ <translation>Uso:</translation>
</message>
<message>
<location line="+1"/>
<source>command-line options</source>
- <translation type="unfinished"/>
+ <translation>Opciones de comando de lineas</translation>
</message>
<message>
<location line="+4"/>
<source>UI options</source>
- <translation type="unfinished"/>
+ <translation>Opciones de interfaz</translation>
</message>
<message>
<location line="+1"/>
<source>Set language, for example &quot;de_DE&quot; (default: system locale)</source>
- <translation type="unfinished"/>
+ <translation>Definir idioma, por ejemplo &quot;de_DE&quot; (por defecto: Sistema local)</translation>
</message>
<message>
<location line="+1"/>
<source>Start minimized</source>
- <translation type="unfinished"/>
+ <translation>Iniciar minimizado</translation>
</message>
<message>
<location line="+1"/>
<source>Show splash screen on startup (default: 1)</source>
- <translation type="unfinished"/>
+ <translation>Mostrar pantalla de arraque al iniciar (por defecto: 1)</translation>
</message>
<message>
<location line="+1"/>
<source>Choose data directory on startup (default: 0)</source>
- <translation type="unfinished"/>
+ <translation>Escojer el directorio de información al iniciar (por defecto : 0)</translation>
</message>
</context>
<context>
@@ -1217,7 +1229,7 @@ Address: %4
<translation>Opciones</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+13"/>
<source>&amp;Main</source>
<translation type="unfinished"/>
</message>
@@ -1242,57 +1254,87 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+35"/>
- <source>Reset all client options to default.</source>
+ <location line="+9"/>
+ <source>Size of &amp;database cache</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>&amp;Reset Options</source>
+ <location line="+13"/>
+ <source>Set database cache size in megabytes (default: 25)</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+13"/>
- <source>&amp;Network</source>
+ <source>MB</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>
+ <location line="+27"/>
+ <source>Number of script &amp;verification threads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Connect to the Bitcoin network through a SOCKS proxy.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
- <source>Map port using &amp;UPnP</source>
+ <source>&amp;Connect through SOCKS proxy (default proxy):</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>
+ <location line="+34"/>
+ <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+224"/>
+ <source>Active command-line options that override above options:</source>
+ <translation>Activar las opciones de linea de comando que sobre escriben las siguientes opciones:</translation>
+ </message>
+ <message>
+ <location line="+43"/>
+ <source>Reset all client options to default.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
- <source>&amp;Connect through SOCKS proxy:</source>
+ <source>&amp;Reset Options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+9"/>
- <source>Proxy &amp;IP:</source>
+ <location line="-323"/>
+ <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="+19"/>
- <source>IP address of the proxy (e.g. 127.0.0.1)</source>
+ <source>Proxy &amp;IP:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="+32"/>
<source>&amp;Port:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+19"/>
+ <location line="+25"/>
<source>Port of the proxy (e.g. 9050)</source>
<translation type="unfinished"/>
</message>
@@ -1377,7 +1419,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+71"/>
+ <location line="+136"/>
<source>&amp;OK</source>
<translation type="unfinished"/>
</message>
@@ -1387,44 +1429,38 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>&amp;Apply</source>
+ <location filename="../optionsdialog.cpp" line="+67"/>
+ <source>default</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+63"/>
- <source>default</source>
+ <location line="+57"/>
+ <source>none</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+131"/>
+ <location line="+75"/>
<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>
+ <location line="+29"/>
+ <source>Client restart required to activate changes.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
- <location line="+9"/>
- <source>Warning</source>
+ <location line="-29"/>
+ <source>Client will be shutdown, do you want to proceed?</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-9"/>
- <location line="+9"/>
- <source>This setting will take effect after restarting Bitcoin.</source>
+ <location line="+33"/>
+ <source>This change would require a client restart.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+29"/>
+ <location line="+34"/>
<source>The supplied proxy address is invalid.</source>
<translation type="unfinished"/>
</message>
@@ -1438,22 +1474,22 @@ Address: %4
</message>
<message>
<location line="+50"/>
- <location line="+214"/>
+ <location line="+231"/>
<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="-140"/>
+ <location line="-155"/>
<source>Unconfirmed:</source>
<translation>Inconformidad :</translation>
</message>
<message>
- <location line="-81"/>
+ <location line="-83"/>
<source>Wallet</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+49"/>
+ <location line="+51"/>
<source>Confirmed:</source>
<translation type="unfinished"/>
</message>
@@ -1488,7 +1524,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+56"/>
+ <location line="+71"/>
<source>&lt;b&gt;Recent transactions&lt;/b&gt;</source>
<translation>&lt;b&gt;Transacciones recientes&lt;/b&gt;</translation>
</message>
@@ -1502,7 +1538,8 @@ Address: %4
<context>
<name>PaymentServer</name>
<message>
- <location filename="../paymentserver.cpp" line="+397"/>
+ <location filename="../paymentserver.cpp" line="+403"/>
+ <location line="+13"/>
<source>URI handling</source>
<translation type="unfinished"/>
</message>
@@ -1512,24 +1549,52 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+91"/>
+ <location line="+96"/>
<source>Requested payment amount of %1 is too small (considered dust).</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-204"/>
- <location line="+195"/>
+ <location line="-221"/>
+ <location line="+212"/>
<location line="+13"/>
+ <location line="+95"/>
+ <location line="+18"/>
+ <location line="+16"/>
<source>Payment request error</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-207"/>
+ <location line="-353"/>
<source>Cannot start bitcoin: click-to-pay handler</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+195"/>
+ <location line="+58"/>
+ <source>Net manager warning</source>
+ <translation>advertencia del administrador de red.</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Your active proxy doesn&apos;t support SOCKS5, which is required for payment requests via proxy.</source>
+ <translation>Tu active proxy no soporta SOCKS5, el cual es requerido para solicitud de pago via proxy. </translation>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>Payment request fetch URL is invalid: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Payment request file handling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Payment request file can not be read or processed! This can be caused by an invalid payment request file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+73"/>
<source>Unverified payment requests to custom payment scripts are unsupported.</source>
<translation type="unfinished"/>
</message>
@@ -1539,24 +1604,27 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
+ <location line="+43"/>
<source>Error communicating with %1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+28"/>
+ <location line="+24"/>
+ <source>Payment request can not be parsed or processed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
<source>Bad response from server %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+32"/>
+ <location line="+33"/>
<source>Payment acknowledged</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-55"/>
- <location line="+27"/>
- <location line="+17"/>
+ <location line="-11"/>
<source>Network request error</source>
<translation type="unfinished"/>
</message>
@@ -1564,18 +1632,18 @@ Address: %4
<context>
<name>QObject</name>
<message>
- <location filename="../bitcoin.cpp" line="+119"/>
- <location line="+5"/>
+ <location filename="../bitcoin.cpp" line="+71"/>
+ <location line="+11"/>
<source>Bitcoin</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-4"/>
+ <location line="+1"/>
<source>Error: Specified data directory &quot;%1&quot; does not exist.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="-12"/>
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation type="unfinished"/>
</message>
@@ -1617,15 +1685,16 @@ Address: %4
<location line="+23"/>
<location line="+23"/>
<location line="+36"/>
- <location line="+53"/>
+ <location line="+23"/>
+ <location line="+36"/>
<location line="+23"/>
<location line="+23"/>
- <location filename="../rpcconsole.cpp" line="+360"/>
+ <location filename="../rpcconsole.cpp" line="+359"/>
<source>N/A</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-217"/>
+ <location line="-223"/>
<source>Client version</source>
<translation type="unfinished"/>
</message>
@@ -1640,7 +1709,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+78"/>
+ <location line="+25"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+53"/>
<source>Using OpenSSL version</source>
<translation type="unfinished"/>
</message>
@@ -1656,16 +1730,16 @@ Address: %4
</message>
<message>
<location line="+7"/>
- <source>Number of connections</source>
+ <source>Name</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+23"/>
- <source>On testnet</source>
+ <source>Number of connections</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+23"/>
+ <location line="+29"/>
<source>Block chain</source>
<translation type="unfinished"/>
</message>
@@ -1690,16 +1764,6 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
- <source>Command-line options</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+10"/>
- <source>&amp;Show</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location line="+24"/>
<source>&amp;Console</source>
<translation type="unfinished"/>
@@ -1730,17 +1794,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-541"/>
+ <location line="-521"/>
<source>Build date</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-79"/>
- <source>Bitcoin Core</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+279"/>
+ <location line="+206"/>
<source>Debug log file</source>
<translation type="unfinished"/>
</message>
@@ -1750,11 +1809,6 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+26"/>
- <source>Show the Bitcoin-Core help message to get a list with possible Bitcoin command-line options.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location line="+76"/>
<source>Clear console</source>
<translation type="unfinished"/>
@@ -1775,7 +1829,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+128"/>
+ <location line="+122"/>
<source>%1 B</source>
<translation type="unfinished"/>
</message>
@@ -1818,12 +1872,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+19"/>
- <source>The amount to request</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="-32"/>
+ <location line="-13"/>
<source>&amp;Label:</source>
<translation>&amp;Etiqueta</translation>
</message>
@@ -1833,12 +1882,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+20"/>
- <source>The message to attach to payment request</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="-37"/>
+ <location line="-17"/>
<source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
@@ -1849,16 +1893,26 @@ Address: %4
</message>
<message>
<location line="+27"/>
- <source>The label to associate with the new receiving address</source>
- <translation type="unfinished"/>
+ <source>An optional label to associate with the new receiving address</source>
+ <translation>Etiqueta opcional para asocuar con el nuevo domicilio de entrgas.</translation>
</message>
<message>
- <location line="+14"/>
- <source>Use this form to request payments. All fields are optional.</source>
- <translation type="unfinished"/>
+ <location line="+7"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
+ <translation>Mensaje opcional para agregar a la solicitud de pago, el cual será mostrado cuando la solicitud este abierta. Nota: El mensaje no se manda con el pago a travéz de la red de Bitcoin.</translation>
</message>
<message>
- <location line="+56"/>
+ <location line="+7"/>
+ <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
+ <translation>Use este formulario para la solicitud de pagos. Todos los campos son &lt;b&gt;opcionales&lt;/b&gt;</translation>
+ </message>
+ <message>
+ <location line="+39"/>
+ <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
+ <translation>Monto opcional a solicitar. Dejarlo vacion o en cero no solicita un monto especifico.</translation>
+ </message>
+ <message>
+ <location line="+17"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"/>
</message>
@@ -1874,11 +1928,11 @@ Address: %4
</message>
<message>
<location line="+47"/>
- <source>Previously requested payments</source>
+ <source>Requested payments</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+12"/>
+ <location line="+16"/>
<source>Show the selected request (does the same as double clicking an entry)</source>
<translation type="unfinished"/>
</message>
@@ -1969,7 +2023,7 @@ Address: %4
<context>
<name>RecentRequestsTableModel</name>
<message>
- <location filename="../recentrequeststablemodel.cpp" line="+14"/>
+ <location filename="../recentrequeststablemodel.cpp" line="+24"/>
<source>Date</source>
<translation>Fecha</translation>
</message>
@@ -1989,7 +2043,7 @@ Address: %4
<translation>Monto</translation>
</message>
<message>
- <location line="+36"/>
+ <location line="+38"/>
<source>(no label)</source>
<translation>(sin etiqueta)</translation>
</message>
@@ -2004,7 +2058,7 @@ Address: %4
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
<location filename="../sendcoinsdialog.cpp" line="+381"/>
- <location line="+81"/>
+ <location line="+80"/>
<source>Send Coins</source>
<translation>Mandar monedas</translation>
</message>
@@ -2036,22 +2090,22 @@ Address: %4
<message>
<location line="+35"/>
<source>Bytes:</source>
- <translation type="unfinished"/>
+ <translation>Bytes:</translation>
</message>
<message>
<location line="+48"/>
<source>Amount:</source>
- <translation type="unfinished"/>
+ <translation>Monto:</translation>
</message>
<message>
<location line="+32"/>
<source>Priority:</source>
- <translation type="unfinished"/>
+ <translation>Prioridad:</translation>
</message>
<message>
<location line="+48"/>
<source>Fee:</source>
- <translation type="unfinished"/>
+ <translation>Cuota:</translation>
</message>
<message>
<location line="+32"/>
@@ -2114,7 +2168,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-229"/>
+ <location filename="../sendcoinsdialog.cpp" line="-228"/>
<source>Confirm send coins</source>
<translation>Confirme para mandar monedas</translation>
</message>
@@ -2217,22 +2271,22 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+113"/>
+ <location line="+112"/>
<source>Warning: Invalid Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+21"/>
<source>(no label)</source>
<translation>(sin etiqueta)</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="-11"/>
<source>Warning: Unknown change address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-378"/>
+ <location line="-366"/>
<source>Are you sure you want to send?</source>
<translation type="unfinished"/>
</message>
@@ -2256,13 +2310,13 @@ Address: %4
<name>SendCoinsEntry</name>
<message>
<location filename="../forms/sendcoinsentry.ui" line="+131"/>
- <location line="+501"/>
+ <location line="+521"/>
<location line="+536"/>
<source>A&amp;mount:</source>
<translation>M&amp;onto</translation>
</message>
<message>
- <location line="-1132"/>
+ <location line="-1152"/>
<source>Pay &amp;To:</source>
<translation>Pagar &amp;a:</translation>
</message>
@@ -2308,23 +2362,33 @@ Address: %4
</message>
<message>
<location line="+7"/>
- <location line="+504"/>
+ <location line="+524"/>
<location line="+536"/>
<source>Remove this entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-40"/>
+ <location line="-1008"/>
+ <source>Message:</source>
+ <translation>Mensaje:</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation>Mensaje que se agrgará al URI de Bitcoin el cual sera almacenado con la transacción para su referencia. Nota: Este mensaje no será mandado a travéz de la red de Bitcoin.</translation>
+ </message>
+ <message>
+ <location line="+958"/>
<source>This is a verified payment request.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-971"/>
+ <location line="-991"/>
<source>Enter a label for this address to add it to the list of used addresses</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+439"/>
+ <location line="+459"/>
<source>This is an unverified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2347,6 +2411,19 @@ Address: %4
</message>
</context>
<context>
+ <name>ShutdownWindow</name>
+ <message>
+ <location filename="../utilitydialog.cpp" line="+48"/>
+ <source>Bitcoin Core is shutting down...</source>
+ <translation>Apagando el nucleo de Bitcoin...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Do not shut down the computer until this window disappears.</source>
+ <translation>No apague su computadora hasta que esta ventana desaparesca.</translation>
+ </message>
+</context>
+<context>
<name>SignVerifyMessageDialog</name>
<message>
<location filename="../forms/signverifymessagedialog.ui" line="+14"/>
@@ -2354,7 +2431,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+10"/>
<source>&amp;Sign Message</source>
<translation type="unfinished"/>
</message>
@@ -2542,9 +2619,9 @@ Address: %4
<context>
<name>SplashScreen</name>
<message>
- <location filename="../splashscreen.cpp" line="+26"/>
+ <location filename="../splashscreen.cpp" line="+28"/>
<source>Bitcoin Core</source>
- <translation type="unfinished"/>
+ <translation>nucleo Bitcoin</translation>
</message>
<message>
<location line="+2"/>
@@ -2641,12 +2718,12 @@ Address: %4
<location line="+12"/>
<location line="+45"/>
<location line="+17"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Credit</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="-120"/>
+ <location line="-125"/>
<source>matures in %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -2659,12 +2736,12 @@ Address: %4
<location line="+44"/>
<location line="+8"/>
<location line="+15"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Debit</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-57"/>
+ <location line="-62"/>
<source>Transaction fee</source>
<translation type="unfinished"/>
</message>
@@ -2675,11 +2752,12 @@ Address: %4
</message>
<message>
<location line="+6"/>
+ <location line="+9"/>
<source>Message</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="-7"/>
<source>Comment</source>
<translation type="unfinished"/>
</message>
@@ -2689,7 +2767,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+18"/>
<source>Merchant</source>
<translation type="unfinished"/>
</message>
@@ -2729,7 +2807,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-227"/>
+ <location line="-232"/>
<source>, has not been successfully broadcast yet</source>
<translation>, no ha sido transmitido aun</translation>
</message>
@@ -2779,8 +2857,13 @@ Address: %4
<source>Amount</source>
<translation>Monto</translation>
</message>
+ <message>
+ <location line="+59"/>
+ <source>Immature (%1 confirmations, will be available after %2)</source>
+ <translation type="unfinished"/>
+ </message>
<message numerus="yes">
- <location line="+57"/>
+ <location line="+16"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -2800,17 +2883,13 @@ Address: %4
<translation>sin confirmar (%1 de %2 confirmaciones)</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="-22"/>
+ <location line="+25"/>
<source>Confirmed (%1 confirmations)</source>
<translation>Confimado (%1 confirmaciones)</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></translation>
- </message>
<message>
- <location line="+5"/>
+ <location line="-22"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation>Este bloque no fue recibido por ningun nodo y probablemente no fue aceptado !</translation>
</message>
@@ -2820,7 +2899,7 @@ Address: %4
<translation>Generado pero no aprovado</translation>
</message>
<message>
- <location line="+43"/>
+ <location line="+62"/>
<source>Received with</source>
<translation>Recivido con</translation>
</message>
@@ -3116,9 +3195,9 @@ Address: %4
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+217"/>
+ <location filename="../bitcoinstrings.cpp" line="+221"/>
<source>Usage:</source>
- <translation type="unfinished"/>
+ <translation>Uso:</translation>
</message>
<message>
<location line="-54"/>
@@ -3136,7 +3215,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+23"/>
+ <location line="+22"/>
<source>Specify configuration file (default: bitcoin.conf)</source>
<translation type="unfinished"/>
</message>
@@ -3156,7 +3235,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-27"/>
+ <location line="-26"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
<translation type="unfinished"/>
</message>
@@ -3166,7 +3245,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-50"/>
+ <location line="-51"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation type="unfinished"/>
</message>
@@ -3176,22 +3255,22 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-147"/>
+ <location line="-148"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-33"/>
+ <location line="-36"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation type="unfinished"/>
</message>
@@ -3201,7 +3280,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<source>Run in the background as a daemon and accept commands</source>
<translation type="unfinished"/>
</message>
@@ -3211,12 +3290,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-117"/>
+ <location line="-118"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-92"/>
+ <location line="-95"/>
<source>%s, you must set a rpcpassword in the configuration file:
%s
It is recommended you use the following random password:
@@ -3257,6 +3336,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+4"/>
+ <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</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>
@@ -3362,6 +3446,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+1"/>
+ <source>Do not load the wallet and disable wallet RPC calls</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Do you want to rebuild the block database now?</source>
<translation type="unfinished"/>
</message>
@@ -3526,7 +3615,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Enviar instrucción al servidor de Bitcoin</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+7"/>
<source>Set maximum block size in bytes (default: %d)</source>
<translation type="unfinished"/>
</message>
@@ -3546,7 +3635,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Iniciar servidor Bitcoin</translation>
</message>
<message>
- <location line="+12"/>
+ <location line="+3"/>
+ <source>This is intended for regression testing tools and app development.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Usage (deprecated, use bitcoin-cli):</source>
<translation type="unfinished"/>
</message>
@@ -3571,7 +3665,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
+ <location line="+2"/>
+ <source>Wallet options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source>
<translation type="unfinished"/>
</message>
@@ -3581,12 +3680,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-78"/>
+ <location line="-79"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-104"/>
+ <location line="-105"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
@@ -3606,7 +3705,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+88"/>
+ <location line="+89"/>
<source>Information</source>
<translation type="unfinished"/>
</message>
@@ -3656,11 +3755,6 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Send trace/debug info to debugger</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location line="+6"/>
<source>Set minimum block size in bytes (default: 0)</source>
<translation type="unfinished"/>
@@ -3686,7 +3780,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Transaction amount too small</source>
<translation type="unfinished"/>
</message>
@@ -3716,7 +3810,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Warning</source>
<translation type="unfinished"/>
</message>
@@ -3728,7 +3822,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<message>
<location line="+2"/>
<source>version</source>
- <translation type="unfinished"/>
+ <translation>Versión</translation>
</message>
<message>
<location line="+1"/>
@@ -3736,37 +3830,37 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-57"/>
+ <location line="-58"/>
<source>Password for JSON-RPC connections</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-69"/>
+ <location line="-70"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-131"/>
+ <location line="-132"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+160"/>
+ <location line="+161"/>
<source>Upgrade wallet to latest format</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-12"/>
+ <location line="-11"/>
<source>Rescan the block chain for missing wallet transactions</source>
<translation type="unfinished"/>
</message>
@@ -3776,7 +3870,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-29"/>
+ <location line="-30"/>
<source>Server certificate file (default: server.cert)</source>
<translation type="unfinished"/>
</message>
@@ -3791,17 +3885,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Unable to bind to %s on this computer (bind returned error %d, %s)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-106"/>
+ <location line="-107"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+59"/>
+ <location line="+60"/>
<source>Loading addresses...</source>
<translation>Cargando direcciones...</translation>
</message>
@@ -3841,7 +3935,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3851,7 +3945,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+47"/>
+ <location line="+48"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3871,7 +3965,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Cargando indice de bloques... </translation>
</message>
<message>
- <location line="-61"/>
+ <location line="-62"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation type="unfinished"/>
</message>
@@ -3881,12 +3975,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+94"/>
+ <location line="+95"/>
<source>Loading wallet...</source>
<translation>Cargando billetera...</translation>
</message>
<message>
- <location line="-55"/>
+ <location line="-56"/>
<source>Cannot downgrade wallet</source>
<translation type="unfinished"/>
</message>
@@ -3896,7 +3990,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+66"/>
+ <location line="+67"/>
<source>Rescanning...</source>
<translation type="unfinished"/>
</message>
@@ -3916,7 +4010,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-34"/>
+ <location line="-35"/>
<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 c091cf03f0..9addf3009c 100644
--- a/src/qt/locale/bitcoin_et.ts
+++ b/src/qt/locale/bitcoin_et.ts
@@ -3,13 +3,13 @@
<name>AboutDialog</name>
<message>
<location filename="../forms/aboutdialog.ui" line="+14"/>
- <source>About Bitcoin</source>
- <translation>Bitcoinist</translation>
+ <source>About Bitcoin Core</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+39"/>
- <source>&lt;b&gt;Bitcoin&lt;/b&gt; version</source>
- <translation>&lt;b&gt;Bitcoini&lt;/b&gt; versioon</translation>
+ <source>&lt;b&gt;Bitcoin Core&lt;/b&gt; version</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+57"/>
@@ -27,13 +27,13 @@ Levitatud MIT/X11 tarkvara litsentsi all, vaata kaasasolevat faili COPYING või
Toode sisaldab OpenSSL Projekti all toodetud tarkvara, mis on kasutamiseks OpenSSL Toolkitis (http://www.openssl.org/) ja Eric Young&apos;i poolt loodud krüptograafilist tarkvara (eay@cryptsoft.com) ning Thomas Bernard&apos;i loodud UPnP tarkvara.</translation>
</message>
<message>
- <location filename="../aboutdialog.cpp" line="+14"/>
+ <location filename="../utilitydialog.cpp" line="+29"/>
<source>Copyright</source>
<translation>Autoriõigus</translation>
</message>
<message>
<location line="+0"/>
- <source>The Bitcoin developers</source>
+ <source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
</context>
@@ -70,7 +70,7 @@ Toode sisaldab OpenSSL Projekti all toodetud tarkvara, mis on kasutamiseks OpenS
<translation type="unfinished"/>
</message>
<message>
- <location filename="../addressbookpage.cpp" line="+72"/>
+ <location filename="../addressbookpage.cpp" line="+74"/>
<source>&amp;Copy Address</source>
<translation>&amp;Aadressi kopeerimine</translation>
</message>
@@ -140,7 +140,7 @@ Toode sisaldab OpenSSL Projekti all toodetud tarkvara, mis on kasutamiseks OpenS
<translation>&amp;Muuda</translation>
</message>
<message>
- <location line="+197"/>
+ <location line="+194"/>
<source>Export Address List</source>
<translation type="unfinished"/>
</message>
@@ -151,19 +151,19 @@ Toode sisaldab OpenSSL Projekti all toodetud tarkvara, mis on kasutamiseks OpenS
</message>
<message>
<location line="+13"/>
- <source>Error exporting</source>
- <translation>Viga eksportimisel</translation>
+ <source>Exporting Failed</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation>Tõrge faili kirjutamisel %1.</translation>
+ <location line="+1"/>
+ <source>There was an error trying to save the address list to %1.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<name>AddressTableModel</name>
<message>
- <location filename="../addresstablemodel.cpp" line="+164"/>
+ <location filename="../addresstablemodel.cpp" line="+168"/>
<source>Label</source>
<translation>Silt</translation>
</message>
@@ -201,7 +201,7 @@ Toode sisaldab OpenSSL Projekti all toodetud tarkvara, mis on kasutamiseks OpenS
<translation>Korda salafraasi</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="+34"/>
+ <location filename="../askpassphrasedialog.cpp" line="+40"/>
<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>Sisesta rahakotile uus salafraas.&lt;br/&gt;Palun kasuta salafraasina &lt;b&gt;vähemalt 10 tähte/numbrit/sümbolit&lt;/b&gt;, või &lt;b&gt;vähemalt 8 sõna&lt;/b&gt;.</translation>
</message>
@@ -322,22 +322,27 @@ Toode sisaldab OpenSSL Projekti all toodetud tarkvara, mis on kasutamiseks OpenS
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+250"/>
+ <location filename="../bitcoingui.cpp" line="+295"/>
<source>Sign &amp;message...</source>
<translation>Signeeri &amp;sõnum</translation>
</message>
<message>
- <location line="+254"/>
+ <location line="+335"/>
<source>Synchronizing with network...</source>
<translation>Võrgusünkimine...</translation>
</message>
<message>
- <location line="-324"/>
+ <location line="-407"/>
<source>&amp;Overview</source>
<translation>&amp;Ãœlevaade</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="-137"/>
+ <source>Node</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+138"/>
<source>Show general overview of wallet</source>
<translation>Kuva rahakoti üld-ülevaade</translation>
</message>
@@ -352,7 +357,7 @@ Toode sisaldab OpenSSL Projekti all toodetud tarkvara, mis on kasutamiseks OpenS
<translation>Sirvi tehingute ajalugu</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>E&amp;xit</source>
<translation>V&amp;älju</translation>
</message>
@@ -398,7 +403,22 @@ Toode sisaldab OpenSSL Projekti all toodetud tarkvara, mis on kasutamiseks OpenS
<translation>&amp;Salafraasi muutmine</translation>
</message>
<message>
- <location line="+259"/>
+ <location line="+10"/>
+ <source>&amp;Sending addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Receiving addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open &amp;URI...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+325"/>
<source>Importing blocks from disk...</source>
<translation>Impordi blokid kettalt...</translation>
</message>
@@ -408,12 +428,12 @@ Toode sisaldab OpenSSL Projekti all toodetud tarkvara, mis on kasutamiseks OpenS
<translation>Kettal olevate blokkide re-indekseerimine...</translation>
</message>
<message>
- <location line="-322"/>
+ <location line="-405"/>
<source>Send coins to a Bitcoin address</source>
<translation>Saada münte Bitcoini aadressile</translation>
</message>
<message>
- <location line="+47"/>
+ <location line="+49"/>
<source>Modify configuration options for Bitcoin</source>
<translation>Muuda Bitcoini seadeid</translation>
</message>
@@ -443,20 +463,17 @@ Toode sisaldab OpenSSL Projekti all toodetud tarkvara, mis on kasutamiseks OpenS
<translation>&amp;Kontrolli sõnumit...</translation>
</message>
<message>
- <location line="-180"/>
- <location line="+6"/>
- <location line="+513"/>
+ <location line="+430"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-519"/>
- <location line="+6"/>
+ <location line="-643"/>
<source>Wallet</source>
<translation>Rahakott</translation>
</message>
<message>
- <location line="+109"/>
+ <location line="+146"/>
<source>&amp;Send</source>
<translation>&amp;Saada</translation>
</message>
@@ -466,13 +483,7 @@ Toode sisaldab OpenSSL Projekti all toodetud tarkvara, mis on kasutamiseks OpenS
<translation>&amp;Saama</translation>
</message>
<message>
- <location line="+28"/>
- <location line="+2"/>
- <source>&amp;About Bitcoin</source>
- <translation>%Bitcoinist</translation>
- </message>
- <message>
- <location line="+14"/>
+ <location line="+46"/>
<location line="+2"/>
<source>&amp;Show / Hide</source>
<translation>&amp;Näita / Peida</translation>
@@ -498,64 +509,80 @@ Toode sisaldab OpenSSL Projekti all toodetud tarkvara, mis on kasutamiseks OpenS
<translation>Kinnita sõnumid kindlustamaks et need allkirjastati määratud Bitcoini aadressiga</translation>
</message>
<message>
- <location line="+35"/>
+ <location line="+48"/>
<source>&amp;File</source>
<translation>&amp;Fail</translation>
</message>
<message>
- <location line="+10"/>
+ <location line="+14"/>
<source>&amp;Settings</source>
<translation>&amp;Seaded</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>&amp;Help</source>
<translation>&amp;Abi</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+15"/>
<source>Tabs toolbar</source>
<translation>Vahelehe tööriistariba</translation>
</message>
<message>
- <location line="-235"/>
- <location line="+294"/>
+ <location line="-284"/>
+ <location line="+376"/>
<source>[testnet]</source>
<translation>[testnet]</translation>
</message>
<message>
- <location line="-177"/>
+ <location line="-401"/>
+ <source>Bitcoin Core</source>
+ <translation>Bitcoini tuumik</translation>
+ </message>
+ <message>
+ <location line="+163"/>
<source>Request payments (generates QR codes and bitcoin: URIs)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+63"/>
- <source>&amp;Used sending addresses...</source>
+ <location line="+29"/>
+ <location line="+2"/>
+ <source>&amp;About Bitcoin Core</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="+35"/>
<source>Show the list of used sending addresses and labels</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Used &amp;receiving addresses...</source>
+ <location line="+2"/>
+ <source>Show the list of used receiving addresses and labels</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open a bitcoin: URI or payment request</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Command-line options</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
- <source>Show the list of used receiving addresses and labels</source>
+ <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+106"/>
+ <location line="+159"/>
<location line="+5"/>
<source>Bitcoin client</source>
<translation>Bitcoini klient</translation>
</message>
<message numerus="yes">
- <location line="+120"/>
+ <location line="+142"/>
<source>%n active connection(s) to Bitcoin network</source>
<translation><numerusform>%n aktiivne ühendus Bitcoini võrku</numerusform><numerusform>%n aktiivset ühendust Bitcoini võrku</numerusform></translation>
</message>
@@ -575,7 +602,7 @@ Toode sisaldab OpenSSL Projekti all toodetud tarkvara, mis on kasutamiseks OpenS
<translation>Protsessitud %1 tehingute ajaloo blokki.</translation>
</message>
<message numerus="yes">
- <location line="+20"/>
+ <location line="+23"/>
<source>%n hour(s)</source>
<translation><numerusform>%n tund</numerusform><numerusform>%n tundi</numerusform></translation>
</message>
@@ -595,7 +622,7 @@ Toode sisaldab OpenSSL Projekti all toodetud tarkvara, mis on kasutamiseks OpenS
<translation>%1 maas</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="+21"/>
<source>Last received block was generated %1 ago.</source>
<translation>Viimane saabunud blokk loodi %1 tagasi.</translation>
</message>
@@ -620,27 +647,17 @@ Toode sisaldab OpenSSL Projekti all toodetud tarkvara, mis on kasutamiseks OpenS
<translation>Informatsioon</translation>
</message>
<message>
- <location line="+77"/>
- <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
- <translation>See tehing ületab mahupiirangu. Saatmine on võimalik %1, node&apos;idele ning võrgustiku toetuseks, makstava lisatasu eest. Kas nõustud lisatasuga?</translation>
- </message>
- <message>
- <location line="-152"/>
+ <location line="-85"/>
<source>Up to date</source>
<translation>Ajakohane</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Catching up...</source>
<translation>Jõuan...</translation>
</message>
<message>
- <location line="+124"/>
- <source>Confirm transaction fee</source>
- <translation>Kinnita tehingu tasu</translation>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+130"/>
<source>Sent transaction</source>
<translation>Saadetud tehing</translation>
</message>
@@ -662,17 +679,7 @@ Tüüp: %3âŽ
Aadress: %4âŽ</translation>
</message>
<message>
- <location line="+34"/>
- <source>URI handling</source>
- <translation>URI käsitsemine</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
- <translation>URI ei suudeta parsida. Põhjuseks võib olla kehtetu Bitcoini aadress või vigased URI parameetrid.</translation>
- </message>
- <message>
- <location line="+45"/>
+ <location line="+69"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation>Rahakott on &lt;b&gt;krüpteeritud&lt;/b&gt; ning hetkel &lt;b&gt;avatud&lt;/b&gt;</translation>
</message>
@@ -682,7 +689,7 @@ Aadress: %4âŽ</translation>
<translation>Rahakott on &lt;b&gt;krüpteeritud&lt;/b&gt; ning hetkel &lt;b&gt;suletud&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+110"/>
+ <location filename="../bitcoin.cpp" line="+438"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation>Ilmnes kriitiline tõrge. Bitcoin suletakse turvakaalutluste tõttu.</translation>
</message>
@@ -690,12 +697,304 @@ Aadress: %4âŽ</translation>
<context>
<name>ClientModel</name>
<message>
- <location filename="../clientmodel.cpp" line="+115"/>
+ <location filename="../clientmodel.cpp" line="+119"/>
<source>Network Alert</source>
<translation>Võrgu Häire</translation>
</message>
</context>
<context>
+ <name>CoinControlDialog</name>
+ <message>
+ <location filename="../forms/coincontroldialog.ui" line="+14"/>
+ <source>Coin Control Address Selection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>Quantity:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Bytes:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>Amount:</source>
+ <translation>Summa:</translation>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Priority:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Low Output:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>After Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Change:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+63"/>
+ <source>(un)select all</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Tree mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>List mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>Amount</source>
+ <translation>Kogus</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Address</source>
+ <translation>Aadress</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Date</source>
+ <translation>Kuupäev</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Confirmations</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Confirmed</source>
+ <translation>Kinnitatud</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../coincontroldialog.cpp" line="+42"/>
+ <source>Copy address</source>
+ <translation>Aadressi kopeerimine</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy label</source>
+ <translation>Märgise kopeerimine</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+26"/>
+ <source>Copy amount</source>
+ <translation>Kopeeri summa</translation>
+ </message>
+ <message>
+ <location line="-25"/>
+ <source>Copy transaction ID</source>
+ <translation>Kopeeri tehingu ID</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Lock unspent</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Unlock unspent</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+22"/>
+ <source>Copy quantity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Copy fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy after fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy bytes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy low output</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy change</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+323"/>
+ <source>highest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>higher</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>high</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>medium-high</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>medium</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>low-medium</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>low</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>lower</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>lowest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>(%1 locked)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+140"/>
+ <source>Dust</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>yes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>no</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>This label turns red, if the transaction size is greater than 1000 bytes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+5"/>
+ <source>This means a fee of at least %1 per kB is required.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-4"/>
+ <source>Can vary +/- 1 byte per input.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Transactions with higher priority are more likely to get included into a block.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>This label turns red, if the priority is smaller than &quot;medium&quot;.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>This label turns red, if any recipient receives an amount smaller than %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+4"/>
+ <source>This means a fee of at least %1 is required.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-3"/>
+ <source>Amounts below 0.546 times the minimum relay fee are shown as dust.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>This label turns red, if the change is smaller than %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
+ <location line="+66"/>
+ <source>(no label)</source>
+ <translation>(silti pole)</translation>
+ </message>
+ <message>
+ <location line="-9"/>
+ <source>change from %1 (%2)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>(change)</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>EditAddressDialog</name>
<message>
<location filename="../forms/editaddressdialog.ui" line="+14"/>
@@ -723,7 +1022,7 @@ Aadress: %4âŽ</translation>
<translation>&amp;Aadress</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+21"/>
+ <location filename="../editaddressdialog.cpp" line="+28"/>
<source>New receiving address</source>
<translation>Uus sissetulev aadress</translation>
</message>
@@ -766,7 +1065,7 @@ Aadress: %4âŽ</translation>
<context>
<name>FreespaceChecker</name>
<message>
- <location filename="../intro.cpp" line="+61"/>
+ <location filename="../intro.cpp" line="+65"/>
<source>A new data directory will be created.</source>
<translation type="unfinished"/>
</message>
@@ -792,15 +1091,19 @@ Aadress: %4âŽ</translation>
</message>
</context>
<context>
- <name>GUIUtil::HelpMessageBox</name>
+ <name>HelpMessageDialog</name>
<message>
- <location filename="../guiutil.cpp" line="+558"/>
- <location line="+13"/>
- <source>Bitcoin-Qt</source>
- <translation>Bitcoini-Qt</translation>
+ <location filename="../forms/helpmessagedialog.ui" line="+19"/>
+ <source>Bitcoin Core - Command-line options</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="-13"/>
+ <location filename="../utilitydialog.cpp" line="+38"/>
+ <source>Bitcoin Core</source>
+ <translation>Bitcoini tuumik</translation>
+ </message>
+ <message>
+ <location line="+0"/>
<source>version</source>
<translation>versioon</translation>
</message>
@@ -849,17 +1152,17 @@ Aadress: %4âŽ</translation>
</message>
<message>
<location line="+9"/>
- <source>Welcome to Bitcoin-Qt.</source>
+ <source>Welcome to Bitcoin Core.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+26"/>
- <source>As this is the first time the program is launched, you can choose where Bitcoin-Qt will store its data.</source>
+ <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+10"/>
- <source>Bitcoin-Qt will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
+ <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -873,7 +1176,17 @@ Aadress: %4âŽ</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../intro.cpp" line="+105"/>
+ <location filename="../intro.cpp" line="+85"/>
+ <source>Bitcoin</source>
+ <translation>Bitcoin</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error: Specified data directory &quot;%1&quot; can not be created.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+19"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
@@ -889,6 +1202,34 @@ Aadress: %4âŽ</translation>
</message>
</context>
<context>
+ <name>OpenURIDialog</name>
+ <message>
+ <location filename="../forms/openuridialog.ui" line="+14"/>
+ <source>Open URI</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Open payment request from URI or file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>URI:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Select payment request file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../openuridialog.cpp" line="+47"/>
+ <source>Select payment request file to open</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OptionsDialog</name>
<message>
<location filename="../forms/optionsdialog.ui" line="+14"/>
@@ -896,7 +1237,7 @@ Aadress: %4âŽ</translation>
<translation>Valikud</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+13"/>
<source>&amp;Main</source>
<translation>%Peamine</translation>
</message>
@@ -921,7 +1262,52 @@ Aadress: %4âŽ</translation>
<translation>&amp;Start Bitcoin sisselogimisel</translation>
</message>
<message>
- <location line="+35"/>
+ <location line="+9"/>
+ <source>Size of &amp;database cache</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set database cache size in megabytes (default: 25)</source>
+ <translation>Sea andmebaasi vahemälu suurus MB (vaikeväärtus: 25)</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>MB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Number of script &amp;verification threads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Connect to the Bitcoin network through a SOCKS proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Connect through SOCKS proxy (default proxy):</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+224"/>
+ <source>Active command-line options that override above options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
<source>Reset all client options to default.</source>
<translation>Taasta kõik klientprogrammi seadete vaikeväärtused.</translation>
</message>
@@ -931,7 +1317,7 @@ Aadress: %4âŽ</translation>
<translation>&amp;Lähtesta valikud</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="-323"/>
<source>&amp;Network</source>
<translation>&amp;Võrk</translation>
</message>
@@ -946,32 +1332,17 @@ Aadress: %4âŽ</translation>
<translation>Suuna port &amp;UPnP kaudu</translation>
</message>
<message>
- <location line="+7"/>
- <source>Connect to the Bitcoin network through a SOCKS proxy (e.g. when connecting through Tor).</source>
- <translation>Kasuta Bitcoini võrgustikku ühendumiseks SOCKS turva proxy&apos;t (nt Tor&apos;i kasutamisel).</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>&amp;Connect through SOCKS proxy:</source>
- <translation>%Connect läbi turva proxi:</translation>
- </message>
- <message>
- <location line="+9"/>
+ <location line="+19"/>
<source>Proxy &amp;IP:</source>
<translation>Proxi &amp;IP:</translation>
</message>
<message>
- <location line="+19"/>
- <source>IP address of the proxy (e.g. 127.0.0.1)</source>
- <translation>Proxi IP (nt 127.0.0.1)</translation>
- </message>
- <message>
- <location line="+7"/>
+ <location line="+32"/>
<source>&amp;Port:</source>
<translation>&amp;Port:</translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+25"/>
<source>Port of the proxy (e.g. 9050)</source>
<translation>Proxi port (nt 9050)</translation>
</message>
@@ -1046,7 +1417,17 @@ Aadress: %4âŽ</translation>
<translation>Tehingute loetelu &amp;Display aadress</translation>
</message>
<message>
- <location line="+71"/>
+ <location line="+7"/>
+ <source>Whether to show coin control features or not.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Display coin &amp;control features (experts only)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+136"/>
<source>&amp;OK</source>
<translation>&amp;OK</translation>
</message>
@@ -1056,44 +1437,38 @@ Aadress: %4âŽ</translation>
<translation>&amp;Katkesta</translation>
</message>
<message>
- <location line="+10"/>
- <source>&amp;Apply</source>
- <translation>&amp;Rakenda</translation>
- </message>
- <message>
- <location filename="../optionsdialog.cpp" line="+58"/>
+ <location filename="../optionsdialog.cpp" line="+67"/>
<source>default</source>
<translation>vaikeväärtus</translation>
</message>
<message>
- <location line="+130"/>
+ <location line="+57"/>
+ <source>none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+75"/>
<source>Confirm options reset</source>
<translation>Kinnita valikute algseadistamine</translation>
</message>
<message>
<location line="+1"/>
- <source>Some settings may require a client restart to take effect.</source>
- <translation>Mõned seadete muudatused rakenduvad programmi käivitumisel.</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Do you want to proceed?</source>
- <translation>Kas soovid jätkata?</translation>
+ <location line="+29"/>
+ <source>Client restart required to activate changes.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
- <location line="+9"/>
- <source>Warning</source>
- <translation>Hoiatus</translation>
+ <location line="-29"/>
+ <source>Client will be shutdown, do you want to proceed?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="-9"/>
- <location line="+9"/>
- <source>This setting will take effect after restarting Bitcoin.</source>
- <translation>Tehtud valik rakendub Bitcoini käivitamisel.</translation>
+ <location line="+33"/>
+ <source>This change would require a client restart.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+29"/>
+ <location line="+34"/>
<source>The supplied proxy address is invalid.</source>
<translation>Sisestatud kehtetu proxy aadress.</translation>
</message>
@@ -1107,22 +1482,22 @@ Aadress: %4âŽ</translation>
</message>
<message>
<location line="+50"/>
- <location line="+202"/>
+ <location line="+231"/>
<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>Kuvatav info ei pruugi olla ajakohane. Ühenduse loomisel süngitakse sinu rahakott automaatselt Bitconi võrgustikuga, kuid see toiming on hetkel lõpetamata.</translation>
</message>
<message>
- <location line="-131"/>
+ <location line="-155"/>
<source>Unconfirmed:</source>
<translation>Kinnitamata:</translation>
</message>
<message>
- <location line="-78"/>
+ <location line="-83"/>
<source>Wallet</source>
<translation>Rahakott</translation>
</message>
<message>
- <location line="+49"/>
+ <location line="+51"/>
<source>Confirmed:</source>
<translation type="unfinished"/>
</message>
@@ -1132,12 +1507,12 @@ Aadress: %4âŽ</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="+29"/>
+ <location line="+32"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+16"/>
<source>Immature:</source>
<translation>Ebaküps:</translation>
</message>
@@ -1147,7 +1522,7 @@ Aadress: %4âŽ</translation>
<translation>Mitte aegunud mine&apos;itud jääk</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+16"/>
<source>Total:</source>
<translation type="unfinished"/>
</message>
@@ -1157,12 +1532,12 @@ Aadress: %4âŽ</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="+53"/>
+ <location line="+71"/>
<source>&lt;b&gt;Recent transactions&lt;/b&gt;</source>
<translation>&lt;b&gt;Uuesti saadetud tehingud&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../overviewpage.cpp" line="+116"/>
+ <location filename="../overviewpage.cpp" line="+120"/>
<location line="+1"/>
<source>out of sync</source>
<translation>sünkimata</translation>
@@ -1171,7 +1546,8 @@ Aadress: %4âŽ</translation>
<context>
<name>PaymentServer</name>
<message>
- <location filename="../paymentserver.cpp" line="+392"/>
+ <location filename="../paymentserver.cpp" line="+403"/>
+ <location line="+13"/>
<source>URI handling</source>
<translation>URI käsitsemine</translation>
</message>
@@ -1181,45 +1557,82 @@ Aadress: %4âŽ</translation>
<translation>URI ei suudeta parsida. Põhjuseks võib olla kehtetu Bitcoini aadress või vigased URI parameetrid.</translation>
</message>
<message>
- <location line="+69"/>
+ <location line="+96"/>
<source>Requested payment amount of %1 is too small (considered dust).</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
- <location line="+37"/>
+ <location line="-221"/>
+ <location line="+212"/>
+ <location line="+13"/>
+ <location line="+95"/>
+ <location line="+18"/>
+ <location line="+16"/>
<source>Payment request error</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="-353"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
+ <translation>Bitcoin ei käivitu: vajuta-maksa toiming</translation>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Net manager warning</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+1"/>
- <source>Insecure requests to custom payment scripts unsupported</source>
+ <source>Your active proxy doesn&apos;t support SOCKS5, which is required for payment requests via proxy.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+38"/>
+ <location line="+52"/>
+ <source>Payment request fetch URL is invalid: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Payment request file handling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Payment request file can not be read or processed! This can be caused by an invalid payment request file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+73"/>
+ <source>Unverified payment requests to custom payment scripts are unsupported.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+59"/>
<source>Refund from %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
+ <location line="+43"/>
<source>Error communicating with %1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+24"/>
+ <source>Payment request can not be parsed or processed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
<source>Bad response from server %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+32"/>
+ <location line="+33"/>
<source>Payment acknowledged</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-58"/>
- <location line="+30"/>
- <location line="+17"/>
+ <location line="-11"/>
<source>Network request error</source>
<translation type="unfinished"/>
</message>
@@ -1227,32 +1640,26 @@ Aadress: %4âŽ</translation>
<context>
<name>QObject</name>
<message>
- <location filename="../bitcoin.cpp" line="+114"/>
- <location line="+5"/>
- <location filename="../intro.cpp" line="-32"/>
+ <location filename="../bitcoin.cpp" line="+71"/>
+ <location line="+11"/>
<source>Bitcoin</source>
- <translation type="unfinished"/>
+ <translation>Bitcoin</translation>
</message>
<message>
- <location line="-4"/>
+ <location line="+1"/>
<source>Error: Specified data directory &quot;%1&quot; does not exist.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="-12"/>
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../intro.cpp" line="+1"/>
- <source>Error: Specified data directory &quot;%1&quot; can not be created.</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>QRImageWidget</name>
<message>
- <location filename="../receiverequestdialog.cpp" line="+32"/>
+ <location filename="../receiverequestdialog.cpp" line="+36"/>
<source>&amp;Save Image...</source>
<translation type="unfinished"/>
</message>
@@ -1268,8 +1675,8 @@ Aadress: %4âŽ</translation>
</message>
<message>
<location line="+0"/>
- <source>PNG Images (*.png)</source>
- <translation>PNG pildifail (*.png)</translation>
+ <source>PNG Image (*.png)</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1286,15 +1693,16 @@ Aadress: %4âŽ</translation>
<location line="+23"/>
<location line="+23"/>
<location line="+36"/>
- <location line="+53"/>
+ <location line="+23"/>
+ <location line="+36"/>
<location line="+23"/>
<location line="+23"/>
- <location filename="../rpcconsole.cpp" line="+352"/>
+ <location filename="../rpcconsole.cpp" line="+359"/>
<source>N/A</source>
<translation>N/A</translation>
</message>
<message>
- <location line="-217"/>
+ <location line="-223"/>
<source>Client version</source>
<translation>Kliendi versioon</translation>
</message>
@@ -1304,7 +1712,17 @@ Aadress: %4âŽ</translation>
<translation>&amp;Informatsioon</translation>
</message>
<message>
- <location line="+68"/>
+ <location line="-10"/>
+ <source>Debug window</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+25"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+53"/>
<source>Using OpenSSL version</source>
<translation>Kasutan OpenSSL versiooni</translation>
</message>
@@ -1320,16 +1738,16 @@ Aadress: %4âŽ</translation>
</message>
<message>
<location line="+7"/>
- <source>Number of connections</source>
- <translation>Ãœhenduste arv</translation>
+ <source>Name</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+23"/>
- <source>On testnet</source>
- <translation>Testnetis</translation>
+ <source>Number of connections</source>
+ <translation>Ãœhenduste arv</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+29"/>
<source>Block chain</source>
<translation>Ploki jada</translation>
</message>
@@ -1354,21 +1772,6 @@ Aadress: %4âŽ</translation>
<translation>&amp;Ava</translation>
</message>
<message>
- <location line="+16"/>
- <source>Command-line options</source>
- <translation>Käsurea valikud</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>Näita kehtivate käsurea valikute kuvamiseks Bitcoini-Qt abiteksti</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>&amp;Show</source>
- <translation>&amp;Kuva</translation>
- </message>
- <message>
<location line="+24"/>
<source>&amp;Console</source>
<translation>&amp;Konsool</translation>
@@ -1399,22 +1802,12 @@ Aadress: %4âŽ</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="-541"/>
+ <location line="-521"/>
<source>Build date</source>
<translation>Valmistusaeg</translation>
</message>
<message>
- <location line="-104"/>
- <source>Bitcoin - Debug window</source>
- <translation>Bitcoin - debugimise aken</translation>
- </message>
- <message>
- <location line="+25"/>
- <source>Bitcoin Core</source>
- <translation>Bitcoini tuumik</translation>
- </message>
- <message>
- <location line="+279"/>
+ <location line="+206"/>
<source>Debug log file</source>
<translation>Debugimise logifail</translation>
</message>
@@ -1424,7 +1817,7 @@ Aadress: %4âŽ</translation>
<translation>Ava Bitcoini logifail praegusest andmekaustast. Toiminguks võib kuluda kuni mõni sekund.</translation>
</message>
<message>
- <location line="+102"/>
+ <location line="+76"/>
<source>Clear console</source>
<translation>Puhasta konsool</translation>
</message>
@@ -1444,7 +1837,7 @@ Aadress: %4âŽ</translation>
<translation>Ülevaateks võimalikest käsklustest trüki &lt;b&gt;help&lt;/b&gt;.</translation>
</message>
<message>
- <location line="+128"/>
+ <location line="+122"/>
<source>%1 B</source>
<translation type="unfinished"/>
</message>
@@ -1482,48 +1875,48 @@ Aadress: %4âŽ</translation>
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+22"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
<source>&amp;Amount:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
- <source>The amount to request</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+7"/>
+ <location line="-13"/>
<source>&amp;Label:</source>
<translation>&amp;Märgis</translation>
</message>
<message>
- <location line="+10"/>
- <source>The label to associate with the receiving address</source>
+ <location line="-34"/>
+ <source>&amp;Message:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>&amp;Message:</source>
+ <location line="-17"/>
+ <source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>The message to attach to payment request</source>
+ <location line="+3"/>
+ <source>R&amp;euse an existing receiving address (not recommended)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
- <source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
+ <location line="+27"/>
+ <source>An optional label to associate with the new receiving address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>R&amp;euse an existing receiving address (not recommended)</source>
+ <location line="+7"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+7"/>
- <source>Use this form to request payments. All fields are optional.</source>
+ <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+39"/>
+ <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1541,6 +1934,31 @@ Aadress: %4âŽ</translation>
<source>&amp;Request payment</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+47"/>
+ <source>Requested payments</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Show the selected request (does the same as double clicking an entry)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Show</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Remove the selected entries from the list</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Remove</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
@@ -1561,16 +1979,11 @@ Aadress: %4âŽ</translation>
</message>
<message>
<location line="+7"/>
- <source>&amp;Copy Image</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+7"/>
<source>&amp;Save Image...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../receiverequestdialog.cpp" line="+58"/>
+ <location filename="../receiverequestdialog.cpp" line="+56"/>
<source>Request payment to %1</source>
<translation type="unfinished"/>
</message>
@@ -1616,16 +2029,119 @@ Aadress: %4âŽ</translation>
</message>
</context>
<context>
+ <name>RecentRequestsTableModel</name>
+ <message>
+ <location filename="../recentrequeststablemodel.cpp" line="+24"/>
+ <source>Date</source>
+ <translation>Kuupäev</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Label</source>
+ <translation>Silt</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Message</source>
+ <translation>Sõnum</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Amount</source>
+ <translation>Kogus</translation>
+ </message>
+ <message>
+ <location line="+38"/>
+ <source>(no label)</source>
+ <translation>(silti pole)</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>(no message)</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+140"/>
- <location line="+213"/>
+ <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location line="+80"/>
<source>Send Coins</source>
<translation>Müntide saatmine</translation>
</message>
<message>
- <location line="+50"/>
+ <location line="+76"/>
+ <source>Coin Control Features</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Inputs...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>automatically selected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Insufficient funds!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+89"/>
+ <source>Quantity:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+35"/>
+ <source>Bytes:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Amount:</source>
+ <translation>Summa:</translation>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Priority:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Low Output:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>After Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Change:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+44"/>
+ <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Custom change address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+115"/>
<source>Send to multiple recipients at once</source>
<translation>Saatmine mitmele korraga</translation>
</message>
@@ -1650,12 +2166,7 @@ Aadress: %4âŽ</translation>
<translation>Jääk:</translation>
</message>
<message>
- <location line="+10"/>
- <source>123.456 BTC</source>
- <translation>123,456 BTC</translation>
- </message>
- <message>
- <location line="+31"/>
+ <location line="+41"/>
<source>Confirm the send action</source>
<translation>Saatmise kinnitamine</translation>
</message>
@@ -1665,69 +2176,135 @@ Aadress: %4âŽ</translation>
<translation>S&amp;aada</translation>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-154"/>
+ <location filename="../sendcoinsdialog.cpp" line="-228"/>
<source>Confirm send coins</source>
<translation>Müntide saatmise kinnitamine</translation>
</message>
<message>
- <location line="-90"/>
+ <location line="-74"/>
<location line="+5"/>
<location line="+5"/>
+ <location line="+4"/>
<source>%1 to %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+26"/>
+ <location line="-136"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation>Sisesta Bitcoini aadress (nt: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Copy quantity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation>Kopeeri summa</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy after fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy bytes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy low output</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy change</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+170"/>
+ <source>Total Amount %1 (= %2)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>or</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+202"/>
<source>The recipient address is not valid, please recheck.</source>
<translation>Saaja aadress ei ole kehtiv, palun kontrolli.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The amount to pay must be larger than 0.</source>
<translation>Makstav summa peab olema suurem kui 0.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The amount exceeds your balance.</source>
<translation>Summa ületab jäägi.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The total exceeds your balance when the %1 transaction fee is included.</source>
<translation>Summa koos tehingu tasuga %1 ületab sinu jääki.</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+3"/>
<source>Duplicate address found, can only send to each address once per send operation.</source>
<translation>Ãœhe saatmisega topelt-adressaati olla ei tohi.</translation>
</message>
<message>
+ <location line="+3"/>
+ <source>Transaction creation failed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+4"/>
- <source>Error: Transaction creation failed!</source>
- <translation>Tõrge: Tehingu loomine ebaõnnestus!</translation>
+ <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+15"/>
- <source>Are you sure you want to send?</source>
+ <location line="+112"/>
+ <source>Warning: Invalid Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+9"/>
- <source>added as transaction fee</source>
+ <location line="+21"/>
+ <source>(no label)</source>
+ <translation>(silti pole)</translation>
+ </message>
+ <message>
+ <location line="-11"/>
+ <source>Warning: Unknown change address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
- <source>Total Amount %1</source>
+ <location line="-366"/>
+ <source>Are you sure you want to send?</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+20"/>
- <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>Viga: Tehingust keelduti. Nt rahakoti koopia kasutamisel võivad selle põhjustada juba kulutatud mündid.</translation>
+ <location line="+9"/>
+ <source>added as transaction fee</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+144"/>
+ <location line="+170"/>
<source>Payment request expired</source>
<translation type="unfinished"/>
</message>
@@ -1740,39 +2317,44 @@ Aadress: %4âŽ</translation>
<context>
<name>SendCoinsEntry</name>
<message>
- <location filename="../forms/sendcoinsentry.ui" line="+33"/>
- <location line="+585"/>
+ <location filename="../forms/sendcoinsentry.ui" line="+131"/>
+ <location line="+521"/>
+ <location line="+536"/>
<source>A&amp;mount:</source>
<translation>S&amp;umma:</translation>
</message>
<message>
- <location line="-572"/>
- <location line="+585"/>
+ <location line="-1152"/>
<source>Pay &amp;To:</source>
<translation>Maksa &amp;:</translation>
</message>
<message>
- <location line="-551"/>
+ <location line="+18"/>
<source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>Tehingu saaja aadress (nt: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location filename="../sendcoinsentry.cpp" line="+28"/>
+ <location filename="../sendcoinsentry.cpp" line="+30"/>
<source>Enter a label for this address to add it to your address book</source>
<translation>Aadressiraamatusse sisestamiseks märgista aadress</translation>
</message>
<message>
- <location filename="../forms/sendcoinsentry.ui" line="-18"/>
+ <location filename="../forms/sendcoinsentry.ui" line="+57"/>
<source>&amp;Label:</source>
<translation>&amp;Märgis</translation>
</message>
<message>
- <location line="+28"/>
+ <location line="-50"/>
<source>Choose previously used address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
+ <location line="-40"/>
+ <source>This is a normal payment.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+50"/>
<source>Alt+A</source>
<translation>Alt+A</translation>
</message>
@@ -1788,16 +2370,45 @@ Aadress: %4âŽ</translation>
</message>
<message>
<location line="+7"/>
- <source>Remove this recipient</source>
- <translation>Saaja eemaldamine</translation>
+ <location line="+524"/>
+ <location line="+536"/>
+ <source>Remove this entry</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="-1008"/>
+ <source>Message:</source>
+ <translation>Sõnum:</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+958"/>
+ <source>This is a verified payment request.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-991"/>
<source>Enter a label for this address to add it to the list of used addresses</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+465"/>
+ <location line="+459"/>
+ <source>This is an unverified payment request.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+18"/>
+ <location line="+532"/>
+ <source>Pay To:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-498"/>
+ <location line="+536"/>
<source>Memo:</source>
<translation type="unfinished"/>
</message>
@@ -1808,6 +2419,19 @@ Aadress: %4âŽ</translation>
</message>
</context>
<context>
+ <name>ShutdownWindow</name>
+ <message>
+ <location filename="../utilitydialog.cpp" line="+48"/>
+ <source>Bitcoin Core is shutting down...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Do not shut down the computer until this window disappears.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>SignVerifyMessageDialog</name>
<message>
<location filename="../forms/signverifymessagedialog.ui" line="+14"/>
@@ -1815,7 +2439,7 @@ Aadress: %4âŽ</translation>
<translation>Signatuurid - Allkirjasta / Kinnita Sõnum</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+10"/>
<source>&amp;Sign Message</source>
<translation>&amp;Allkirjastamise teade</translation>
</message>
@@ -1918,7 +2542,7 @@ Aadress: %4âŽ</translation>
<translation>Tühjenda kõik sõnumi kinnitamise väljad</translation>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+27"/>
+ <location filename="../signverifymessagedialog.cpp" line="+29"/>
<location line="+3"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>Sisesta Bitcoini aadress (nt: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
@@ -1934,7 +2558,7 @@ Aadress: %4âŽ</translation>
<translation>Sisesta Bitcoini allkiri</translation>
</message>
<message>
- <location line="+85"/>
+ <location line="+84"/>
<location line="+81"/>
<source>The entered address is invalid.</source>
<translation>Sisestatud aadress ei kehti.</translation>
@@ -2003,8 +2627,13 @@ Aadress: %4âŽ</translation>
<context>
<name>SplashScreen</name>
<message>
- <location filename="../splashscreen.cpp" line="+23"/>
- <source>The Bitcoin developers</source>
+ <location filename="../splashscreen.cpp" line="+28"/>
+ <source>Bitcoin Core</source>
+ <translation>Bitcoini tuumik</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
<message>
@@ -2016,7 +2645,7 @@ Aadress: %4âŽ</translation>
<context>
<name>TrafficGraphWidget</name>
<message>
- <location filename="../trafficgraphwidget.cpp" line="+75"/>
+ <location filename="../trafficgraphwidget.cpp" line="+79"/>
<source>KB/s</source>
<translation type="unfinished"/>
</message>
@@ -2024,7 +2653,7 @@ Aadress: %4âŽ</translation>
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="+22"/>
+ <location filename="../transactiondesc.cpp" line="+28"/>
<source>Open until %1</source>
<translation>Avatud kuni %1</translation>
</message>
@@ -2097,12 +2726,12 @@ Aadress: %4âŽ</translation>
<location line="+12"/>
<location line="+45"/>
<location line="+17"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Credit</source>
<translation>Krediit</translation>
</message>
<message numerus="yes">
- <location line="-120"/>
+ <location line="-125"/>
<source>matures in %n more block(s)</source>
<translation><numerusform>aegub %n bloki pärast</numerusform><numerusform>aegub %n bloki pärast</numerusform></translation>
</message>
@@ -2115,12 +2744,12 @@ Aadress: %4âŽ</translation>
<location line="+44"/>
<location line="+8"/>
<location line="+15"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Debit</source>
<translation>Deebet</translation>
</message>
<message>
- <location line="-57"/>
+ <location line="-62"/>
<source>Transaction fee</source>
<translation>Tehingu tasu</translation>
</message>
@@ -2131,11 +2760,12 @@ Aadress: %4âŽ</translation>
</message>
<message>
<location line="+6"/>
+ <location line="+9"/>
<source>Message</source>
<translation>Sõnum</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="-7"/>
<source>Comment</source>
<translation>Kommentaar</translation>
</message>
@@ -2145,7 +2775,7 @@ Aadress: %4âŽ</translation>
<translation>Tehingu ID</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+18"/>
<source>Merchant</source>
<translation type="unfinished"/>
</message>
@@ -2185,7 +2815,7 @@ Aadress: %4âŽ</translation>
<translation>vale</translation>
</message>
<message>
- <location line="-227"/>
+ <location line="-232"/>
<source>, has not been successfully broadcast yet</source>
<translation>, veel esitlemata</translation>
</message>
@@ -2216,7 +2846,7 @@ Aadress: %4âŽ</translation>
<context>
<name>TransactionTableModel</name>
<message>
- <location filename="../transactiontablemodel.cpp" line="+227"/>
+ <location filename="../transactiontablemodel.cpp" line="+234"/>
<source>Date</source>
<translation>Kuupäev</translation>
</message>
@@ -2235,8 +2865,13 @@ Aadress: %4âŽ</translation>
<source>Amount</source>
<translation>Kogus</translation>
</message>
+ <message>
+ <location line="+59"/>
+ <source>Immature (%1 confirmations, will be available after %2)</source>
+ <translation type="unfinished"/>
+ </message>
<message numerus="yes">
- <location line="+57"/>
+ <location line="+16"/>
<source>Open for %n more block(s)</source>
<translation><numerusform>Avaneb %n bloki pärast</numerusform><numerusform>Avaneb %n bloki pärast</numerusform></translation>
</message>
@@ -2256,17 +2891,13 @@ Aadress: %4âŽ</translation>
<translation>Kinnitamata (%1/%2 kinnitust)</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="-22"/>
+ <location line="+25"/>
<source>Confirmed (%1 confirmations)</source>
<translation>Kinnitatud (%1 kinnitust)</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>Mine&apos;itud jääk muutub kättesaadavaks %n bloki läbimisel</numerusform><numerusform>Mine&apos;itud jääk muutub kättesaadavaks %n bloki läbimisel</numerusform></translation>
- </message>
<message>
- <location line="+5"/>
+ <location line="-22"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation>Antud klotsi pole saanud ükski osapool ning tõenäoliselt seda ei aktsepteerita!</translation>
</message>
@@ -2276,7 +2907,7 @@ Aadress: %4âŽ</translation>
<translation>Loodud, kuid aktsepteerimata</translation>
</message>
<message>
- <location line="+43"/>
+ <location line="+62"/>
<source>Received with</source>
<translation>Saadud koos</translation>
</message>
@@ -2334,7 +2965,7 @@ Aadress: %4âŽ</translation>
<context>
<name>TransactionView</name>
<message>
- <location filename="../transactionview.cpp" line="+52"/>
+ <location filename="../transactionview.cpp" line="+57"/>
<location line="+16"/>
<source>All</source>
<translation>Kõik</translation>
@@ -2395,12 +3026,12 @@ Aadress: %4âŽ</translation>
<translation>Muu</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+6"/>
<source>Enter address or label to search</source>
<translation>Otsimiseks sisesta märgis või aadress</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+6"/>
<source>Min amount</source>
<translation>Vähim summa</translation>
</message>
@@ -2435,17 +3066,37 @@ Aadress: %4âŽ</translation>
<translation>Kuva tehingu detailid</translation>
</message>
<message>
- <location line="+143"/>
- <source>Export Transaction Data</source>
- <translation>Tehinguandmete eksport</translation>
+ <location line="+142"/>
+ <source>Export Transaction History</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="+19"/>
+ <source>Exporting Failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>There was an error trying to save the transaction history to %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Exporting Successful</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The transaction history was successfully saved to %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-22"/>
<source>Comma separated file (*.csv)</source>
<translation>Komaeraldatud fail (*.csv)</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+9"/>
<source>Confirmed</source>
<translation>Kinnitatud</translation>
</message>
@@ -2480,17 +3131,7 @@ Aadress: %4âŽ</translation>
<translation>ID</translation>
</message>
<message>
- <location line="+4"/>
- <source>Error exporting</source>
- <translation>Viga eksportimisel</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation>Tõrge faili kirjutamisel %1.</translation>
- </message>
- <message>
- <location line="+100"/>
+ <location line="+107"/>
<source>Range:</source>
<translation>Ulatus:</translation>
</message>
@@ -2501,9 +3142,17 @@ Aadress: %4âŽ</translation>
</message>
</context>
<context>
+ <name>WalletFrame</name>
+ <message>
+ <location filename="../walletframe.cpp" line="+26"/>
+ <source>No wallet has been loaded.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>WalletModel</name>
<message>
- <location filename="../walletmodel.cpp" line="+218"/>
+ <location filename="../walletmodel.cpp" line="+245"/>
<source>Send Coins</source>
<translation type="unfinished"/>
</message>
@@ -2511,7 +3160,7 @@ Aadress: %4âŽ</translation>
<context>
<name>WalletView</name>
<message>
- <location filename="../walletview.cpp" line="+46"/>
+ <location filename="../walletview.cpp" line="+43"/>
<source>&amp;Export</source>
<translation type="unfinished"/>
</message>
@@ -2521,65 +3170,60 @@ Aadress: %4âŽ</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="+183"/>
+ <location line="+181"/>
<source>Backup Wallet</source>
<translation>Varundatud Rahakott</translation>
</message>
<message>
- <location line="+0"/>
+ <location line="+1"/>
<source>Wallet Data (*.dat)</source>
<translation>Rahakoti andmed (*.dat)</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="+6"/>
<source>Backup Failed</source>
<translation>Varundamine nurjus</translation>
</message>
<message>
<location line="+0"/>
- <source>There was an error trying to save the wallet data to the new location.</source>
- <translation>Rahakoti andmete uude kohta salvestamine nurjus.</translation>
+ <source>There was an error trying to save the wallet data to %1.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+4"/>
- <source>Backup Successful</source>
- <translation>Varundamine õnnestus</translation>
+ <source>The wallet data was successfully saved to %1.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+0"/>
- <source>The wallet data was successfully saved to the new location.</source>
- <translation>Rahakoti andmete uude kohta salvestamine õnnestus.</translation>
+ <source>Backup Successful</source>
+ <translation>Varundamine õnnestus</translation>
</message>
</context>
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+102"/>
- <source>Bitcoin version</source>
- <translation>Bitcoini versioon</translation>
- </message>
- <message>
- <location line="+107"/>
+ <location filename="../bitcoinstrings.cpp" line="+221"/>
<source>Usage:</source>
<translation>Kasutus:</translation>
</message>
<message>
- <location line="-55"/>
+ <location line="-54"/>
<source>List commands</source>
<translation>Käskluste loetelu</translation>
</message>
<message>
- <location line="-13"/>
+ <location line="-14"/>
<source>Get help for a command</source>
<translation>Käskluste abiinfo</translation>
</message>
<message>
- <location line="+25"/>
+ <location line="+26"/>
<source>Options:</source>
<translation>Valikud:</translation>
</message>
<message>
- <location line="+24"/>
+ <location line="+22"/>
<source>Specify configuration file (default: bitcoin.conf)</source>
<translation>Täpsusta sätete fail (vaikimisi: bitcoin.conf)</translation>
</message>
@@ -2599,7 +3243,7 @@ Aadress: %4âŽ</translation>
<translation>Sea andmebaasi vahemälu suurus MB (vaikeväärtus: 25)</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-26"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
<translation>Kuula ühendusi pordil &lt;port&gt; (vaikeväärtus: 8333 või testnet: 18333)</translation>
</message>
@@ -2609,7 +3253,7 @@ Aadress: %4âŽ</translation>
<translation>Säilita vähemalt &lt;n&gt; ühendust peeridega (vaikeväärtus: 125)</translation>
</message>
<message>
- <location line="-49"/>
+ <location line="-51"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation>Peeri aadressi saamiseks ühendu korraks node&apos;iga</translation>
</message>
@@ -2619,37 +3263,37 @@ Aadress: %4âŽ</translation>
<translation>Täpsusta enda avalik aadress</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation>Ulakate peeride valulävi (vaikeväärtus: 100)</translation>
</message>
<message>
- <location line="-142"/>
+ <location line="-148"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation>Mitme sekundi pärast ulakad peerid tagasi võivad tulla (vaikeväärtus: 86400)</translation>
</message>
<message>
- <location line="-33"/>
+ <location line="-36"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
<translation>RPC pordi %u kuulamiseks seadistamisel ilmnes viga IPv4&apos;l: %s</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation>Kuula JSON-RPC ühendusel seda porti &lt;port&gt; (vaikeväärtus: 8332 või testnet: 18332)</translation>
</message>
<message>
- <location line="+40"/>
+ <location line="+45"/>
<source>Accept command line and JSON-RPC commands</source>
<translation>Luba käsurea ning JSON-RPC käsklusi</translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>Tööta taustal ning aktsepteeri käsklusi</translation>
</message>
<message>
- <location line="+40"/>
+ <location line="+39"/>
<source>Use the test network</source>
<translation>Testvõrgu kasutamine</translation>
</message>
@@ -2659,7 +3303,7 @@ Aadress: %4âŽ</translation>
<translation>Luba välisühendusi (vaikeväärtus: 1 kui puudub -proxy või -connect)</translation>
</message>
<message>
- <location line="-87"/>
+ <location line="-95"/>
<source>%s, you must set a rpcpassword in the configuration file:
%s
It is recommended you use the following random password:
@@ -2710,6 +3354,11 @@ nt: alertnotify=echo %%s | email -s &quot;Bitcoin Alert&quot; admin@foo.com
</message>
<message>
<location line="+4"/>
+ <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</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>Tõrge: Tehingust keelduti! Põhjuseks võib olla juba kulutatud mündid, nt kui wallet.dat fail koopias kulutatid mündid, kuid ei märgitud neid siin vastavalt.</translation>
</message>
@@ -2724,17 +3373,17 @@ nt: alertnotify=echo %%s | email -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Käivita käsklus, kui rahakoti tehing muutub (%s cmd&apos;s muudetakse TxID&apos;ks)</translation>
</message>
<message>
- <location line="+11"/>
- <source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source>
- <translation>Sea &quot;kõrge tähtsusega&quot;/&quot;madala tehingu lisatasuga&quot; tehingute maksimumsuurus baitides (vaikeväärtus: 27000)</translation>
- </message>
- <message>
- <location line="+6"/>
+ <location line="+18"/>
<source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
<translation>See on test-versioon - kasutamine omal riisikol - ära kasuta mining&apos;uks ega kaupmeeste programmides</translation>
</message>
<message>
<location line="+5"/>
+ <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
<source>Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source>
<translation>Hoiatus: -paytxfee on seatud väga kõrgeks! See on sinu poolt makstav tehingu lisatasu.</translation>
</message>
@@ -2764,17 +3413,27 @@ nt: alertnotify=echo %%s | email -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Hoiatus: toimus wallet.dat faili andmete päästmine! Originaal wallet.dat nimetati kaustas %s ümber wallet.{ajatempel}.bak&apos;iks, jäägi või tehingute ebakõlade puhul tuleks teha backup&apos;ist taastamine.</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="+9"/>
+ <source>&lt;category&gt; can be:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
<source>Attempt to recover private keys from a corrupt wallet.dat</source>
<translation>Püüa vigasest wallet.dat failist taastada turvavõtmed</translation>
</message>
<message>
<location line="+1"/>
+ <source>Bitcoin Core Daemon</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Bitcoin RPC client version</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
<source>Block creation options:</source>
<translation>Blokeeri loomise valikud:</translation>
</message>
@@ -2784,7 +3443,12 @@ nt: alertnotify=echo %%s | email -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Ühendu ainult määratud node&apos;i(de)ga</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
+ <source>Connect through SOCKS proxy</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect to JSON-RPC on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation type="unfinished"/>
</message>
@@ -2800,6 +3464,11 @@ nt: alertnotify=echo %%s | email -s &quot;Bitcoin Alert&quot; admin@foo.com
</message>
<message>
<location line="+1"/>
+ <source>Do not load the wallet and disable wallet RPC calls</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Do you want to rebuild the block database now?</source>
<translation>Kas soovid bloki andmebaasi taastada?</translation>
</message>
@@ -2894,7 +3563,12 @@ nt: alertnotify=echo %%s | email -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Tagasivõtmise andmete kirjutamine ebaõnnestus</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
+ <source>Fee per kB to add to transactions you send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Find peers using DNS lookup (default: 1 unless -connect)</source>
<translation>Otsi DNS&apos;i lookup&apos;i kastavaid peere (vaikeväärtus: 1, kui mitte -connect)</translation>
</message>
@@ -2914,6 +3588,11 @@ nt: alertnotify=echo %%s | email -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Blokkide kontrollimise põhjalikkus (0-4, vaikeväärtus: 3)</translation>
</message>
<message>
+ <location line="+1"/>
+ <source>If &lt;category&gt; is not supplied, output all debugging information.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+2"/>
<source>Incorrect or no genesis block found. Wrong datadir for network?</source>
<translation type="unfinished"/>
@@ -2929,17 +3608,37 @@ nt: alertnotify=echo %%s | email -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation type="unfinished"/>
</message>
<message>
- <location line="+8"/>
+ <location line="+5"/>
+ <source>Prepend debug output with timestamp (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>RPC client options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Rebuild block chain index from current blk000??.dat files</source>
<translation>Taasta bloki jada indeks blk000??.dat failist</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+5"/>
+ <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Send command to Bitcoin server</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
+ <location line="+7"/>
+ <source>Set maximum block size in bytes (default: %d)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Set the number of threads to service RPC calls (default: 4)</source>
<translation>Määra RPC kõnede haldurite arv (vaikeväärtus: 4)</translation>
</message>
@@ -2954,12 +3653,17 @@ nt: alertnotify=echo %%s | email -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation type="unfinished"/>
</message>
<message>
- <location line="+12"/>
+ <location line="+3"/>
+ <source>This is intended for regression testing tools and app development.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Usage (deprecated, use bitcoin-cli):</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+8"/>
+ <location line="+7"/>
<source>Verifying blocks...</source>
<translation>Kontrollin blokke...</translation>
</message>
@@ -2970,31 +3674,56 @@ nt: alertnotify=echo %%s | email -s &quot;Bitcoin Alert&quot; admin@foo.com
</message>
<message>
<location line="+1"/>
+ <source>Wait for RPC server to start</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Wallet %s resides outside data directory %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+2"/>
+ <source>Wallet options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>You need to rebuild the database using -reindex to change -txindex</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-78"/>
+ <location line="-79"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation>Impordi blokid välisest blk000??.dat failist</translation>
</message>
<message>
- <location line="-98"/>
+ <location line="-105"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+17"/>
+ <location line="+14"/>
+ <source>Output debugging information (default: 0, supplying &lt;category&gt; is optional)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+83"/>
+ <location line="+89"/>
<source>Information</source>
<translation>Informatsioon</translation>
</message>
@@ -3034,47 +3763,17 @@ nt: alertnotify=echo %%s | email -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Ühenda ainult node&apos;idega &lt;net&gt; võrgus (IPv4, IPv6 või Tor)</translation>
</message>
<message>
- <location line="+2"/>
- <source>Output extra debugging information. Implies all other -debug* options</source>
- <translation>Väljund lisa debug&apos;imise infoks. Tuleneb kõikidest teistest -debug* valikutest</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Output extra network debugging information</source>
- <translation>Lisa võrgu debug&apos;imise info väljund</translation>
- </message>
- <message>
- <location line="+2"/>
- <source>Prepend debug output with timestamp</source>
- <translation>Varusta debugi väljund ajatempliga</translation>
- </message>
- <message>
- <location line="+5"/>
+ <location line="+9"/>
<source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
<translation>SSL valikud: (vaata Bitcoini Wikist või SSL sätete juhendist)</translation>
</message>
<message>
- <location line="+1"/>
- <source>Select the version of socks proxy to use (4-5, default: 5)</source>
- <translation>Vali turva proxi SOCKS versioon (4-5, vaikeväärtus: 5)</translation>
- </message>
- <message>
- <location line="+3"/>
+ <location line="+4"/>
<source>Send trace/debug info to console instead of debug.log file</source>
<translation>Saada jälitus/debug, debug.log faili asemel, konsooli</translation>
</message>
<message>
- <location line="+1"/>
- <source>Send trace/debug info to debugger</source>
- <translation>Saada jälitus/debug info debuggerile</translation>
- </message>
- <message>
- <location line="+5"/>
- <source>Set maximum block size in bytes (default: 250000)</source>
- <translation>Sea maksimaalne bloki suurus baitides (vaikeväärtus: 250000)</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+6"/>
<source>Set minimum block size in bytes (default: 0)</source>
<translation>Sea minimaalne bloki suurus baitides (vaikeväärtus: 0)</translation>
</message>
@@ -3099,7 +3798,7 @@ nt: alertnotify=echo %%s | email -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Süsteemi tõrge:</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Transaction amount too small</source>
<translation type="unfinished"/>
</message>
@@ -3124,32 +3823,32 @@ nt: alertnotify=echo %%s | email -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Kasuta kuulatava pordi määramiseks UPnP ühendust (vaikeväärtus: 1, kui kuulatakse)</translation>
</message>
<message>
- <location line="+1"/>
- <source>Use proxy to reach tor hidden services (default: same as -proxy)</source>
- <translation>Kasuta varjatud teenustele ligipääsuks proxy&apos;t (vaikeväärtus: sama, mis -proxy)</translation>
- </message>
- <message>
<location line="+2"/>
<source>Username for JSON-RPC connections</source>
<translation>JSON-RPC ühenduste kasutajatunnus</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+7"/>
<source>Warning</source>
<translation>Hoiatus</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Warning: This version is obsolete, upgrade required!</source>
<translation>Hoiatus: versioon on aegunud, uuendus on nõutav!</translation>
</message>
<message>
<location line="+2"/>
+ <source>version</source>
+ <translation>versioon</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>wallet.dat corrupt, salvage failed</source>
<translation>wallet.dat fail on katki, päästmine ebaõnnestus</translation>
</message>
<message>
- <location line="-54"/>
+ <location line="-58"/>
<source>Password for JSON-RPC connections</source>
<translation>JSON-RPC ühenduste salasõna</translation>
</message>
@@ -3159,27 +3858,27 @@ nt: alertnotify=echo %%s | email -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>JSON-RPC ühenduste lubamine kindla IP pealt</translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation>Saada käsklusi node&apos;ile IP&apos;ga &lt;ip&gt; (vaikeväärtus: 127.0.0.1)</translation>
</message>
<message>
- <location line="-126"/>
+ <location line="-132"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation>Käivita käsklus, kui parim plokk muutub (käskluse %s asendatakse ploki hash&apos;iga)</translation>
</message>
<message>
- <location line="+155"/>
+ <location line="+161"/>
<source>Upgrade wallet to latest format</source>
<translation>Uuenda rahakott uusimasse vormingusse</translation>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation>Sea võtmete hulgaks &lt;n&gt; (vaikeväärtus: 100)</translation>
</message>
<message>
- <location line="-12"/>
+ <location line="-11"/>
<source>Rescan the block chain for missing wallet transactions</source>
<translation>Otsi ploki jadast rahakoti kadunud tehinguid</translation>
</message>
@@ -3189,7 +3888,7 @@ nt: alertnotify=echo %%s | email -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Kasuta JSON-RPC ühenduste jaoks OpenSSL&apos;i (https)</translation>
</message>
<message>
- <location line="-29"/>
+ <location line="-30"/>
<source>Server certificate file (default: server.cert)</source>
<translation>Serveri sertifikaadifail (vaikeväärtus: server.cert)</translation>
</message>
@@ -3204,27 +3903,22 @@ nt: alertnotify=echo %%s | email -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Käesolev abitekst</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Unable to bind to %s on this computer (bind returned error %d, %s)</source>
<translation>Selle arvutiga ei ole võimalik siduda %s külge (katse nurjus %d, %s tõttu)</translation>
</message>
<message>
- <location line="-95"/>
- <source>Connect through socks proxy</source>
- <translation>Ühendu läbi turva proxi</translation>
- </message>
- <message>
- <location line="-11"/>
+ <location line="-107"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation>-addnode, -seednode ja -connect tohivad kasutada DNS lookup&apos;i</translation>
</message>
<message>
- <location line="+58"/>
+ <location line="+60"/>
<source>Loading addresses...</source>
<translation>Aadresside laadimine...</translation>
</message>
<message>
- <location line="-36"/>
+ <location line="-37"/>
<source>Error loading wallet.dat: Wallet corrupted</source>
<translation>Viga wallet.dat käivitamisel. Vigane rahakkott</translation>
</message>
@@ -3244,12 +3938,12 @@ nt: alertnotify=echo %%s | email -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Viga wallet.dat käivitamisel</translation>
</message>
<message>
- <location line="+30"/>
+ <location line="+31"/>
<source>Invalid -proxy address: &apos;%s&apos;</source>
<translation>Vigane -proxi aadress: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+57"/>
+ <location line="+56"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation>Kirjeldatud tundmatu võrgustik -onlynet&apos;is: &apos;%s&apos;</translation>
</message>
@@ -3259,7 +3953,7 @@ nt: alertnotify=echo %%s | email -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Küsitud tundmatu -socks proxi versioon: %i</translation>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation>Tundmatu -bind aadress: &apos;%s&apos;</translation>
</message>
@@ -3269,7 +3963,7 @@ nt: alertnotify=echo %%s | email -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Tundmatu -externalip aadress: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+46"/>
+ <location line="+48"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation>-paytxfee=&lt;amount&gt; jaoks vigane kogus: &apos;%s&apos;</translation>
</message>
@@ -3289,27 +3983,22 @@ nt: alertnotify=echo %%s | email -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Klotside indeksi laadimine...</translation>
</message>
<message>
- <location line="-60"/>
+ <location line="-62"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation>Lisa node ning hoia ühendus avatud</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-32"/>
<source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source>
<translation>%s&apos;ga ei ole võimalik sellest arvutist siduda. Bitcoin juba töötab.</translation>
</message>
<message>
- <location line="+69"/>
- <source>Fee per KB to add to transactions you send</source>
- <translation>Minu saadetavate tehingute lisatasu KB kohta</translation>
- </message>
- <message>
- <location line="+20"/>
+ <location line="+95"/>
<source>Loading wallet...</source>
<translation>Rahakoti laadimine...</translation>
</message>
<message>
- <location line="-54"/>
+ <location line="-56"/>
<source>Cannot downgrade wallet</source>
<translation>Rahakoti vanandamine ebaõnnestus</translation>
</message>
@@ -3319,7 +4008,7 @@ nt: alertnotify=echo %%s | email -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Tõrge vaikimisi aadressi kirjutamisel</translation>
</message>
<message>
- <location line="+66"/>
+ <location line="+67"/>
<source>Rescanning...</source>
<translation>Ãœleskaneerimine...</translation>
</message>
@@ -3339,7 +4028,7 @@ nt: alertnotify=echo %%s | email -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Tõrge</translation>
</message>
<message>
- <location line="-33"/>
+ <location line="-35"/>
<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 513952de2a..074c2dbaf8 100644
--- a/src/qt/locale/bitcoin_eu_ES.ts
+++ b/src/qt/locale/bitcoin_eu_ES.ts
@@ -3,13 +3,13 @@
<name>AboutDialog</name>
<message>
<location filename="../forms/aboutdialog.ui" line="+14"/>
- <source>About Bitcoin</source>
- <translation>Bitcoin-i buruz</translation>
+ <source>About Bitcoin Core</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+39"/>
- <source>&lt;b&gt;Bitcoin&lt;/b&gt; version</source>
- <translation>&lt;b&gt;Bitcoin&lt;/b&gt; bertsioa</translation>
+ <source>&lt;b&gt;Bitcoin Core&lt;/b&gt; version</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+57"/>
@@ -22,13 +22,13 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location filename="../aboutdialog.cpp" line="+14"/>
+ <location filename="../utilitydialog.cpp" line="+29"/>
<source>Copyright</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+0"/>
- <source>The Bitcoin developers</source>
+ <source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
</context>
@@ -65,7 +65,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location filename="../addressbookpage.cpp" line="+72"/>
+ <location filename="../addressbookpage.cpp" line="+74"/>
<source>&amp;Copy Address</source>
<translation type="unfinished"/>
</message>
@@ -135,7 +135,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+197"/>
+ <location line="+194"/>
<source>Export Address List</source>
<translation type="unfinished"/>
</message>
@@ -146,19 +146,19 @@ This product includes software developed by the OpenSSL Project for use in the O
</message>
<message>
<location line="+13"/>
- <source>Error exporting</source>
- <translation>Errorea esportatzean</translation>
+ <source>Exporting Failed</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation>Ezin idatzi %1 artxiboan.</translation>
+ <location line="+1"/>
+ <source>There was an error trying to save the address list to %1.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<name>AddressTableModel</name>
<message>
- <location filename="../addresstablemodel.cpp" line="+164"/>
+ <location filename="../addresstablemodel.cpp" line="+168"/>
<source>Label</source>
<translation>Etiketa</translation>
</message>
@@ -196,7 +196,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Errepikatu pasahitz berria</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="+34"/>
+ <location filename="../askpassphrasedialog.cpp" line="+40"/>
<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>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>
@@ -317,22 +317,27 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+250"/>
+ <location filename="../bitcoingui.cpp" line="+295"/>
<source>Sign &amp;message...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+254"/>
+ <location line="+335"/>
<source>Synchronizing with network...</source>
<translation>Sarearekin sinkronizatzen...</translation>
</message>
<message>
- <location line="-324"/>
+ <location line="-407"/>
<source>&amp;Overview</source>
<translation>&amp;Gainbegiratu</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="-137"/>
+ <source>Node</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+138"/>
<source>Show general overview of wallet</source>
<translation>Ikusi zorroaren begirada orokorra</translation>
</message>
@@ -347,7 +352,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Ikusi transakzioen historia</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>E&amp;xit</source>
<translation>Irten</translation>
</message>
@@ -393,7 +398,22 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+259"/>
+ <location line="+10"/>
+ <source>&amp;Sending addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Receiving addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open &amp;URI...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+325"/>
<source>Importing blocks from disk...</source>
<translation type="unfinished"/>
</message>
@@ -403,12 +423,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="-322"/>
+ <location line="-405"/>
<source>Send coins to a Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+47"/>
+ <location line="+49"/>
<source>Modify configuration options for Bitcoin</source>
<translation type="unfinished"/>
</message>
@@ -438,20 +458,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="-180"/>
- <location line="+6"/>
- <location line="+513"/>
+ <location line="+430"/>
<source>Bitcoin</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-519"/>
- <location line="+6"/>
+ <location line="-643"/>
<source>Wallet</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+109"/>
+ <location line="+146"/>
<source>&amp;Send</source>
<translation type="unfinished"/>
</message>
@@ -461,13 +478,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+28"/>
- <location line="+2"/>
- <source>&amp;About Bitcoin</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+14"/>
+ <location line="+46"/>
<location line="+2"/>
<source>&amp;Show / Hide</source>
<translation type="unfinished"/>
@@ -493,64 +504,80 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+35"/>
+ <location line="+48"/>
<source>&amp;File</source>
<translation>&amp;Artxiboa</translation>
</message>
<message>
- <location line="+10"/>
+ <location line="+14"/>
<source>&amp;Settings</source>
<translation>&amp;Ezarpenak</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>&amp;Help</source>
<translation>&amp;Laguntza</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+15"/>
<source>Tabs toolbar</source>
<translation>Fitxen tresna-barra</translation>
</message>
<message>
- <location line="-235"/>
- <location line="+294"/>
+ <location line="-284"/>
+ <location line="+376"/>
<source>[testnet]</source>
<translation>[testnet]</translation>
</message>
<message>
- <location line="-177"/>
+ <location line="-401"/>
+ <source>Bitcoin Core</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+163"/>
<source>Request payments (generates QR codes and bitcoin: URIs)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+63"/>
- <source>&amp;Used sending addresses...</source>
+ <location line="+29"/>
+ <location line="+2"/>
+ <source>&amp;About Bitcoin Core</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="+35"/>
<source>Show the list of used sending addresses and labels</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Used &amp;receiving addresses...</source>
+ <location line="+2"/>
+ <source>Show the list of used receiving addresses and labels</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open a bitcoin: URI or payment request</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Command-line options</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
- <source>Show the list of used receiving addresses and labels</source>
+ <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+106"/>
+ <location line="+159"/>
<location line="+5"/>
<source>Bitcoin client</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+120"/>
+ <location line="+142"/>
<source>%n active connection(s) to Bitcoin network</source>
<translation><numerusform>Konexio aktibo %n Bitcoin-en sarera</numerusform><numerusform>%n konexio aktibo Bitcoin-en sarera</numerusform></translation>
</message>
@@ -570,7 +597,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+20"/>
+ <location line="+23"/>
<source>%n hour(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -590,7 +617,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
+ <location line="+21"/>
<source>Last received block was generated %1 ago.</source>
<translation type="unfinished"/>
</message>
@@ -615,27 +642,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+77"/>
- <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="-152"/>
+ <location line="-85"/>
<source>Up to date</source>
<translation>Egunean</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Catching up...</source>
<translation>Eguneratzen...</translation>
</message>
<message>
- <location line="+124"/>
- <source>Confirm transaction fee</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+130"/>
<source>Sent transaction</source>
<translation>Bidalitako transakzioa</translation>
</message>
@@ -654,17 +671,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+34"/>
- <source>URI handling</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+0"/>
- <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="+45"/>
+ <location line="+69"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation>Zorroa &lt;b&gt;enkriptatuta&lt;/b&gt; eta &lt;b&gt;desblokeatuta&lt;/b&gt; dago une honetan</translation>
</message>
@@ -674,7 +681,7 @@ Address: %4
<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="+110"/>
+ <location filename="../bitcoin.cpp" line="+438"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation type="unfinished"/>
</message>
@@ -682,12 +689,304 @@ Address: %4
<context>
<name>ClientModel</name>
<message>
- <location filename="../clientmodel.cpp" line="+115"/>
+ <location filename="../clientmodel.cpp" line="+119"/>
<source>Network Alert</source>
<translation type="unfinished"/>
</message>
</context>
<context>
+ <name>CoinControlDialog</name>
+ <message>
+ <location filename="../forms/coincontroldialog.ui" line="+14"/>
+ <source>Coin Control Address Selection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>Quantity:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Bytes:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>Amount:</source>
+ <translation>Kopurua</translation>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Priority:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Low Output:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>After Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Change:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+63"/>
+ <source>(un)select all</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Tree mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>List mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>Amount</source>
+ <translation>Kopurua</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Address</source>
+ <translation>Helbidea</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Date</source>
+ <translation>Data</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Confirmations</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Confirmed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../coincontroldialog.cpp" line="+42"/>
+ <source>Copy address</source>
+ <translation>Kopiatu helbidea</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy label</source>
+ <translation>Kopiatu etiketa</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+26"/>
+ <source>Copy amount</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-25"/>
+ <source>Copy transaction ID</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Lock unspent</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Unlock unspent</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+22"/>
+ <source>Copy quantity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Copy fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy after fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy bytes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy low output</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy change</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+323"/>
+ <source>highest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>higher</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>high</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>medium-high</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>medium</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>low-medium</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>low</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>lower</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>lowest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>(%1 locked)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+140"/>
+ <source>Dust</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>yes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>no</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>This label turns red, if the transaction size is greater than 1000 bytes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+5"/>
+ <source>This means a fee of at least %1 per kB is required.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-4"/>
+ <source>Can vary +/- 1 byte per input.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Transactions with higher priority are more likely to get included into a block.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>This label turns red, if the priority is smaller than &quot;medium&quot;.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>This label turns red, if any recipient receives an amount smaller than %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+4"/>
+ <source>This means a fee of at least %1 is required.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-3"/>
+ <source>Amounts below 0.546 times the minimum relay fee are shown as dust.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>This label turns red, if the change is smaller than %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
+ <location line="+66"/>
+ <source>(no label)</source>
+ <translation>(etiketarik ez)</translation>
+ </message>
+ <message>
+ <location line="-9"/>
+ <source>change from %1 (%2)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>(change)</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>EditAddressDialog</name>
<message>
<location filename="../forms/editaddressdialog.ui" line="+14"/>
@@ -715,7 +1014,7 @@ Address: %4
<translation>&amp;Helbidea</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+21"/>
+ <location filename="../editaddressdialog.cpp" line="+28"/>
<source>New receiving address</source>
<translation>Jasotzeko helbide berria</translation>
</message>
@@ -758,7 +1057,7 @@ Address: %4
<context>
<name>FreespaceChecker</name>
<message>
- <location filename="../intro.cpp" line="+61"/>
+ <location filename="../intro.cpp" line="+65"/>
<source>A new data directory will be created.</source>
<translation type="unfinished"/>
</message>
@@ -784,15 +1083,19 @@ Address: %4
</message>
</context>
<context>
- <name>GUIUtil::HelpMessageBox</name>
+ <name>HelpMessageDialog</name>
<message>
- <location filename="../guiutil.cpp" line="+558"/>
- <location line="+13"/>
- <source>Bitcoin-Qt</source>
+ <location filename="../forms/helpmessagedialog.ui" line="+19"/>
+ <source>Bitcoin Core - Command-line options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-13"/>
+ <location filename="../utilitydialog.cpp" line="+38"/>
+ <source>Bitcoin Core</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
<source>version</source>
<translation type="unfinished"/>
</message>
@@ -841,17 +1144,17 @@ Address: %4
</message>
<message>
<location line="+9"/>
- <source>Welcome to Bitcoin-Qt.</source>
+ <source>Welcome to Bitcoin Core.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+26"/>
- <source>As this is the first time the program is launched, you can choose where Bitcoin-Qt will store its data.</source>
+ <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+10"/>
- <source>Bitcoin-Qt will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
+ <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -865,7 +1168,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../intro.cpp" line="+105"/>
+ <location filename="../intro.cpp" line="+85"/>
+ <source>Bitcoin</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error: Specified data directory &quot;%1&quot; can not be created.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+19"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
@@ -881,6 +1194,34 @@ Address: %4
</message>
</context>
<context>
+ <name>OpenURIDialog</name>
+ <message>
+ <location filename="../forms/openuridialog.ui" line="+14"/>
+ <source>Open URI</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Open payment request from URI or file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>URI:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Select payment request file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../openuridialog.cpp" line="+47"/>
+ <source>Select payment request file to open</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OptionsDialog</name>
<message>
<location filename="../forms/optionsdialog.ui" line="+14"/>
@@ -888,7 +1229,7 @@ Address: %4
<translation>Aukerak</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+13"/>
<source>&amp;Main</source>
<translation type="unfinished"/>
</message>
@@ -913,57 +1254,87 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+35"/>
- <source>Reset all client options to default.</source>
+ <location line="+9"/>
+ <source>Size of &amp;database cache</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>&amp;Reset Options</source>
+ <location line="+13"/>
+ <source>Set database cache size in megabytes (default: 25)</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+13"/>
- <source>&amp;Network</source>
+ <source>MB</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>
+ <location line="+27"/>
+ <source>Number of script &amp;verification threads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Connect to the Bitcoin network through a SOCKS proxy.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
- <source>Map port using &amp;UPnP</source>
+ <source>&amp;Connect through SOCKS proxy (default proxy):</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>
+ <location line="+34"/>
+ <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+224"/>
+ <source>Active command-line options that override above options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
+ <source>Reset all client options to default.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
- <source>&amp;Connect through SOCKS proxy:</source>
+ <source>&amp;Reset Options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+9"/>
- <source>Proxy &amp;IP:</source>
+ <location line="-323"/>
+ <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="+19"/>
- <source>IP address of the proxy (e.g. 127.0.0.1)</source>
+ <source>Proxy &amp;IP:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="+32"/>
<source>&amp;Port:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+19"/>
+ <location line="+25"/>
<source>Port of the proxy (e.g. 9050)</source>
<translation type="unfinished"/>
</message>
@@ -1038,7 +1409,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+71"/>
+ <location line="+7"/>
+ <source>Whether to show coin control features or not.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Display coin &amp;control features (experts only)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+136"/>
<source>&amp;OK</source>
<translation type="unfinished"/>
</message>
@@ -1048,44 +1429,38 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>&amp;Apply</source>
+ <location filename="../optionsdialog.cpp" line="+67"/>
+ <source>default</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+58"/>
- <source>default</source>
+ <location line="+57"/>
+ <source>none</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+130"/>
+ <location line="+75"/>
<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>
+ <location line="+29"/>
+ <source>Client restart required to activate changes.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
- <location line="+9"/>
- <source>Warning</source>
+ <location line="-29"/>
+ <source>Client will be shutdown, do you want to proceed?</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-9"/>
- <location line="+9"/>
- <source>This setting will take effect after restarting Bitcoin.</source>
+ <location line="+33"/>
+ <source>This change would require a client restart.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+29"/>
+ <location line="+34"/>
<source>The supplied proxy address is invalid.</source>
<translation type="unfinished"/>
</message>
@@ -1099,22 +1474,22 @@ Address: %4
</message>
<message>
<location line="+50"/>
- <location line="+202"/>
+ <location line="+231"/>
<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="-131"/>
+ <location line="-155"/>
<source>Unconfirmed:</source>
<translation>Konfirmatu gabe:</translation>
</message>
<message>
- <location line="-78"/>
+ <location line="-83"/>
<source>Wallet</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+49"/>
+ <location line="+51"/>
<source>Confirmed:</source>
<translation type="unfinished"/>
</message>
@@ -1124,12 +1499,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+29"/>
+ <location line="+32"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+16"/>
<source>Immature:</source>
<translation type="unfinished"/>
</message>
@@ -1139,7 +1514,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+16"/>
<source>Total:</source>
<translation type="unfinished"/>
</message>
@@ -1149,12 +1524,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+53"/>
+ <location line="+71"/>
<source>&lt;b&gt;Recent transactions&lt;/b&gt;</source>
<translation>&lt;b&gt;Azken transakzioak&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../overviewpage.cpp" line="+116"/>
+ <location filename="../overviewpage.cpp" line="+120"/>
<location line="+1"/>
<source>out of sync</source>
<translation type="unfinished"/>
@@ -1163,7 +1538,8 @@ Address: %4
<context>
<name>PaymentServer</name>
<message>
- <location filename="../paymentserver.cpp" line="+392"/>
+ <location filename="../paymentserver.cpp" line="+403"/>
+ <location line="+13"/>
<source>URI handling</source>
<translation type="unfinished"/>
</message>
@@ -1173,45 +1549,82 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+69"/>
+ <location line="+96"/>
<source>Requested payment amount of %1 is too small (considered dust).</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
- <location line="+37"/>
+ <location line="-221"/>
+ <location line="+212"/>
+ <location line="+13"/>
+ <location line="+95"/>
+ <location line="+18"/>
+ <location line="+16"/>
<source>Payment request error</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="-353"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Net manager warning</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+1"/>
- <source>Insecure requests to custom payment scripts unsupported</source>
+ <source>Your active proxy doesn&apos;t support SOCKS5, which is required for payment requests via proxy.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+38"/>
+ <location line="+52"/>
+ <source>Payment request fetch URL is invalid: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Payment request file handling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Payment request file can not be read or processed! This can be caused by an invalid payment request file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+73"/>
+ <source>Unverified payment requests to custom payment scripts are unsupported.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+59"/>
<source>Refund from %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
+ <location line="+43"/>
<source>Error communicating with %1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+24"/>
+ <source>Payment request can not be parsed or processed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
<source>Bad response from server %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+32"/>
+ <location line="+33"/>
<source>Payment acknowledged</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-58"/>
- <location line="+30"/>
- <location line="+17"/>
+ <location line="-11"/>
<source>Network request error</source>
<translation type="unfinished"/>
</message>
@@ -1219,32 +1632,26 @@ Address: %4
<context>
<name>QObject</name>
<message>
- <location filename="../bitcoin.cpp" line="+114"/>
- <location line="+5"/>
- <location filename="../intro.cpp" line="-32"/>
+ <location filename="../bitcoin.cpp" line="+71"/>
+ <location line="+11"/>
<source>Bitcoin</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-4"/>
+ <location line="+1"/>
<source>Error: Specified data directory &quot;%1&quot; does not exist.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="-12"/>
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../intro.cpp" line="+1"/>
- <source>Error: Specified data directory &quot;%1&quot; can not be created.</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>QRImageWidget</name>
<message>
- <location filename="../receiverequestdialog.cpp" line="+32"/>
+ <location filename="../receiverequestdialog.cpp" line="+36"/>
<source>&amp;Save Image...</source>
<translation type="unfinished"/>
</message>
@@ -1260,7 +1667,7 @@ Address: %4
</message>
<message>
<location line="+0"/>
- <source>PNG Images (*.png)</source>
+ <source>PNG Image (*.png)</source>
<translation type="unfinished"/>
</message>
</context>
@@ -1278,15 +1685,16 @@ Address: %4
<location line="+23"/>
<location line="+23"/>
<location line="+36"/>
- <location line="+53"/>
+ <location line="+23"/>
+ <location line="+36"/>
<location line="+23"/>
<location line="+23"/>
- <location filename="../rpcconsole.cpp" line="+352"/>
+ <location filename="../rpcconsole.cpp" line="+359"/>
<source>N/A</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-217"/>
+ <location line="-223"/>
<source>Client version</source>
<translation type="unfinished"/>
</message>
@@ -1296,7 +1704,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+68"/>
+ <location line="-10"/>
+ <source>Debug window</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+25"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+53"/>
<source>Using OpenSSL version</source>
<translation type="unfinished"/>
</message>
@@ -1312,16 +1730,16 @@ Address: %4
</message>
<message>
<location line="+7"/>
- <source>Number of connections</source>
+ <source>Name</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+23"/>
- <source>On testnet</source>
+ <source>Number of connections</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+23"/>
+ <location line="+29"/>
<source>Block chain</source>
<translation type="unfinished"/>
</message>
@@ -1346,21 +1764,6 @@ Address: %4
<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"/>
@@ -1391,22 +1794,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-541"/>
+ <location line="-521"/>
<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"/>
+ <location line="+206"/>
<source>Debug log file</source>
<translation type="unfinished"/>
</message>
@@ -1416,7 +1809,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+102"/>
+ <location line="+76"/>
<source>Clear console</source>
<translation type="unfinished"/>
</message>
@@ -1436,7 +1829,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+128"/>
+ <location line="+122"/>
<source>%1 B</source>
<translation type="unfinished"/>
</message>
@@ -1474,48 +1867,48 @@ Address: %4
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+22"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
<source>&amp;Amount:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
- <source>The amount to request</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+7"/>
+ <location line="-13"/>
<source>&amp;Label:</source>
<translation>&amp;Etiketa:</translation>
</message>
<message>
- <location line="+10"/>
- <source>The label to associate with the receiving address</source>
+ <location line="-34"/>
+ <source>&amp;Message:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>&amp;Message:</source>
+ <location line="-17"/>
+ <source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>The message to attach to payment request</source>
+ <location line="+3"/>
+ <source>R&amp;euse an existing receiving address (not recommended)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
- <source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
+ <location line="+27"/>
+ <source>An optional label to associate with the new receiving address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>R&amp;euse an existing receiving address (not recommended)</source>
+ <location line="+7"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+7"/>
- <source>Use this form to request payments. All fields are optional.</source>
+ <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+39"/>
+ <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1533,6 +1926,31 @@ Address: %4
<source>&amp;Request payment</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+47"/>
+ <source>Requested payments</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Show the selected request (does the same as double clicking an entry)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Show</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Remove the selected entries from the list</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Remove</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
@@ -1553,16 +1971,11 @@ Address: %4
</message>
<message>
<location line="+7"/>
- <source>&amp;Copy Image</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+7"/>
<source>&amp;Save Image...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../receiverequestdialog.cpp" line="+58"/>
+ <location filename="../receiverequestdialog.cpp" line="+56"/>
<source>Request payment to %1</source>
<translation type="unfinished"/>
</message>
@@ -1608,16 +2021,119 @@ Address: %4
</message>
</context>
<context>
+ <name>RecentRequestsTableModel</name>
+ <message>
+ <location filename="../recentrequeststablemodel.cpp" line="+24"/>
+ <source>Date</source>
+ <translation>Data</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Label</source>
+ <translation>Etiketa</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Amount</source>
+ <translation>Kopurua</translation>
+ </message>
+ <message>
+ <location line="+38"/>
+ <source>(no label)</source>
+ <translation>(etiketarik ez)</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>(no message)</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+140"/>
- <location line="+213"/>
+ <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location line="+80"/>
<source>Send Coins</source>
<translation>Bidali txanponak</translation>
</message>
<message>
- <location line="+50"/>
+ <location line="+76"/>
+ <source>Coin Control Features</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Inputs...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>automatically selected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Insufficient funds!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+89"/>
+ <source>Quantity:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+35"/>
+ <source>Bytes:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Amount:</source>
+ <translation>Kopurua</translation>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Priority:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Low Output:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>After Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Change:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+44"/>
+ <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Custom change address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+115"/>
<source>Send to multiple recipients at once</source>
<translation>Bidali hainbat jasotzaileri batera</translation>
</message>
@@ -1642,12 +2158,7 @@ Address: %4
<translation>Saldoa:</translation>
</message>
<message>
- <location line="+10"/>
- <source>123.456 BTC</source>
- <translation>123.456 BTC</translation>
- </message>
- <message>
- <location line="+31"/>
+ <location line="+41"/>
<source>Confirm the send action</source>
<translation>Berretsi bidaltzeko ekintza</translation>
</message>
@@ -1657,69 +2168,135 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-154"/>
+ <location filename="../sendcoinsdialog.cpp" line="-228"/>
<source>Confirm send coins</source>
<translation>Berretsi txanponak bidaltzea</translation>
</message>
<message>
- <location line="-90"/>
+ <location line="-74"/>
<location line="+5"/>
<location line="+5"/>
+ <location line="+4"/>
<source>%1 to %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+26"/>
+ <location line="-136"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation>Sartu Bitocin helbide bat (adb.: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L) </translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Copy quantity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy after fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy bytes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy low output</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy change</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+170"/>
+ <source>Total Amount %1 (= %2)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>or</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+202"/>
<source>The recipient address is not valid, please recheck.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The amount to pay must be larger than 0.</source>
<translation>Ordaintzeko kopurua 0 baino handiagoa izan behar du.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The amount exceeds your balance.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The total exceeds your balance when the %1 transaction fee is included.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+3"/>
<source>Duplicate address found, can only send to each address once per send operation.</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="+3"/>
+ <source>Transaction creation failed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+4"/>
- <source>Error: Transaction creation failed!</source>
+ <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+15"/>
- <source>Are you sure you want to send?</source>
+ <location line="+112"/>
+ <source>Warning: Invalid Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+9"/>
- <source>added as transaction fee</source>
+ <location line="+21"/>
+ <source>(no label)</source>
+ <translation>(etiketarik ez)</translation>
+ </message>
+ <message>
+ <location line="-11"/>
+ <source>Warning: Unknown change address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
- <source>Total Amount %1</source>
+ <location line="-366"/>
+ <source>Are you sure you want to send?</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+20"/>
- <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>
+ <location line="+9"/>
+ <source>added as transaction fee</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+144"/>
+ <location line="+170"/>
<source>Payment request expired</source>
<translation type="unfinished"/>
</message>
@@ -1732,39 +2309,44 @@ Address: %4
<context>
<name>SendCoinsEntry</name>
<message>
- <location filename="../forms/sendcoinsentry.ui" line="+33"/>
- <location line="+585"/>
+ <location filename="../forms/sendcoinsentry.ui" line="+131"/>
+ <location line="+521"/>
+ <location line="+536"/>
<source>A&amp;mount:</source>
<translation>K&amp;opurua:</translation>
</message>
<message>
- <location line="-572"/>
- <location line="+585"/>
+ <location line="-1152"/>
<source>Pay &amp;To:</source>
<translation>Ordaindu &amp;honi:</translation>
</message>
<message>
- <location line="-551"/>
+ <location line="+18"/>
<source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../sendcoinsentry.cpp" line="+28"/>
+ <location filename="../sendcoinsentry.cpp" line="+30"/>
<source>Enter a label for this address to add it to your address book</source>
<translation>Sartu etiketa bat helbide honetarako, eta gehitu zure helbide-liburuan</translation>
</message>
<message>
- <location filename="../forms/sendcoinsentry.ui" line="-18"/>
+ <location filename="../forms/sendcoinsentry.ui" line="+57"/>
<source>&amp;Label:</source>
<translation>&amp;Etiketa:</translation>
</message>
<message>
- <location line="+28"/>
+ <location line="-50"/>
<source>Choose previously used address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
+ <location line="-40"/>
+ <source>This is a normal payment.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+50"/>
<source>Alt+A</source>
<translation>Alt+A</translation>
</message>
@@ -1780,16 +2362,45 @@ Address: %4
</message>
<message>
<location line="+7"/>
- <source>Remove this recipient</source>
- <translation>Ezabatu jasotzaile hau</translation>
+ <location line="+524"/>
+ <location line="+536"/>
+ <source>Remove this entry</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="-1008"/>
+ <source>Message:</source>
+ <translation>Mezua</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+958"/>
+ <source>This is a verified payment request.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-991"/>
<source>Enter a label for this address to add it to the list of used addresses</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+465"/>
+ <location line="+459"/>
+ <source>This is an unverified payment request.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+18"/>
+ <location line="+532"/>
+ <source>Pay To:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-498"/>
+ <location line="+536"/>
<source>Memo:</source>
<translation type="unfinished"/>
</message>
@@ -1800,6 +2411,19 @@ Address: %4
</message>
</context>
<context>
+ <name>ShutdownWindow</name>
+ <message>
+ <location filename="../utilitydialog.cpp" line="+48"/>
+ <source>Bitcoin Core is shutting down...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Do not shut down the computer until this window disappears.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>SignVerifyMessageDialog</name>
<message>
<location filename="../forms/signverifymessagedialog.ui" line="+14"/>
@@ -1807,7 +2431,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+10"/>
<source>&amp;Sign Message</source>
<translation type="unfinished"/>
</message>
@@ -1910,7 +2534,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+27"/>
+ <location filename="../signverifymessagedialog.cpp" line="+29"/>
<location line="+3"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>Sartu Bitocin helbide bat (adb.: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L) </translation>
@@ -1926,7 +2550,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+85"/>
+ <location line="+84"/>
<location line="+81"/>
<source>The entered address is invalid.</source>
<translation type="unfinished"/>
@@ -1995,8 +2619,13 @@ Address: %4
<context>
<name>SplashScreen</name>
<message>
- <location filename="../splashscreen.cpp" line="+23"/>
- <source>The Bitcoin developers</source>
+ <location filename="../splashscreen.cpp" line="+28"/>
+ <source>Bitcoin Core</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
<message>
@@ -2008,7 +2637,7 @@ Address: %4
<context>
<name>TrafficGraphWidget</name>
<message>
- <location filename="../trafficgraphwidget.cpp" line="+75"/>
+ <location filename="../trafficgraphwidget.cpp" line="+79"/>
<source>KB/s</source>
<translation type="unfinished"/>
</message>
@@ -2016,7 +2645,7 @@ Address: %4
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="+22"/>
+ <location filename="../transactiondesc.cpp" line="+28"/>
<source>Open until %1</source>
<translation>Zabalik %1 arte</translation>
</message>
@@ -2089,12 +2718,12 @@ Address: %4
<location line="+12"/>
<location line="+45"/>
<location line="+17"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Credit</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="-120"/>
+ <location line="-125"/>
<source>matures in %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -2107,12 +2736,12 @@ Address: %4
<location line="+44"/>
<location line="+8"/>
<location line="+15"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Debit</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-57"/>
+ <location line="-62"/>
<source>Transaction fee</source>
<translation type="unfinished"/>
</message>
@@ -2123,11 +2752,12 @@ Address: %4
</message>
<message>
<location line="+6"/>
+ <location line="+9"/>
<source>Message</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="-7"/>
<source>Comment</source>
<translation type="unfinished"/>
</message>
@@ -2137,7 +2767,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+18"/>
<source>Merchant</source>
<translation type="unfinished"/>
</message>
@@ -2177,7 +2807,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-227"/>
+ <location line="-232"/>
<source>, has not been successfully broadcast yet</source>
<translation>, ez da arrakastaz emititu oraindik</translation>
</message>
@@ -2208,7 +2838,7 @@ Address: %4
<context>
<name>TransactionTableModel</name>
<message>
- <location filename="../transactiontablemodel.cpp" line="+227"/>
+ <location filename="../transactiontablemodel.cpp" line="+234"/>
<source>Date</source>
<translation>Data</translation>
</message>
@@ -2227,8 +2857,13 @@ Address: %4
<source>Amount</source>
<translation>Kopurua</translation>
</message>
+ <message>
+ <location line="+59"/>
+ <source>Immature (%1 confirmations, will be available after %2)</source>
+ <translation type="unfinished"/>
+ </message>
<message numerus="yes">
- <location line="+57"/>
+ <location line="+16"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -2248,17 +2883,13 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
+ <location line="-22"/>
+ <location line="+25"/>
<source>Confirmed (%1 confirmations)</source>
<translation>Konfirmatuta (%1 konfirmazio)</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></translation>
- </message>
<message>
- <location line="+5"/>
+ <location line="-22"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation>Bloke hau ez du beste inongo nodorik jaso, eta seguruenik ez da onartuko!</translation>
</message>
@@ -2268,7 +2899,7 @@ Address: %4
<translation>Sortua, baina ez onartua</translation>
</message>
<message>
- <location line="+43"/>
+ <location line="+62"/>
<source>Received with</source>
<translation>Jasoa honekin: </translation>
</message>
@@ -2326,7 +2957,7 @@ Address: %4
<context>
<name>TransactionView</name>
<message>
- <location filename="../transactionview.cpp" line="+52"/>
+ <location filename="../transactionview.cpp" line="+57"/>
<location line="+16"/>
<source>All</source>
<translation>Denak</translation>
@@ -2387,12 +3018,12 @@ Address: %4
<translation>Beste</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+6"/>
<source>Enter address or label to search</source>
<translation>Sartu bilatzeko helbide edo etiketa</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+6"/>
<source>Min amount</source>
<translation>Kopuru minimoa</translation>
</message>
@@ -2427,17 +3058,37 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+143"/>
- <source>Export Transaction Data</source>
- <translation>Transakzioaren xehetasunak</translation>
+ <location line="+142"/>
+ <source>Export Transaction History</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="+19"/>
+ <source>Exporting Failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>There was an error trying to save the transaction history to %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Exporting Successful</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The transaction history was successfully saved to %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-22"/>
<source>Comma separated file (*.csv)</source>
<translation>Komaz bereizitako artxiboa (*.csv)</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+9"/>
<source>Confirmed</source>
<translation type="unfinished"/>
</message>
@@ -2472,17 +3123,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
- <source>Error exporting</source>
- <translation>Errorea esportatzean</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation>Ezin idatzi %1 artxiboan.</translation>
- </message>
- <message>
- <location line="+100"/>
+ <location line="+107"/>
<source>Range:</source>
<translation type="unfinished"/>
</message>
@@ -2493,9 +3134,17 @@ Address: %4
</message>
</context>
<context>
+ <name>WalletFrame</name>
+ <message>
+ <location filename="../walletframe.cpp" line="+26"/>
+ <source>No wallet has been loaded.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>WalletModel</name>
<message>
- <location filename="../walletmodel.cpp" line="+218"/>
+ <location filename="../walletmodel.cpp" line="+245"/>
<source>Send Coins</source>
<translation type="unfinished"/>
</message>
@@ -2503,7 +3152,7 @@ Address: %4
<context>
<name>WalletView</name>
<message>
- <location filename="../walletview.cpp" line="+46"/>
+ <location filename="../walletview.cpp" line="+43"/>
<source>&amp;Export</source>
<translation type="unfinished"/>
</message>
@@ -2513,65 +3162,60 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+183"/>
+ <location line="+181"/>
<source>Backup Wallet</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
+ <location line="+1"/>
<source>Wallet Data (*.dat)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
+ <location line="+6"/>
<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>
+ <source>There was an error trying to save the wallet data to %1.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+4"/>
- <source>Backup Successful</source>
+ <source>The wallet data was successfully saved to %1.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+0"/>
- <source>The wallet data was successfully saved to the new location.</source>
+ <source>Backup Successful</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+102"/>
- <source>Bitcoin version</source>
- <translation>Botcoin bertsioa</translation>
- </message>
- <message>
- <location line="+107"/>
+ <location filename="../bitcoinstrings.cpp" line="+221"/>
<source>Usage:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-55"/>
+ <location line="-54"/>
<source>List commands</source>
<translation>Komandoen lista</translation>
</message>
<message>
- <location line="-13"/>
+ <location line="-14"/>
<source>Get help for a command</source>
<translation>Laguntza komando batean</translation>
</message>
<message>
- <location line="+25"/>
+ <location line="+26"/>
<source>Options:</source>
<translation>Aukerak</translation>
</message>
<message>
- <location line="+24"/>
+ <location line="+22"/>
<source>Specify configuration file (default: bitcoin.conf)</source>
<translation>Ezarpen fitxategia aukeratu (berezkoa: bitcoin.conf)</translation>
</message>
@@ -2591,7 +3235,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-28"/>
+ <location line="-26"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
<translation type="unfinished"/>
</message>
@@ -2601,7 +3245,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-49"/>
+ <location line="-51"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation type="unfinished"/>
</message>
@@ -2611,37 +3255,37 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-142"/>
+ <location line="-148"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-33"/>
+ <location line="-36"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+40"/>
+ <location line="+45"/>
<source>Accept command line and JSON-RPC commands</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<source>Run in the background as a daemon and accept commands</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+40"/>
+ <location line="+39"/>
<source>Use the test network</source>
<translation type="unfinished"/>
</message>
@@ -2651,7 +3295,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-87"/>
+ <location line="-95"/>
<source>%s, you must set a rpcpassword in the configuration file:
%s
It is recommended you use the following random password:
@@ -2692,6 +3336,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+4"/>
+ <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</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>
@@ -2706,17 +3355,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+11"/>
- <source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source>
+ <location line="+18"/>
+ <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="+6"/>
- <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
+ <location line="+5"/>
+ <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+3"/>
<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>
@@ -2746,17 +3395,27 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
+ <location line="+9"/>
+ <source>&lt;category&gt; can be:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
<source>Attempt to recover private keys from a corrupt wallet.dat</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
+ <source>Bitcoin Core Daemon</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Bitcoin RPC client version</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
<source>Block creation options:</source>
<translation type="unfinished"/>
</message>
@@ -2766,7 +3425,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
+ <source>Connect through SOCKS proxy</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect to JSON-RPC on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation type="unfinished"/>
</message>
@@ -2782,6 +3446,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+1"/>
+ <source>Do not load the wallet and disable wallet RPC calls</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Do you want to rebuild the block database now?</source>
<translation type="unfinished"/>
</message>
@@ -2876,7 +3545,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
+ <source>Fee per kB to add to transactions you send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Find peers using DNS lookup (default: 1 unless -connect)</source>
<translation type="unfinished"/>
</message>
@@ -2896,6 +3570,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
+ <location line="+1"/>
+ <source>If &lt;category&gt; is not supplied, output all debugging information.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+2"/>
<source>Incorrect or no genesis block found. Wrong datadir for network?</source>
<translation type="unfinished"/>
@@ -2911,17 +3590,37 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+8"/>
+ <location line="+5"/>
+ <source>Prepend debug output with timestamp (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>RPC client options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Rebuild block chain index from current blk000??.dat files</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+5"/>
+ <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Send command to Bitcoin server</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
+ <location line="+7"/>
+ <source>Set maximum block size in bytes (default: %d)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Set the number of threads to service RPC calls (default: 4)</source>
<translation type="unfinished"/>
</message>
@@ -2936,12 +3635,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+12"/>
+ <location line="+3"/>
+ <source>This is intended for regression testing tools and app development.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Usage (deprecated, use bitcoin-cli):</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+8"/>
+ <location line="+7"/>
<source>Verifying blocks...</source>
<translation type="unfinished"/>
</message>
@@ -2952,31 +3656,56 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+1"/>
+ <source>Wait for RPC server to start</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Wallet %s resides outside data directory %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+2"/>
+ <source>Wallet options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>You need to rebuild the database using -reindex to change -txindex</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-78"/>
+ <location line="-79"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-98"/>
+ <location line="-105"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+17"/>
+ <location line="+14"/>
+ <source>Output debugging information (default: 0, supplying &lt;category&gt; is optional)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+83"/>
+ <location line="+89"/>
<source>Information</source>
<translation type="unfinished"/>
</message>
@@ -3016,47 +3745,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<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"/>
+ <location line="+9"/>
<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"/>
+ <location line="+4"/>
<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"/>
+ <location line="+6"/>
<source>Set minimum block size in bytes (default: 0)</source>
<translation type="unfinished"/>
</message>
@@ -3081,7 +3780,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Transaction amount too small</source>
<translation type="unfinished"/>
</message>
@@ -3106,32 +3805,32 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<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="+5"/>
+ <location line="+7"/>
<source>Warning</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Warning: This version is obsolete, upgrade required!</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+2"/>
+ <source>version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>wallet.dat corrupt, salvage failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-54"/>
+ <location line="-58"/>
<source>Password for JSON-RPC connections</source>
<translation type="unfinished"/>
</message>
@@ -3141,27 +3840,27 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-126"/>
+ <location line="-132"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+155"/>
+ <location line="+161"/>
<source>Upgrade wallet to latest format</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-12"/>
+ <location line="-11"/>
<source>Rescan the block chain for missing wallet transactions</source>
<translation type="unfinished"/>
</message>
@@ -3171,7 +3870,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-29"/>
+ <location line="-30"/>
<source>Server certificate file (default: server.cert)</source>
<translation type="unfinished"/>
</message>
@@ -3186,27 +3885,22 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Laguntza mezu hau</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Unable to bind to %s on this computer (bind returned error %d, %s)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-95"/>
- <source>Connect through socks proxy</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="-11"/>
+ <location line="-107"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+58"/>
+ <location line="+60"/>
<source>Loading addresses...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-36"/>
+ <location line="-37"/>
<source>Error loading wallet.dat: Wallet corrupted</source>
<translation type="unfinished"/>
</message>
@@ -3226,12 +3920,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+30"/>
+ <location line="+31"/>
<source>Invalid -proxy address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+57"/>
+ <location line="+56"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3241,7 +3935,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3251,7 +3945,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+46"/>
+ <location line="+48"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3271,27 +3965,22 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-60"/>
+ <location line="-62"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-28"/>
+ <location line="-32"/>
<source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+69"/>
- <source>Fee per KB to add to transactions you send</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+20"/>
+ <location line="+95"/>
<source>Loading wallet...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-54"/>
+ <location line="-56"/>
<source>Cannot downgrade wallet</source>
<translation type="unfinished"/>
</message>
@@ -3301,7 +3990,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+66"/>
+ <location line="+67"/>
<source>Rescanning...</source>
<translation>Birbilatzen...</translation>
</message>
@@ -3321,7 +4010,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-33"/>
+ <location line="-35"/>
<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 447e274518..201b18d6b0 100644
--- a/src/qt/locale/bitcoin_fa.ts
+++ b/src/qt/locale/bitcoin_fa.ts
@@ -3,13 +3,13 @@
<name>AboutDialog</name>
<message>
<location filename="../forms/aboutdialog.ui" line="+14"/>
- <source>About Bitcoin</source>
- <translation>در مورد بیت‌کوین</translation>
+ <source>About Bitcoin Core</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+39"/>
- <source>&lt;b&gt;Bitcoin&lt;/b&gt; version</source>
- <translation>&lt;b&gt;بیت‌کوین&lt;/b&gt; ویرایش</translation>
+ <source>&lt;b&gt;Bitcoin Core&lt;/b&gt; version</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+57"/>
@@ -22,14 +22,14 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>⎠⎠این یک نرم‌اÙزار آزمایشی است⎠⎠نرم اÙزار تحت مجوز MIT/X11 منتشر شده است. پروندهٔ COPYING یا نشانی 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="+14"/>
+ <location filename="../utilitydialog.cpp" line="+29"/>
<source>Copyright</source>
<translation>حق تألیÙ</translation>
</message>
<message>
<location line="+0"/>
- <source>The Bitcoin developers</source>
- <translation>توسعه‌دهندگان بیت‌کوین</translation>
+ <source>The Bitcoin Core developers</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -52,7 +52,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+11"/>
<source>Copy the currently selected address to the system clipboard</source>
- <translation>Ú©Ù¾ÛŒ نشانی انتخاب شده به حاÙظهٔ سیستم</translation>
+ <translation>نشانی انتخاب شده را در حاÙظهٔ سیستم Ú©Ù¾ÛŒ Ú©Ù†!</translation>
</message>
<message>
<location line="+3"/>
@@ -65,7 +65,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location filename="../addressbookpage.cpp" line="+72"/>
+ <location filename="../addressbookpage.cpp" line="+74"/>
<source>&amp;Copy Address</source>
<translation>&amp;کپی نشانی</translation>
</message>
@@ -135,7 +135,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>&amp;ویرایش</translation>
</message>
<message>
- <location line="+197"/>
+ <location line="+194"/>
<source>Export Address List</source>
<translation type="unfinished"/>
</message>
@@ -146,26 +146,26 @@ This product includes software developed by the OpenSSL Project for use in the O
</message>
<message>
<location line="+13"/>
- <source>Error exporting</source>
- <translation>خطا در خروجی گرÙتن</translation>
+ <source>Exporting Failed</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation>نمی‌توان در پروندهٔ %1 چیزی نوشت.</translation>
+ <location line="+1"/>
+ <source>There was an error trying to save the address list to %1.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<name>AddressTableModel</name>
<message>
- <location filename="../addresstablemodel.cpp" line="+164"/>
+ <location filename="../addresstablemodel.cpp" line="+168"/>
<source>Label</source>
<translation>برچسب</translation>
</message>
<message>
<location line="+0"/>
<source>Address</source>
- <translation>آدرس</translation>
+ <translation>نشانی</translation>
</message>
<message>
<location line="+36"/>
@@ -196,7 +196,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>تکرار گذرواژهٔ جدید</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="+34"/>
+ <location filename="../askpassphrasedialog.cpp" line="+40"/>
<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;حداقل Û±Û° حر٠تصادÙÛŒ&lt;/b&gt;ØŒ یا &lt;b&gt;حداقل هشت کلمه&lt;/b&gt; انتخاب کنید.</translation>
</message>
@@ -278,7 +278,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<location line="+42"/>
<location line="+6"/>
<source>Wallet encryption failed</source>
- <translation>رمزنگاری کی٠پول با شکست مواجه شد</translation>
+ <translation>رمزنگاری کی٠پول با خطا مواجه شد</translation>
</message>
<message>
<location line="-54"/>
@@ -317,22 +317,27 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+250"/>
+ <location filename="../bitcoingui.cpp" line="+295"/>
<source>Sign &amp;message...</source>
<translation>&amp;امضای پیام...</translation>
</message>
<message>
- <location line="+254"/>
+ <location line="+335"/>
<source>Synchronizing with network...</source>
<translation>همگام‌سازی با شبکه...</translation>
</message>
<message>
- <location line="-324"/>
+ <location line="-407"/>
<source>&amp;Overview</source>
<translation>&amp;بررسی اجمالی</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="-137"/>
+ <source>Node</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+138"/>
<source>Show general overview of wallet</source>
<translation>نمایش بررسی اجمالی کی٠پول</translation>
</message>
@@ -347,7 +352,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>مرور تاریخچهٔ تراکنش‌ها</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>E&amp;xit</source>
<translation>&amp;خروج</translation>
</message>
@@ -393,7 +398,22 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>&amp;تغییر گذرواژه...</translation>
</message>
<message>
- <location line="+259"/>
+ <location line="+10"/>
+ <source>&amp;Sending addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Receiving addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open &amp;URI...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+325"/>
<source>Importing blocks from disk...</source>
<translation>دریاÙت بلوک‌ها از دیسک...</translation>
</message>
@@ -403,12 +423,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>بازنشانی بلوک‌ها روی دیسک...</translation>
</message>
<message>
- <location line="-322"/>
+ <location line="-405"/>
<source>Send coins to a Bitcoin address</source>
<translation>ارسال وجه به نشانی بیت‌کوین</translation>
</message>
<message>
- <location line="+47"/>
+ <location line="+49"/>
<source>Modify configuration options for Bitcoin</source>
<translation>تغییر و اصلاح تنظیمات پیکربندی بیت‌کوین</translation>
</message>
@@ -438,20 +458,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>با&amp;زبینی پیام...</translation>
</message>
<message>
- <location line="-180"/>
- <location line="+6"/>
- <location line="+513"/>
+ <location line="+430"/>
<source>Bitcoin</source>
<translation>بیت‌کوین</translation>
</message>
<message>
- <location line="-519"/>
- <location line="+6"/>
+ <location line="-643"/>
<source>Wallet</source>
<translation>کی٠پول</translation>
</message>
<message>
- <location line="+109"/>
+ <location line="+146"/>
<source>&amp;Send</source>
<translation>&amp;ارسال</translation>
</message>
@@ -461,13 +478,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>&amp;دریاÙت</translation>
</message>
<message>
- <location line="+28"/>
- <location line="+2"/>
- <source>&amp;About Bitcoin</source>
- <translation>&amp;دربارهٔ بیت‌کوین</translation>
- </message>
- <message>
- <location line="+14"/>
+ <location line="+46"/>
<location line="+2"/>
<source>&amp;Show / Hide</source>
<translation>&amp;نمایش/ عدم نمایش</translation>
@@ -493,64 +504,80 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>برای حصول اطمینان از اینکه پیام با نشانی بیت‌کوین مشخص شده امضا است یا خیر، پیام را شناسایی کنید</translation>
</message>
<message>
- <location line="+35"/>
+ <location line="+48"/>
<source>&amp;File</source>
- <translation>&amp;Ùایل</translation>
+ <translation>&amp;پرونده</translation>
</message>
<message>
- <location line="+10"/>
+ <location line="+14"/>
<source>&amp;Settings</source>
<translation>&amp;تنظیمات</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>&amp;Help</source>
<translation>&amp;کمک‌رسانی</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+15"/>
<source>Tabs toolbar</source>
<translation>نوارابزار برگه‌ها</translation>
</message>
<message>
- <location line="-235"/>
- <location line="+294"/>
+ <location line="-284"/>
+ <location line="+376"/>
<source>[testnet]</source>
<translation>[شبکهٔ آزمایش]</translation>
</message>
<message>
- <location line="-177"/>
+ <location line="-401"/>
+ <source>Bitcoin Core</source>
+ <translation> هسته Bitcoin </translation>
+ </message>
+ <message>
+ <location line="+163"/>
<source>Request payments (generates QR codes and bitcoin: URIs)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+63"/>
- <source>&amp;Used sending addresses...</source>
+ <location line="+29"/>
+ <location line="+2"/>
+ <source>&amp;About Bitcoin Core</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="+35"/>
<source>Show the list of used sending addresses and labels</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Used &amp;receiving addresses...</source>
+ <location line="+2"/>
+ <source>Show the list of used receiving addresses and labels</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open a bitcoin: URI or payment request</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Command-line options</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
- <source>Show the list of used receiving addresses and labels</source>
+ <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+106"/>
+ <location line="+159"/>
<location line="+5"/>
<source>Bitcoin client</source>
<translation>کلاینت بیت‌کوین</translation>
</message>
<message numerus="yes">
- <location line="+120"/>
+ <location line="+142"/>
<source>%n active connection(s) to Bitcoin network</source>
<translation><numerusform>%n ارتباط Ùعال با شبکهٔ بیت‌کوین</numerusform></translation>
</message>
@@ -570,7 +597,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>%1 بلاک از تاریخچهٔ تراکنش‌ها پردازش شده است.</translation>
</message>
<message numerus="yes">
- <location line="+20"/>
+ <location line="+23"/>
<source>%n hour(s)</source>
<translation><numerusform>%n ساعت</numerusform></translation>
</message>
@@ -590,7 +617,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>%1 عقب‌تر</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="+21"/>
<source>Last received block was generated %1 ago.</source>
<translation>آخرین بلاک دریاÙتی %1 پیش ایجاد شده است.</translation>
</message>
@@ -615,27 +642,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>اطلاعات</translation>
</message>
<message>
- <location line="+77"/>
- <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="-152"/>
+ <location line="-85"/>
<source>Up to date</source>
<translation>وضعیت به‌روز</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Catching up...</source>
<translation>به‌روز رسانی...</translation>
</message>
<message>
- <location line="+124"/>
- <source>Confirm transaction fee</source>
- <translation>تأیید هزینهٔ تراکنش</translation>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+130"/>
<source>Sent transaction</source>
<translation>تراکنش ارسال شد</translation>
</message>
@@ -658,17 +675,7 @@ Address: %4
</translation>
</message>
<message>
- <location line="+34"/>
- <source>URI handling</source>
- <translation>مدیریت URI</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
- <translation>نشانی اینترنتی قابل تجزیه و تحلیل نیست! دلیل این وضعیت ممکن است یک نشانی نامعتبر بیت‌کوین و یا پارامترهای ناهنجار در URI بوده باشد.</translation>
- </message>
- <message>
- <location line="+45"/>
+ <location line="+69"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation>کی٠پول &lt;b&gt;رمزنگاری شده&lt;/b&gt; است و هم‌اکنون &lt;b&gt;باز&lt;/b&gt; است</translation>
</message>
@@ -678,7 +685,7 @@ Address: %4
<translation>کی٠پول &lt;b&gt;رمزنگاری شده&lt;/b&gt; است Ùˆ هم‌اکنون &lt;b&gt;Ù‚ÙÙ„&lt;/b&gt; است</translation>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+110"/>
+ <location filename="../bitcoin.cpp" line="+438"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation>یک خطای مهلک اتÙاق اÙتاده است. بیت‌کوین نمی‌تواند بدون مشکل به کار خود ادامه دهد Ùˆ بسته خواهد شد.</translation>
</message>
@@ -686,12 +693,304 @@ Address: %4
<context>
<name>ClientModel</name>
<message>
- <location filename="../clientmodel.cpp" line="+115"/>
+ <location filename="../clientmodel.cpp" line="+119"/>
<source>Network Alert</source>
<translation>پیام شبکه</translation>
</message>
</context>
<context>
+ <name>CoinControlDialog</name>
+ <message>
+ <location filename="../forms/coincontroldialog.ui" line="+14"/>
+ <source>Coin Control Address Selection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>Quantity:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Bytes:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>Amount:</source>
+ <translation>مبلغ:</translation>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Priority:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Low Output:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>After Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Change:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+63"/>
+ <source>(un)select all</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Tree mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>List mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>Amount</source>
+ <translation>مبلغ</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Address</source>
+ <translation>نشانی</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Date</source>
+ <translation>تاریخ</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Confirmations</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Confirmed</source>
+ <translation>تأیید شده</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../coincontroldialog.cpp" line="+42"/>
+ <source>Copy address</source>
+ <translation>کپی نشانی</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy label</source>
+ <translation>کپی برچسب</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+26"/>
+ <source>Copy amount</source>
+ <translation>کپی مقدار</translation>
+ </message>
+ <message>
+ <location line="-25"/>
+ <source>Copy transaction ID</source>
+ <translation>کپی شناسهٔ تراکنش</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Lock unspent</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Unlock unspent</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+22"/>
+ <source>Copy quantity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Copy fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy after fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy bytes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy low output</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy change</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+323"/>
+ <source>highest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>higher</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>high</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>medium-high</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>medium</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>low-medium</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>low</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>lower</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>lowest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>(%1 locked)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+140"/>
+ <source>Dust</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>yes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>no</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>This label turns red, if the transaction size is greater than 1000 bytes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+5"/>
+ <source>This means a fee of at least %1 per kB is required.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-4"/>
+ <source>Can vary +/- 1 byte per input.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Transactions with higher priority are more likely to get included into a block.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>This label turns red, if the priority is smaller than &quot;medium&quot;.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>This label turns red, if any recipient receives an amount smaller than %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+4"/>
+ <source>This means a fee of at least %1 is required.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-3"/>
+ <source>Amounts below 0.546 times the minimum relay fee are shown as dust.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>This label turns red, if the change is smaller than %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
+ <location line="+66"/>
+ <source>(no label)</source>
+ <translation>(بدون برچسب)</translation>
+ </message>
+ <message>
+ <location line="-9"/>
+ <source>change from %1 (%2)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>(change)</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>EditAddressDialog</name>
<message>
<location filename="../forms/editaddressdialog.ui" line="+14"/>
@@ -719,7 +1018,7 @@ Address: %4
<translation>&amp;نشانی</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+21"/>
+ <location filename="../editaddressdialog.cpp" line="+28"/>
<source>New receiving address</source>
<translation>نشانی دریاÙتی جدید</translation>
</message>
@@ -762,7 +1061,7 @@ Address: %4
<context>
<name>FreespaceChecker</name>
<message>
- <location filename="../intro.cpp" line="+61"/>
+ <location filename="../intro.cpp" line="+65"/>
<source>A new data directory will be created.</source>
<translation>یک مسیر دادهٔ جدید ایجاد خواهد شد.</translation>
</message>
@@ -788,15 +1087,19 @@ Address: %4
</message>
</context>
<context>
- <name>GUIUtil::HelpMessageBox</name>
+ <name>HelpMessageDialog</name>
<message>
- <location filename="../guiutil.cpp" line="+558"/>
- <location line="+13"/>
- <source>Bitcoin-Qt</source>
- <translation>بیت‌کوین-کیوت</translation>
+ <location filename="../forms/helpmessagedialog.ui" line="+19"/>
+ <source>Bitcoin Core - Command-line options</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="-13"/>
+ <location filename="../utilitydialog.cpp" line="+38"/>
+ <source>Bitcoin Core</source>
+ <translation> هسته Bitcoin </translation>
+ </message>
+ <message>
+ <location line="+0"/>
<source>version</source>
<translation>نسخه</translation>
</message>
@@ -845,18 +1148,18 @@ Address: %4
</message>
<message>
<location line="+9"/>
- <source>Welcome to Bitcoin-Qt.</source>
- <translation>به بیت‌کوین خوش‌آمدید.</translation>
+ <source>Welcome to Bitcoin Core.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+26"/>
- <source>As this is the first time the program is launched, you can choose where Bitcoin-Qt will store its data.</source>
- <translation>از آنجایی که این اولین اجرای برنامه است، شما می‌توانید مسیر ذخیرهٔ داده‌ها را انتخاب کنید.</translation>
+ <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+10"/>
- <source>Bitcoin-Qt will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
- <translation>بیت‌کوین-کیوت یک کپی از زنجیرهٔ بلوک‌ها را دانلود و ذخیره خواهد کرد. حداقل %1 گیگابایت داده در این پوشه ذخیره خواهد شد، و با گذشت زمان حجم آن بیشتر این نیز می‌شود. همچنین داده‌های کی٠پول در این مسیر نگهداری خواهد شد.</translation>
+ <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+10"/>
@@ -869,7 +1172,17 @@ Address: %4
<translation>استÙاده از یک مسیر سÙارشی:</translation>
</message>
<message>
- <location filename="../intro.cpp" line="+105"/>
+ <location filename="../intro.cpp" line="+85"/>
+ <source>Bitcoin</source>
+ <translation>بیت‌کوین</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error: Specified data directory &quot;%1&quot; can not be created.</source>
+ <translation>خطا: نمی‌توان پوشه‌ای برای داده‌ها در «%1» ایجاد کرد.</translation>
+ </message>
+ <message>
+ <location line="+19"/>
<source>Error</source>
<translation>خطا</translation>
</message>
@@ -885,6 +1198,34 @@ Address: %4
</message>
</context>
<context>
+ <name>OpenURIDialog</name>
+ <message>
+ <location filename="../forms/openuridialog.ui" line="+14"/>
+ <source>Open URI</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Open payment request from URI or file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>URI:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Select payment request file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../openuridialog.cpp" line="+47"/>
+ <source>Select payment request file to open</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OptionsDialog</name>
<message>
<location filename="../forms/optionsdialog.ui" line="+14"/>
@@ -892,7 +1233,7 @@ Address: %4
<translation>گزینه‌ها</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+13"/>
<source>&amp;Main</source>
<translation>&amp;عمومی</translation>
</message>
@@ -917,7 +1258,52 @@ Address: %4
<translation>&amp;اجرای بیت‌کوین با ورود به سیستم</translation>
</message>
<message>
- <location line="+35"/>
+ <location line="+9"/>
+ <source>Size of &amp;database cache</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set database cache size in megabytes (default: 25)</source>
+ <translation>تنظیم اندازهٔ Ú©ÙŽØ´ پایگاه‌داده برحسب مگابایت (پیش‌Ùرض: Û²Ûµ)</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>MB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Number of script &amp;verification threads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Connect to the Bitcoin network through a SOCKS proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Connect through SOCKS proxy (default proxy):</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+224"/>
+ <source>Active command-line options that override above options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
<source>Reset all client options to default.</source>
<translation>بازنشانی تمام تنظیمات به پیش‌Ùرض.</translation>
</message>
@@ -927,7 +1313,7 @@ Address: %4
<translation>&amp;بازنشانی تنظیمات</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="-323"/>
<source>&amp;Network</source>
<translation>&amp;شبکه</translation>
</message>
@@ -942,32 +1328,17 @@ Address: %4
<translation>نگاشت درگاه شبکه با استÙاده از پروتکل &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>اتصال به شبکهٔ بیت‌کوین از طریق یک پراکسی ساکس (مثلاً پشت شبکهٔ Tor).</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>&amp;Connect through SOCKS proxy:</source>
- <translation>اتصال از طریق پراک&amp;سی SOCKS:</translation>
- </message>
- <message>
- <location line="+9"/>
+ <location line="+19"/>
<source>Proxy &amp;IP:</source>
<translation>آ&amp;ی‌پی پراکسی:</translation>
</message>
<message>
- <location line="+19"/>
- <source>IP address of the proxy (e.g. 127.0.0.1)</source>
- <translation>نشانی آی‌پی پراکسی (مثلاً 127.0.0.01)</translation>
- </message>
- <message>
- <location line="+7"/>
+ <location line="+32"/>
<source>&amp;Port:</source>
<translation>&amp;درگاه:</translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+25"/>
<source>Port of the proxy (e.g. 9050)</source>
<translation>درگاه پراکسی (مثال 9050)</translation>
</message>
@@ -1042,7 +1413,17 @@ Address: %4
<translation>نمایش Ù†&amp;شانی‌ها در Ùهرست تراکنش‌ها</translation>
</message>
<message>
- <location line="+71"/>
+ <location line="+7"/>
+ <source>Whether to show coin control features or not.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Display coin &amp;control features (experts only)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+136"/>
<source>&amp;OK</source>
<translation>&amp;تأیید</translation>
</message>
@@ -1052,44 +1433,38 @@ Address: %4
<translation>&amp;لغو</translation>
</message>
<message>
- <location line="+10"/>
- <source>&amp;Apply</source>
- <translation>اÙع&amp;مال</translation>
- </message>
- <message>
- <location filename="../optionsdialog.cpp" line="+58"/>
+ <location filename="../optionsdialog.cpp" line="+67"/>
<source>default</source>
<translation>پیش‌Ùرض</translation>
</message>
<message>
- <location line="+130"/>
+ <location line="+57"/>
+ <source>none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+75"/>
<source>Confirm options reset</source>
<translation>تأیید٠بازنشانی گزینه‌ها</translation>
</message>
<message>
<location line="+1"/>
- <source>Some settings may require a client restart to take effect.</source>
- <translation>بعضی از تنظیمات ممکن است نیاز به اجرای مجدد برنامهٔ کلاینت داشته باشند تا اعمال شوند.</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Do you want to proceed?</source>
- <translation>آیا می‌خواهید عملیات انجام شود؟</translation>
+ <location line="+29"/>
+ <source>Client restart required to activate changes.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
- <location line="+9"/>
- <source>Warning</source>
- <translation>هشدار</translation>
+ <location line="-29"/>
+ <source>Client will be shutdown, do you want to proceed?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="-9"/>
- <location line="+9"/>
- <source>This setting will take effect after restarting Bitcoin.</source>
- <translation>این تنظیمات بعد از اجرای مجدد بیت‌کوین اعمال خواهند شد.</translation>
+ <location line="+33"/>
+ <source>This change would require a client restart.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+29"/>
+ <location line="+34"/>
<source>The supplied proxy address is invalid.</source>
<translation>آدرس پراکسی داده شده صحیح نیست.</translation>
</message>
@@ -1103,22 +1478,22 @@ Address: %4
</message>
<message>
<location line="+50"/>
- <location line="+202"/>
+ <location line="+231"/>
<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="-131"/>
+ <location line="-155"/>
<source>Unconfirmed:</source>
<translation>تأیید نشده:</translation>
</message>
<message>
- <location line="-78"/>
+ <location line="-83"/>
<source>Wallet</source>
<translation>کی٠پول</translation>
</message>
<message>
- <location line="+49"/>
+ <location line="+51"/>
<source>Confirmed:</source>
<translation>تأیید شده:</translation>
</message>
@@ -1128,12 +1503,12 @@ Address: %4
<translation>تراز علی‌الحساب شما</translation>
</message>
<message>
- <location line="+29"/>
+ <location line="+32"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation>مجموع تراکنش‌هایی که هنوز تأیید نشده‌اند؛ و هنوز روی تراز علی‌الحساب اعمال نشده‌اند</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+16"/>
<source>Immature:</source>
<translation>نارسیده:</translation>
</message>
@@ -1143,7 +1518,7 @@ Address: %4
<translation>تراز استخراج شده از معدن که هنوز بالغ نشده است</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+16"/>
<source>Total:</source>
<translation>جمع کل:</translation>
</message>
@@ -1153,12 +1528,12 @@ Address: %4
<translation>تراز Ú©Ù„ Ùعلی شما</translation>
</message>
<message>
- <location line="+53"/>
+ <location line="+71"/>
<source>&lt;b&gt;Recent transactions&lt;/b&gt;</source>
<translation>&lt;b&gt;تراکنش‌های اخیر&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../overviewpage.cpp" line="+116"/>
+ <location filename="../overviewpage.cpp" line="+120"/>
<location line="+1"/>
<source>out of sync</source>
<translation>ناهمگام</translation>
@@ -1167,7 +1542,8 @@ Address: %4
<context>
<name>PaymentServer</name>
<message>
- <location filename="../paymentserver.cpp" line="+392"/>
+ <location filename="../paymentserver.cpp" line="+403"/>
+ <location line="+13"/>
<source>URI handling</source>
<translation>مدیریت URI</translation>
</message>
@@ -1177,45 +1553,82 @@ Address: %4
<translation>نشانی اینترنتی قابل تجزیه و تحلیل نیست! دلیل این وضعیت ممکن است یک نشانی نامعتبر بیت‌کوین و یا پارامترهای ناهنجار در URI بوده باشد.</translation>
</message>
<message>
- <location line="+69"/>
+ <location line="+96"/>
<source>Requested payment amount of %1 is too small (considered dust).</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
- <location line="+37"/>
+ <location line="-221"/>
+ <location line="+212"/>
+ <location line="+13"/>
+ <location line="+95"/>
+ <location line="+18"/>
+ <location line="+16"/>
<source>Payment request error</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="-353"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
+ <translation>نمی‌توان بیت‌کوین را اجرا کرد: کنترل‌کنندهٔ کلیک-و-پرداخت</translation>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Net manager warning</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+1"/>
- <source>Insecure requests to custom payment scripts unsupported</source>
+ <source>Your active proxy doesn&apos;t support SOCKS5, which is required for payment requests via proxy.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+38"/>
+ <location line="+52"/>
+ <source>Payment request fetch URL is invalid: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Payment request file handling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Payment request file can not be read or processed! This can be caused by an invalid payment request file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+73"/>
+ <source>Unverified payment requests to custom payment scripts are unsupported.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+59"/>
<source>Refund from %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
+ <location line="+43"/>
<source>Error communicating with %1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+24"/>
+ <source>Payment request can not be parsed or processed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
<source>Bad response from server %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+32"/>
+ <location line="+33"/>
<source>Payment acknowledged</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-58"/>
- <location line="+30"/>
- <location line="+17"/>
+ <location line="-11"/>
<source>Network request error</source>
<translation type="unfinished"/>
</message>
@@ -1223,32 +1636,26 @@ Address: %4
<context>
<name>QObject</name>
<message>
- <location filename="../bitcoin.cpp" line="+114"/>
- <location line="+5"/>
- <location filename="../intro.cpp" line="-32"/>
+ <location filename="../bitcoin.cpp" line="+71"/>
+ <location line="+11"/>
<source>Bitcoin</source>
<translation>بیت‌کوین</translation>
</message>
<message>
- <location line="-4"/>
+ <location line="+1"/>
<source>Error: Specified data directory &quot;%1&quot; does not exist.</source>
<translation>خطا: پوشهٔ مشخص شده برای داده‌ها در «%1» وجود ندارد.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="-12"/>
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../intro.cpp" line="+1"/>
- <source>Error: Specified data directory &quot;%1&quot; can not be created.</source>
- <translation>خطا: نمی‌توان پوشه‌ای برای داده‌ها در «%1» ایجاد کرد.</translation>
- </message>
</context>
<context>
<name>QRImageWidget</name>
<message>
- <location filename="../receiverequestdialog.cpp" line="+32"/>
+ <location filename="../receiverequestdialog.cpp" line="+36"/>
<source>&amp;Save Image...</source>
<translation type="unfinished"/>
</message>
@@ -1264,8 +1671,8 @@ Address: %4
</message>
<message>
<location line="+0"/>
- <source>PNG Images (*.png)</source>
- <translation>تصاویر PNG (*.png)</translation>
+ <source>PNG Image (*.png)</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1282,15 +1689,16 @@ Address: %4
<location line="+23"/>
<location line="+23"/>
<location line="+36"/>
- <location line="+53"/>
+ <location line="+23"/>
+ <location line="+36"/>
<location line="+23"/>
<location line="+23"/>
- <location filename="../rpcconsole.cpp" line="+352"/>
+ <location filename="../rpcconsole.cpp" line="+359"/>
<source>N/A</source>
<translation>ناموجود</translation>
</message>
<message>
- <location line="-217"/>
+ <location line="-223"/>
<source>Client version</source>
<translation>نسخهٔ کلاینت</translation>
</message>
@@ -1300,7 +1708,17 @@ Address: %4
<translation>&amp;اطلاعات</translation>
</message>
<message>
- <location line="+68"/>
+ <location line="-10"/>
+ <source>Debug window</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+25"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+53"/>
<source>Using OpenSSL version</source>
<translation>نسخهٔ OpenSSL استÙاده شده</translation>
</message>
@@ -1316,16 +1734,16 @@ Address: %4
</message>
<message>
<location line="+7"/>
- <source>Number of connections</source>
- <translation>تعداد ارتباطات</translation>
+ <source>Name</source>
+ <translation>اسم</translation>
</message>
<message>
<location line="+23"/>
- <source>On testnet</source>
- <translation>روی شبکهٔ آزمایشی</translation>
+ <source>Number of connections</source>
+ <translation>تعداد ارتباطات</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+29"/>
<source>Block chain</source>
<translation>زنجیرهٔ بلوک‌ها</translation>
</message>
@@ -1350,21 +1768,6 @@ Address: %4
<translation>با&amp;ز کردن</translation>
</message>
<message>
- <location line="+16"/>
- <source>Command-line options</source>
- <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>نمایش لیست تمام گزینه‌های ممکن در خط Ùرمان بیت‌کوین در پنجرهٔ کمک‌رسانی بیت‌کوین-کیوت.</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>&amp;Show</source>
- <translation>&amp;نمایش</translation>
- </message>
- <message>
<location line="+24"/>
<source>&amp;Console</source>
<translation>&amp;کنسول</translation>
@@ -1395,22 +1798,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-541"/>
+ <location line="-521"/>
<source>Build date</source>
<translation>ساخت تاریخ</translation>
</message>
<message>
- <location line="-104"/>
- <source>Bitcoin - Debug window</source>
- <translation>صÙحه اشکال زدایی Bitcoin </translation>
- </message>
- <message>
- <location line="+25"/>
- <source>Bitcoin Core</source>
- <translation> هسته Bitcoin </translation>
- </message>
- <message>
- <location line="+279"/>
+ <location line="+206"/>
<source>Debug log file</source>
<translation>Ùایل٠لاگ٠اشکال زدایی</translation>
</message>
@@ -1420,7 +1813,7 @@ Address: %4
<translation>Ùایل٠لاگ٠اشکال زدایی Bitcoin را از دایرکتوری جاری داده ها باز کنید. این عملیات ممکن است برای Ùایلهای لاگ٠حجیم طولانی شود.</translation>
</message>
<message>
- <location line="+102"/>
+ <location line="+76"/>
<source>Clear console</source>
<translation>پاکسازی کنسول</translation>
</message>
@@ -1440,7 +1833,7 @@ Address: %4
<translation>برای نمایش یک مرور کلی از دستورات ممکن، عبارت &lt;b&gt;help&lt;/b&gt; را بنویسید.</translation>
</message>
<message>
- <location line="+128"/>
+ <location line="+122"/>
<source>%1 B</source>
<translation type="unfinished"/>
</message>
@@ -1478,48 +1871,48 @@ Address: %4
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+22"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
<source>&amp;Amount:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
- <source>The amount to request</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+7"/>
+ <location line="-13"/>
<source>&amp;Label:</source>
<translation>&amp;برچسب:</translation>
</message>
<message>
- <location line="+10"/>
- <source>The label to associate with the receiving address</source>
+ <location line="-34"/>
+ <source>&amp;Message:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>&amp;Message:</source>
+ <location line="-17"/>
+ <source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>The message to attach to payment request</source>
+ <location line="+3"/>
+ <source>R&amp;euse an existing receiving address (not recommended)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
- <source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
+ <location line="+27"/>
+ <source>An optional label to associate with the new receiving address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>R&amp;euse an existing receiving address (not recommended)</source>
+ <location line="+7"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+7"/>
- <source>Use this form to request payments. All fields are optional.</source>
+ <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+39"/>
+ <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1537,6 +1930,31 @@ Address: %4
<source>&amp;Request payment</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+47"/>
+ <source>Requested payments</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Show the selected request (does the same as double clicking an entry)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Show</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Remove the selected entries from the list</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Remove</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
@@ -1557,16 +1975,11 @@ Address: %4
</message>
<message>
<location line="+7"/>
- <source>&amp;Copy Image</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+7"/>
<source>&amp;Save Image...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../receiverequestdialog.cpp" line="+58"/>
+ <location filename="../receiverequestdialog.cpp" line="+56"/>
<source>Request payment to %1</source>
<translation type="unfinished"/>
</message>
@@ -1612,16 +2025,119 @@ Address: %4
</message>
</context>
<context>
+ <name>RecentRequestsTableModel</name>
+ <message>
+ <location filename="../recentrequeststablemodel.cpp" line="+24"/>
+ <source>Date</source>
+ <translation>تاریخ</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Label</source>
+ <translation>برچسب</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Message</source>
+ <translation>پیام</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Amount</source>
+ <translation>مبلغ</translation>
+ </message>
+ <message>
+ <location line="+38"/>
+ <source>(no label)</source>
+ <translation>(بدون برچسب)</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>(no message)</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+140"/>
- <location line="+213"/>
+ <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location line="+80"/>
<source>Send Coins</source>
<translation>ارسال سکه</translation>
</message>
<message>
- <location line="+50"/>
+ <location line="+76"/>
+ <source>Coin Control Features</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Inputs...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>automatically selected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Insufficient funds!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+89"/>
+ <source>Quantity:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+35"/>
+ <source>Bytes:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Amount:</source>
+ <translation>مبلغ:</translation>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Priority:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Low Output:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>After Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Change:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+44"/>
+ <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Custom change address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+115"/>
<source>Send to multiple recipients at once</source>
<translation>ارسال به چند دریاÙت‌کنندهٔ به‌طور همزمان</translation>
</message>
@@ -1646,12 +2162,7 @@ Address: %4
<translation>تزار:</translation>
</message>
<message>
- <location line="+10"/>
- <source>123.456 BTC</source>
- <translation>123.456 BTC</translation>
- </message>
- <message>
- <location line="+31"/>
+ <location line="+41"/>
<source>Confirm the send action</source>
<translation>عملیات ارسال را تأیید کنید</translation>
</message>
@@ -1661,69 +2172,135 @@ Address: %4
<translation>&amp;ارسال</translation>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-154"/>
+ <location filename="../sendcoinsdialog.cpp" line="-228"/>
<source>Confirm send coins</source>
<translation>ارسال سکه را تأیید کنید</translation>
</message>
<message>
- <location line="-90"/>
+ <location line="-74"/>
<location line="+5"/>
<location line="+5"/>
+ <location line="+4"/>
<source>%1 to %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+26"/>
+ <location line="-136"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation>یک آدرس بیت‌کوین وارد کنید (مثلاً 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Copy quantity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation>کپی مقدار</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy after fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy bytes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy low output</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy change</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+170"/>
+ <source>Total Amount %1 (= %2)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>or</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+202"/>
<source>The recipient address is not valid, please recheck.</source>
<translation>نشانی گیرنده معتبر نیست؛ لطÙا دوباره بررسی کنید.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The amount to pay must be larger than 0.</source>
<translation>مبلغ پرداخت باید بیشتر از ۰ باشد.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The amount exceeds your balance.</source>
<translation>میزان پرداخت از تراز شما بیشتر است.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The total exceeds your balance when the %1 transaction fee is included.</source>
<translation>با احتساب هزینهٔ %1 برای هر تراکنش، مجموع میزان پرداختی از مبلغ تراز شما بیشتر می‌شود.</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+3"/>
<source>Duplicate address found, can only send to each address once per send operation.</source>
<translation>یک نشانی تکراری پیدا شد. در هر عملیات ارسال، به هر نشانی Ùقط مبلغ می‌توان ارسال کرد.</translation>
</message>
<message>
+ <location line="+3"/>
+ <source>Transaction creation failed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+4"/>
- <source>Error: Transaction creation failed!</source>
- <translation>خطا: ایجاد تراکنش با شکست مواجه شد!</translation>
+ <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+15"/>
- <source>Are you sure you want to send?</source>
+ <location line="+112"/>
+ <source>Warning: Invalid Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+9"/>
- <source>added as transaction fee</source>
+ <location line="+21"/>
+ <source>(no label)</source>
+ <translation>(بدون برچسب)</translation>
+ </message>
+ <message>
+ <location line="-11"/>
+ <source>Warning: Unknown change address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
- <source>Total Amount %1</source>
+ <location line="-366"/>
+ <source>Are you sure you want to send?</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+20"/>
- <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>خطا: تراکنش درخواستی پذیرÙته نشد. ممکن است تعدادی از سکه‌های کی٠پول شما قبلاً خرج شده باشند؛ مثلاً در حالتی Ú©Ù‡ شما یک Ú©Ù¾ÛŒ از داده‌های کی٠پول تهیه کرده باشید Ùˆ در آن Ú©Ù¾ÛŒ سکه‌ها خرج شده باشند اما این‌جا خرج نشده باشند.</translation>
+ <location line="+9"/>
+ <source>added as transaction fee</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+144"/>
+ <location line="+170"/>
<source>Payment request expired</source>
<translation type="unfinished"/>
</message>
@@ -1736,39 +2313,44 @@ Address: %4
<context>
<name>SendCoinsEntry</name>
<message>
- <location filename="../forms/sendcoinsentry.ui" line="+33"/>
- <location line="+585"/>
+ <location filename="../forms/sendcoinsentry.ui" line="+131"/>
+ <location line="+521"/>
+ <location line="+536"/>
<source>A&amp;mount:</source>
<translation>A&amp;مبلغ :</translation>
</message>
<message>
- <location line="-572"/>
- <location line="+585"/>
+ <location line="-1152"/>
<source>Pay &amp;To:</source>
<translation>پرداخ&amp;ت به:</translation>
</message>
<message>
- <location line="-551"/>
+ <location line="+18"/>
<source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>نشانی مقصد برای پرداخت (مثلاً 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location filename="../sendcoinsentry.cpp" line="+28"/>
+ <location filename="../sendcoinsentry.cpp" line="+30"/>
<source>Enter a label for this address to add it to your address book</source>
<translation>برای این نشانی یک برچسب وارد کنید تا در دÙترچهٔ آدرس ذخیره شود</translation>
</message>
<message>
- <location filename="../forms/sendcoinsentry.ui" line="-18"/>
+ <location filename="../forms/sendcoinsentry.ui" line="+57"/>
<source>&amp;Label:</source>
<translation>&amp;برچسب:</translation>
</message>
<message>
- <location line="+28"/>
+ <location line="-50"/>
<source>Choose previously used address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
+ <location line="-40"/>
+ <source>This is a normal payment.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+50"/>
<source>Alt+A</source>
<translation>Alt+A</translation>
</message>
@@ -1784,16 +2366,45 @@ Address: %4
</message>
<message>
<location line="+7"/>
- <source>Remove this recipient</source>
- <translation>حذ٠کردن این دریاÙت‌کننده</translation>
+ <location line="+524"/>
+ <location line="+536"/>
+ <source>Remove this entry</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="-1008"/>
+ <source>Message:</source>
+ <translation>پیام:</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+958"/>
+ <source>This is a verified payment request.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-991"/>
<source>Enter a label for this address to add it to the list of used addresses</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+465"/>
+ <location line="+459"/>
+ <source>This is an unverified payment request.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+18"/>
+ <location line="+532"/>
+ <source>Pay To:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-498"/>
+ <location line="+536"/>
<source>Memo:</source>
<translation type="unfinished"/>
</message>
@@ -1804,6 +2415,19 @@ Address: %4
</message>
</context>
<context>
+ <name>ShutdownWindow</name>
+ <message>
+ <location filename="../utilitydialog.cpp" line="+48"/>
+ <source>Bitcoin Core is shutting down...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Do not shut down the computer until this window disappears.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>SignVerifyMessageDialog</name>
<message>
<location filename="../forms/signverifymessagedialog.ui" line="+14"/>
@@ -1811,7 +2435,7 @@ Address: %4
<translation>امضاها - امضا / تأیید یک پیام</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+10"/>
<source>&amp;Sign Message</source>
<translation>ا&amp;مضای پیام</translation>
</message>
@@ -1914,7 +2538,7 @@ Address: %4
<translation>بازنشانی تمام Ùیلدهای پیام</translation>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+27"/>
+ <location filename="../signverifymessagedialog.cpp" line="+29"/>
<location line="+3"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>یک نشانی بیت‌کوین وارد کنید (مثلاً 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
@@ -1930,7 +2554,7 @@ Address: %4
<translation>امضای بیت‌کوین را وارد کنید</translation>
</message>
<message>
- <location line="+85"/>
+ <location line="+84"/>
<location line="+81"/>
<source>The entered address is invalid.</source>
<translation>نشانی وارد شده نامعتبر است.</translation>
@@ -1999,9 +2623,14 @@ Address: %4
<context>
<name>SplashScreen</name>
<message>
- <location filename="../splashscreen.cpp" line="+23"/>
- <source>The Bitcoin developers</source>
- <translation>جامعهٔ توسعه‌دهندگان بیت‌کوین</translation>
+ <location filename="../splashscreen.cpp" line="+28"/>
+ <source>Bitcoin Core</source>
+ <translation> هسته Bitcoin </translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>The Bitcoin Core developers</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
@@ -2012,7 +2641,7 @@ Address: %4
<context>
<name>TrafficGraphWidget</name>
<message>
- <location filename="../trafficgraphwidget.cpp" line="+75"/>
+ <location filename="../trafficgraphwidget.cpp" line="+79"/>
<source>KB/s</source>
<translation type="unfinished"/>
</message>
@@ -2020,7 +2649,7 @@ Address: %4
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="+22"/>
+ <location filename="../transactiondesc.cpp" line="+28"/>
<source>Open until %1</source>
<translation>باز تا %1</translation>
</message>
@@ -2093,12 +2722,12 @@ Address: %4
<location line="+12"/>
<location line="+45"/>
<location line="+17"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Credit</source>
<translation>بدهی</translation>
</message>
<message numerus="yes">
- <location line="-120"/>
+ <location line="-125"/>
<source>matures in %n more block(s)</source>
<translation><numerusform>بلوغ در %n بلوک دیگر</numerusform></translation>
</message>
@@ -2111,12 +2740,12 @@ Address: %4
<location line="+44"/>
<location line="+8"/>
<location line="+15"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Debit</source>
<translation>اعتبار</translation>
</message>
<message>
- <location line="-57"/>
+ <location line="-62"/>
<source>Transaction fee</source>
<translation>هزینهٔ تراکنش</translation>
</message>
@@ -2127,11 +2756,12 @@ Address: %4
</message>
<message>
<location line="+6"/>
+ <location line="+9"/>
<source>Message</source>
<translation>پیام</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="-7"/>
<source>Comment</source>
<translation>نظر</translation>
</message>
@@ -2141,7 +2771,7 @@ Address: %4
<translation>شناسهٔ تراکنش</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+18"/>
<source>Merchant</source>
<translation type="unfinished"/>
</message>
@@ -2181,7 +2811,7 @@ Address: %4
<translation>نادرست</translation>
</message>
<message>
- <location line="-227"/>
+ <location line="-232"/>
<source>, has not been successfully broadcast yet</source>
<translation>ØŒ هنوز با موÙقیت ارسال نشده</translation>
</message>
@@ -2212,7 +2842,7 @@ Address: %4
<context>
<name>TransactionTableModel</name>
<message>
- <location filename="../transactiontablemodel.cpp" line="+227"/>
+ <location filename="../transactiontablemodel.cpp" line="+234"/>
<source>Date</source>
<translation>تاریخ</translation>
</message>
@@ -2231,8 +2861,13 @@ Address: %4
<source>Amount</source>
<translation>مبلغ</translation>
</message>
+ <message>
+ <location line="+59"/>
+ <source>Immature (%1 confirmations, will be available after %2)</source>
+ <translation type="unfinished"/>
+ </message>
<message numerus="yes">
- <location line="+57"/>
+ <location line="+16"/>
<source>Open for %n more block(s)</source>
<translation><numerusform>باز برای %n بلوک دیگر</numerusform></translation>
</message>
@@ -2252,17 +2887,13 @@ Address: %4
<translation>تأیید نشده (%1 از %2 تأییدیه)</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="-22"/>
+ <location line="+25"/>
<source>Confirmed (%1 confirmations)</source>
<translation>تأیید شده (%1 تأییدیه)</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>تراز استخراج شده به‌وسیلهٔ معدن‌یابی زمانی قابل دسترس خواهد بود که در %n بلوک دیگر به بلوغ رسیده باشد</numerusform></translation>
- </message>
<message>
- <location line="+5"/>
+ <location line="-22"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation>این بلوک از هیچ همتای دیگری دریاÙت نشده است Ùˆ احتمال می‌رود پذیرÙته نشود!</translation>
</message>
@@ -2272,7 +2903,7 @@ Address: %4
<translation>تولید شده ولی قبول نشده</translation>
</message>
<message>
- <location line="+43"/>
+ <location line="+62"/>
<source>Received with</source>
<translation>دریاÙت‌شده با</translation>
</message>
@@ -2330,7 +2961,7 @@ Address: %4
<context>
<name>TransactionView</name>
<message>
- <location filename="../transactionview.cpp" line="+52"/>
+ <location filename="../transactionview.cpp" line="+57"/>
<location line="+16"/>
<source>All</source>
<translation>همه</translation>
@@ -2391,12 +3022,12 @@ Address: %4
<translation>دیگر</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+6"/>
<source>Enter address or label to search</source>
<translation>برای جست‌‌وجو نشانی یا برچسب را وارد کنید</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+6"/>
<source>Min amount</source>
<translation>مبلغ حداقل</translation>
</message>
@@ -2431,17 +3062,37 @@ Address: %4
<translation>نمایش جزئیات تراکنش</translation>
</message>
<message>
- <location line="+143"/>
- <source>Export Transaction Data</source>
- <translation>صدور داده‌های تراکنش</translation>
+ <location line="+142"/>
+ <source>Export Transaction History</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="+19"/>
+ <source>Exporting Failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>There was an error trying to save the transaction history to %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Exporting Successful</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The transaction history was successfully saved to %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-22"/>
<source>Comma separated file (*.csv)</source>
<translation>پروندهٔ نوع CSV جداشونده با کاما (*.csv)</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+9"/>
<source>Confirmed</source>
<translation>تأیید شده</translation>
</message>
@@ -2476,17 +3127,7 @@ Address: %4
<translation>شناسه</translation>
</message>
<message>
- <location line="+4"/>
- <source>Error exporting</source>
- <translation>خطا در خروجی گرÙتن</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation>نمی‌توان در پروندهٔ %1 چیزی نوشت.</translation>
- </message>
- <message>
- <location line="+100"/>
+ <location line="+107"/>
<source>Range:</source>
<translation>محدوده:</translation>
</message>
@@ -2497,9 +3138,17 @@ Address: %4
</message>
</context>
<context>
+ <name>WalletFrame</name>
+ <message>
+ <location filename="../walletframe.cpp" line="+26"/>
+ <source>No wallet has been loaded.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>WalletModel</name>
<message>
- <location filename="../walletmodel.cpp" line="+218"/>
+ <location filename="../walletmodel.cpp" line="+245"/>
<source>Send Coins</source>
<translation>ارسال وجه</translation>
</message>
@@ -2507,7 +3156,7 @@ Address: %4
<context>
<name>WalletView</name>
<message>
- <location filename="../walletview.cpp" line="+46"/>
+ <location filename="../walletview.cpp" line="+43"/>
<source>&amp;Export</source>
<translation>&amp;صدور</translation>
</message>
@@ -2517,137 +3166,132 @@ Address: %4
<translation>داده ها نوار٠جاری را به Ùایل انتقال دهید</translation>
</message>
<message>
- <location line="+183"/>
+ <location line="+181"/>
<source>Backup Wallet</source>
<translation>نسخهٔ پشتیبان کی٠پول</translation>
</message>
<message>
- <location line="+0"/>
+ <location line="+1"/>
<source>Wallet Data (*.dat)</source>
<translation>دادهٔ کی٠پول (*.dat)</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="+6"/>
<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>
+ <source>There was an error trying to save the wallet data to %1.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+4"/>
- <source>Backup Successful</source>
- <translation>پشتیبان‌گیری موÙÙ‚</translation>
+ <source>The wallet data was successfully saved to %1.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+0"/>
- <source>The wallet data was successfully saved to the new location.</source>
- <translation>داده‌های کی٠پول با موÙقیت در یک مکان جدید ذخیره شد.</translation>
+ <source>Backup Successful</source>
+ <translation>پشتیبان‌گیری موÙÙ‚</translation>
</message>
</context>
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+102"/>
- <source>Bitcoin version</source>
- <translation>سخه بیتکویین</translation>
- </message>
- <message>
- <location line="+107"/>
+ <location filename="../bitcoinstrings.cpp" line="+221"/>
<source>Usage:</source>
- <translation>ستÙاده :</translation>
+ <translation>استÙاده:</translation>
</message>
<message>
- <location line="-55"/>
+ <location line="-54"/>
<source>List commands</source>
- <translation>لیست Ùومان ها</translation>
+ <translation>نمایش لیست Ùرمان‌ها</translation>
</message>
<message>
- <location line="-13"/>
+ <location line="-14"/>
<source>Get help for a command</source>
- <translation>Ú©Ù…Ú© برای Ùرمان </translation>
+ <translation>راهنمایی در مورد یک دستور</translation>
</message>
<message>
- <location line="+25"/>
+ <location line="+26"/>
<source>Options:</source>
<translation>گزینه‌ها:</translation>
</message>
<message>
- <location line="+24"/>
+ <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>(bitcoind.pidپیش Ùرض : ) Ùایل پید خاص</translation>
+ <translation>مشخص کردن Ùایل شناسهٔ پردازش - pid - (پیش‌Ùرض: bitcoin.pid)</translation>
</message>
<message>
<location line="-1"/>
<source>Specify data directory</source>
- <translation>دایرکتور اطلاعاتی خاص</translation>
+ <translation>مشخص کردن دایرکتوری داده‌ها</translation>
</message>
<message>
<location line="-9"/>
<source>Set database cache size in megabytes (default: 25)</source>
- <translation>سایز Ú©ÙŽØ´ بانک داده را بر حسب مگابایت تنظیم کنید (پیش Ùرض:25)</translation>
+ <translation>تنظیم اندازهٔ Ú©ÙŽØ´ پایگاه‌داده برحسب مگابایت (پیش‌Ùرض: Û²Ûµ)</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-26"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
- <translation>برای اتصالات به &lt;port&gt; (پیش‌Ùرض: 8333 یا تست‌نت: 18333) گوش کنید</translation>
+ <translation>پذیرش اتصالات روی پورت &lt;port&gt; (پیش‌Ùرض: 8833 یا شبکهٔ آزمایشی: 18333)</translation>
</message>
<message>
<location line="+5"/>
<source>Maintain at most &lt;n&gt; connections to peers (default: 125)</source>
- <translation>حداکثر &lt;n&gt; اتصال با همکاران برقرار داشته باشید (پیش‌Ùرض: 125)</translation>
+ <translation>حداکثر &lt;n&gt; اتصال با همتایان برقرار شود (پیش‌Ùرض: Û±Û²Ûµ)</translation>
</message>
<message>
- <location line="-49"/>
+ <location line="-51"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
- <translation>اتصال به گره برای دریاÙت آدرسهای قرینه Ùˆ قطع اتصال</translation>
+ <translation>اتصال به یک گره برای دریاÙت آدرس‌های همتا Ùˆ قطع اتصال پس از اتمام عملیات</translation>
</message>
<message>
<location line="+84"/>
<source>Specify your own public address</source>
- <translation>آدرس عمومی خود را ذکر کنید</translation>
+ <translation>آدرس عمومی خود را مشخص کنید</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
- <translation>آستانه برای قطع ارتباط با همکاران بدرÙتار (پیش‌Ùرض: 100)</translation>
+ <translation>حد آستانه برای قطع ارتباط با همتایان بدرÙتار (پیش‌Ùرض: Û±Û°Û°)</translation>
</message>
<message>
- <location line="-142"/>
+ <location line="-148"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
- <translation>مدت زمان به ثانیه برای جلوگیری از همکاران بدرÙتار برای اتصال دوباره (پیش‌Ùرض: 86400)</translation>
+ <translation>مدت زمان جلوگیری از اتصال مجدد همتایان بدرÙتار، به ثانیه (پیش‌Ùرض: Û¸Û´Û¶Û°Û°)</translation>
</message>
<message>
- <location line="-33"/>
+ <location line="-36"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
- <translation>در زمان تنظیم درگاه RPX %u در Ùهرست کردن %s اشکالی رخ داده است</translation>
+ <translation>هنگام تنظیم پورت RPC %u برای گوش دادن روی IPv4 خطایی رخ داده است: %s</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<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>
+ <translation>پورت مورد شنود برای اتصالات JSON-RPC (پیش‌Ùرض: 8332 برای شبکهٔ تست 18332)</translation>
</message>
<message>
- <location line="+40"/>
+ <location line="+45"/>
<source>Accept command line and JSON-RPC commands</source>
- <translation>JSON-RPC قابل Ùرمانها Ùˆ</translation>
+ <translation>پذیرش دستورات خط Ùرمان Ùˆ دستورات JSON-RPC</translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<source>Run in the background as a daemon and accept commands</source>
- <translation>اجرای در پس زمینه به عنوان شبح Ùˆ قبول Ùرمان ها</translation>
+ <translation>اجرا در پشت زمینه به‌صورت یک سرویس و پذیرش دستورات</translation>
</message>
<message>
- <location line="+40"/>
+ <location line="+39"/>
<source>Use the test network</source>
- <translation>استÙاده شبکه آزمایش</translation>
+ <translation>استÙاده از شبکهٔ آزمایش</translation>
</message>
<message>
<location line="-118"/>
@@ -2655,7 +3299,7 @@ Address: %4
<translation>پذیرش اتصالات از بیرون (پیش Ùرض:1 بدون پراکسی یا اتصال)</translation>
</message>
<message>
- <location line="-87"/>
+ <location line="-95"/>
<source>%s, you must set a rpcpassword in the configuration file:
%s
It is recommended you use the following random password:
@@ -2682,12 +3326,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<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>مقید به نشانی داده شده باشید Ùˆ همیشه از آن پیروی کنید. از نشانه گذاری استاندار IPv6 به صورت Host]:Port] استÙاده کنید.</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>نمی توان یک Ù‚ÙÙ„ برای مسیر اطلاعات ایجاد کرد %s. احتمال دارد بیتکوین در حال اجرا باشد.</translation>
</message>
<message>
<location line="+3"/>
@@ -2696,31 +3340,36 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+4"/>
- <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>
+ <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</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>تراکنش پذیرÙته نیست! این خطا ممکن است در حالتی رخ داده باشد Ú©Ù‡ مقداری از سکه های شما در کی٠پولتان از جایی دیگر، همانند یک Ú©Ù¾ÛŒ از کی٠پول اصلی اتان، خرج شده باشد اما در کی٠پول اصلی اتان به عنوان مبلغ خرج شده، نشانه گذاری نشده باشد.</translation>
+ </message>
+ <message>
<location line="+4"/>
<source>Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds!</source>
- <translation type="unfinished"/>
+ <translation>خطا: این تراکنش به علت میزان وجه، دشواری، Ùˆ یا استÙاده از وجوه دریاÙتی اخیر نیازمند کارمزد به مبلغ حداقل %s است.</translation>
</message>
<message>
<location line="+6"/>
<source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
- <translation type="unfinished"/>
+ <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>
+ <location line="+18"/>
+ <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>
<message>
- <location line="+6"/>
- <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
+ <location line="+5"/>
+ <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+3"/>
<source>Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source>
<translation>هشدار: مبلغ paytxfee بسیار بالایی تنظیم شده است! این مبلغ هزینه‌ای است که شما برای تراکنش‌ها پرداخت می‌کنید.</translation>
</message>
@@ -2750,17 +3399,27 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
+ <location line="+9"/>
+ <source>&lt;category&gt; can be:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
<source>Attempt to recover private keys from a corrupt wallet.dat</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
+ <source>Bitcoin Core Daemon</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Bitcoin RPC client version</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
<source>Block creation options:</source>
<translation>بستن گزینه ایجاد</translation>
</message>
@@ -2770,14 +3429,19 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>تنها در گره (های) مشخص شده متصل شوید</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
+ <source>Connect through SOCKS proxy</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect to JSON-RPC on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+2"/>
<source>Corrupted block database detected</source>
- <translation type="unfinished"/>
+ <translation>یک پایگاه داده ÛŒ بلوک خراب یاÙت شد</translation>
</message>
<message>
<location line="+1"/>
@@ -2786,13 +3450,18 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+1"/>
- <source>Do you want to rebuild the block database now?</source>
+ <source>Do not load the wallet and disable wallet RPC calls</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="+1"/>
+ <source>Do you want to rebuild the block database now?</source>
+ <translation>آیا مایلید که اکنون پایگاه داده ی بلوک را بازسازی کنید؟</translation>
+ </message>
+ <message>
<location line="+2"/>
<source>Error initializing block database</source>
- <translation type="unfinished"/>
+ <translation>خطا در آماده سازی پایگاه داده ی بلوک</translation>
</message>
<message>
<location line="+1"/>
@@ -2802,12 +3471,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<message>
<location line="+1"/>
<source>Error loading block database</source>
- <translation type="unfinished"/>
+ <translation>خطا در بارگذاری پایگاه داده ها</translation>
</message>
<message>
<location line="+4"/>
<source>Error opening block database</source>
- <translation type="unfinished"/>
+ <translation>خطا در بازگشایی پایگاه داده ی بلوک</translation>
</message>
<message>
<location line="+2"/>
@@ -2822,7 +3491,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<message>
<location line="+1"/>
<source>Error: system error: </source>
- <translation type="unfinished"/>
+ <translation>خطا: خطای سامانه:</translation>
</message>
<message>
<location line="+1"/>
@@ -2832,55 +3501,60 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<message>
<location line="+1"/>
<source>Failed to read block info</source>
- <translation type="unfinished"/>
+ <translation>خواندن اطلاعات بلوک با شکست مواجه شد</translation>
</message>
<message>
<location line="+1"/>
<source>Failed to read block</source>
- <translation type="unfinished"/>
+ <translation>خواندن بلوک با شکست مواجه شد</translation>
</message>
<message>
<location line="+1"/>
<source>Failed to sync block index</source>
- <translation type="unfinished"/>
+ <translation>همگام سازی Ùهرست بلوک با شکست مواجه شد</translation>
</message>
<message>
<location line="+1"/>
<source>Failed to write block index</source>
- <translation type="unfinished"/>
+ <translation>نوشتن Ùهرست بلوک با شکست مواجه شد</translation>
</message>
<message>
<location line="+1"/>
<source>Failed to write block info</source>
- <translation type="unfinished"/>
+ <translation>نوشتن اطلاعات بلوک با شکست مواجه شد</translation>
</message>
<message>
<location line="+1"/>
<source>Failed to write block</source>
- <translation type="unfinished"/>
+ <translation>نوشتن بلوک با شکست مواجه شد</translation>
</message>
<message>
<location line="+1"/>
<source>Failed to write file info</source>
- <translation type="unfinished"/>
+ <translation>نوشتن اطلاعات پرونده با شکست مواجه شد</translation>
</message>
<message>
<location line="+1"/>
<source>Failed to write to coin database</source>
- <translation type="unfinished"/>
+ <translation>نوشتن اطلاعات در پایگاه داده ی سکه ها با شکست مواجه شد</translation>
</message>
<message>
<location line="+1"/>
<source>Failed to write transaction index</source>
- <translation type="unfinished"/>
+ <translation>نوشتن Ùهرست تراکنش ها با شکست مواجه شد</translation>
</message>
<message>
<location line="+1"/>
<source>Failed to write undo data</source>
- <translation type="unfinished"/>
+ <translation>عملیات بازگشت دادن اطلاعات با شکست مواجه شدن</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
+ <source>Fee per kB to add to transactions you send</source>
+ <translation>نرخ هر کیلوبایت برای اضاÙÙ‡ کردن به تراکنش‌هایی Ú©Ù‡ می‌Ùرستید</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Find peers using DNS lookup (default: 1 unless -connect)</source>
<translation>قرینه ها را برای جستجوی DNS بیاب (پیش Ùرض: 1 مگر در زمان اتصال)</translation>
</message>
@@ -2892,11 +3566,16 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<message>
<location line="+2"/>
<source>How many blocks to check at startup (default: 288, 0 = all)</source>
- <translation type="unfinished"/>
+ <translation>چند بلوک نیاز است Ú©Ù‡ در ابتدای راه اندازی بررسی شوند(پیش Ùرض:288 ØŒ0=همه)</translation>
</message>
<message>
<location line="+1"/>
<source>How thorough the block verification is (0-4, default: 3)</source>
+ <translation>&quot;بلوک تصدیق&quot; تا Ú†Ù‡ حد کامل Ùˆ دقیق است (0-4ØŒ پیش Ùرض: 3)</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>If &lt;category&gt; is not supplied, output all debugging information.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -2915,17 +3594,37 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+8"/>
+ <location line="+5"/>
+ <source>Prepend debug output with timestamp (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>RPC client options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Rebuild block chain index from current blk000??.dat files</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+5"/>
+ <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Send command to Bitcoin server</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
+ <location line="+7"/>
+ <source>Set maximum block size in bytes (default: %d)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Set the number of threads to service RPC calls (default: 4)</source>
<translation type="unfinished"/>
</message>
@@ -2940,18 +3639,28 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+12"/>
+ <location line="+3"/>
+ <source>This is intended for regression testing tools and app development.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Usage (deprecated, use bitcoin-cli):</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+8"/>
+ <location line="+7"/>
<source>Verifying blocks...</source>
- <translation type="unfinished"/>
+ <translation>در حال بازبینی بلوک ها...</translation>
</message>
<message>
<location line="+1"/>
<source>Verifying wallet...</source>
+ <translation>در حال بازبینی کی٠پول...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Wait for RPC server to start</source>
<translation type="unfinished"/>
</message>
<message>
@@ -2960,27 +3669,47 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+2"/>
+ <source>Wallet options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>You need to rebuild the database using -reindex to change -txindex</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-78"/>
+ <location line="-79"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-98"/>
+ <location line="-105"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+17"/>
+ <location line="+14"/>
+ <source>Output debugging information (default: 0, supplying &lt;category&gt; is optional)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+83"/>
+ <location line="+89"/>
<source>Information</source>
<translation>اطلاعات</translation>
</message>
@@ -3020,47 +3749,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>تنها =به گره ها در شبکه متصا شوید &lt;net&gt; (IPv4, IPv6 or Tor)</translation>
</message>
<message>
- <location line="+2"/>
- <source>Output extra debugging information. Implies all other -debug* options</source>
- <translation>برونداد اطلاعات اشکال زدایی اضاÙÛŒ. گزینه های اشکال زدایی دیگر رÙع شدند</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Output extra network debugging information</source>
- <translation>برونداد اطلاعات اشکال زدایی اضاÙÛŒ برای شبکه</translation>
- </message>
- <message>
- <location line="+2"/>
- <source>Prepend debug output with timestamp</source>
- <translation>به خروجی اشکال‌زدایی برچسب زمان بزنید</translation>
- </message>
- <message>
- <location line="+5"/>
+ <location line="+9"/>
<source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
<translation>گزینه ssl (به ویکیbitcoin برای راهنمای راه اندازی ssl مراجعه شود)</translation>
</message>
<message>
- <location line="+1"/>
- <source>Select the version of socks proxy to use (4-5, default: 5)</source>
- <translation>نسخه ای از پراکسی ساکس را برای استÙاده انتخاب کنید (4-5 پیش Ùرض:5)</translation>
- </message>
- <message>
- <location line="+3"/>
+ <location line="+4"/>
<source>Send trace/debug info to console instead of debug.log file</source>
<translation>اطلاعات ردگیری/اشکال‌زدایی را به جای Ùایل لاگ اشکال‌زدایی به کنسول بÙرستید</translation>
</message>
<message>
- <location line="+1"/>
- <source>Send trace/debug info to debugger</source>
- <translation>اطلاعات ردگیری/اشکال‌زدایی را به اشکال‌زدا بÙرستید</translation>
- </message>
- <message>
- <location line="+5"/>
- <source>Set maximum block size in bytes (default: 250000)</source>
- <translation>حداکثر سایز بلاک بر اساس بایت تنظیم شود (پیش Ùرض: 250000)</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+6"/>
<source>Set minimum block size in bytes (default: 0)</source>
<translation>حداقل سایز بلاک بر اساس بایت تنظیم شود (پیش Ùرض: 0)</translation>
</message>
@@ -3082,10 +3781,10 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<message>
<location line="+6"/>
<source>System error: </source>
- <translation type="unfinished"/>
+ <translation>خطای سامانه</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Transaction amount too small</source>
<translation type="unfinished"/>
</message>
@@ -3110,32 +3809,32 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>از UPnP برای شناسایی درگاه شنیداری استÙاده کنید (پیش Ùرض:1 در زمان شنیدن)</translation>
</message>
<message>
- <location line="+1"/>
- <source>Use proxy to reach tor hidden services (default: same as -proxy)</source>
- <translation>برای دستیابی به سرویس مخÙیانه نرم اÙزار تور از پراکسی استÙاده کنید (پیش Ùرض:same as -proxy)</translation>
- </message>
- <message>
<location line="+2"/>
<source>Username for JSON-RPC connections</source>
<translation>JSON-RPC شناسه برای ارتباطات</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+7"/>
<source>Warning</source>
<translation>هشدار</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Warning: This version is obsolete, upgrade required!</source>
<translation>هشدار: این نسخه قدیمی است، روزآمدسازی مورد نیاز است</translation>
</message>
<message>
<location line="+2"/>
+ <source>version</source>
+ <translation>نسخه</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>wallet.dat corrupt, salvage failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-54"/>
+ <location line="-58"/>
<source>Password for JSON-RPC connections</source>
<translation>JSON-RPC عبارت عبور برای ارتباطات</translation>
</message>
@@ -3145,27 +3844,27 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>از آدرس آی پی خاص JSON-RPC قبول ارتباطات</translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<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="-126"/>
+ <location line="-132"/>
<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="+155"/>
+ <location line="+161"/>
<source>Upgrade wallet to latest format</source>
<translation>wallet را به جدیدترین Ùرمت روزآمد کنید</translation>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation> (100پیش Ùرض:)&amp;lt;n&amp;gt; گذاشتن اندازه کلید روی </translation>
</message>
<message>
- <location line="-12"/>
+ <location line="-11"/>
<source>Rescan the block chain for missing wallet transactions</source>
<translation>اسکان مجدد زنجیر بلوکها برای گم والت معامله</translation>
</message>
@@ -3175,7 +3874,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>JSON-RPCبرای ارتباطات استÙاده کنید OpenSSL (https)</translation>
</message>
<message>
- <location line="-29"/>
+ <location line="-30"/>
<source>Server certificate file (default: server.cert)</source>
<translation> (server.certپیش Ùرض: )گواهی نامه سرور</translation>
</message>
@@ -3190,27 +3889,22 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>پیام کمکی</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Unable to bind to %s on this computer (bind returned error %d, %s)</source>
<translation>امکان اتصال به %s از این رایانه وجود ندارد ( bind returned error %d, %s)</translation>
</message>
<message>
- <location line="-95"/>
- <source>Connect through socks proxy</source>
- <translation>اتصال از طریق پراکسی ساکس</translation>
- </message>
- <message>
- <location line="-11"/>
+ <location line="-107"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation>به DNS اجازه بده تا برای addnode ، seednode و اتصال جستجو کند</translation>
</message>
<message>
- <location line="+58"/>
+ <location line="+60"/>
<source>Loading addresses...</source>
<translation>بار گیری آدرس ها</translation>
</message>
<message>
- <location line="-36"/>
+ <location line="-37"/>
<source>Error loading wallet.dat: Wallet corrupted</source>
<translation>خطا در بارگیری wallet.dat: کی٠پول خراب شده است</translation>
</message>
@@ -3230,12 +3924,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>خطا در بارگیری wallet.dat</translation>
</message>
<message>
- <location line="+30"/>
+ <location line="+31"/>
<source>Invalid -proxy address: &apos;%s&apos;</source>
<translation>آدرس پراکسی اشتباه %s</translation>
</message>
<message>
- <location line="+57"/>
+ <location line="+56"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation>شبکه مشخص شده غیرقابل شناسایی در onlynet: &apos;%s&apos;</translation>
</message>
@@ -3245,7 +3939,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>نسخه پراکسی ساکس غیرقابل شناسایی درخواست شده است: %i</translation>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation>آدرس قابل اتصال- شناسایی نیست %s</translation>
</message>
@@ -3255,7 +3949,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>آدرس خارجی قابل اتصال- شناسایی نیست %s</translation>
</message>
<message>
- <location line="+46"/>
+ <location line="+48"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation>میزان وجه اشتباه برای paytxfee=&lt;میزان وجه&gt;: %s</translation>
</message>
@@ -3275,27 +3969,22 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>بار گیری شاخص بلوک</translation>
</message>
<message>
- <location line="-60"/>
+ <location line="-62"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation>به اتصال یک گره اضاÙÙ‡ کنید Ùˆ اتصال را باز نگاه دارید</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-32"/>
<source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source>
<translation>اتصال به %s از این رایانه امکان پذیر نیست. Bitcoin احتمالا در حال اجراست.</translation>
</message>
<message>
- <location line="+69"/>
- <source>Fee per KB to add to transactions you send</source>
- <translation>پر داجت برای هر کیلو بیت برای اضاÙÙ‡ به معامله ارسال</translation>
- </message>
- <message>
- <location line="+20"/>
+ <location line="+95"/>
<source>Loading wallet...</source>
<translation>بار گیری والت</translation>
</message>
<message>
- <location line="-54"/>
+ <location line="-56"/>
<source>Cannot downgrade wallet</source>
<translation>امکان تنزل نسخه در wallet وجود ندارد</translation>
</message>
@@ -3305,7 +3994,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>آدرس پیش Ùرض قابل ذخیره نیست</translation>
</message>
<message>
- <location line="+66"/>
+ <location line="+67"/>
<source>Rescanning...</source>
<translation>اسکان مجدد</translation>
</message>
@@ -3325,7 +4014,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>خطا</translation>
</message>
<message>
- <location line="-33"/>
+ <location line="-35"/>
<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 faf665f8f2..fe547113d9 100644
--- a/src/qt/locale/bitcoin_fa_IR.ts
+++ b/src/qt/locale/bitcoin_fa_IR.ts
@@ -22,13 +22,13 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location filename="../aboutdialog.cpp" line="+19"/>
+ <location filename="../utilitydialog.cpp" line="+29"/>
<source>Copyright</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+0"/>
- <source>The Bitcoin developers</source>
+ <source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
</context>
@@ -146,13 +146,13 @@ This product includes software developed by the OpenSSL Project for use in the O
</message>
<message>
<location line="+13"/>
- <source>Error exporting</source>
- <translation>صدور پیام خطا</translation>
+ <source>Exporting Failed</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation>قابل Ú©Ù¾ÛŒ در Ùایل نیست %1</translation>
+ <location line="+1"/>
+ <source>There was an error trying to save the address list to %1.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -317,22 +317,27 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+260"/>
+ <location filename="../bitcoingui.cpp" line="+295"/>
<source>Sign &amp;message...</source>
<translation>امضا و پیام</translation>
</message>
<message>
- <location line="+290"/>
+ <location line="+335"/>
<source>Synchronizing with network...</source>
<translation>به روز رسانی با شبکه...</translation>
</message>
<message>
- <location line="-360"/>
+ <location line="-407"/>
<source>&amp;Overview</source>
<translation>و بازبینی</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="-137"/>
+ <source>Node</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+138"/>
<source>Show general overview of wallet</source>
<translation>نمای کلی از wallet را نشان بده</translation>
</message>
@@ -347,7 +352,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>تاریخچه تراکنش را باز کن</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>E&amp;xit</source>
<translation>خروج</translation>
</message>
@@ -393,7 +398,22 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>تغییر رمز/پَس ÙرÙیز</translation>
</message>
<message>
- <location line="+295"/>
+ <location line="+10"/>
+ <source>&amp;Sending addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Receiving addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open &amp;URI...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+325"/>
<source>Importing blocks from disk...</source>
<translation type="unfinished"/>
</message>
@@ -403,12 +423,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="-358"/>
+ <location line="-405"/>
<source>Send coins to a Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+47"/>
+ <location line="+49"/>
<source>Modify configuration options for Bitcoin</source>
<translation>اصلاح انتخابها برای پیکربندی Bitcoin</translation>
</message>
@@ -438,18 +458,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+375"/>
+ <location line="+430"/>
<source>Bitcoin</source>
<translation>bitcoin</translation>
</message>
<message>
- <location line="-563"/>
- <location line="+10"/>
+ <location line="-643"/>
<source>Wallet</source>
<translation>کی٠پول</translation>
</message>
<message>
- <location line="+113"/>
+ <location line="+146"/>
<source>&amp;Send</source>
<translation type="unfinished"/>
</message>
@@ -459,7 +478,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+44"/>
+ <location line="+46"/>
<location line="+2"/>
<source>&amp;Show / Hide</source>
<translation>&amp;نمایش/ عدم نمایش و</translation>
@@ -485,86 +504,80 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+39"/>
+ <location line="+48"/>
<source>&amp;File</source>
<translation>Ùˆ Ùایل</translation>
</message>
<message>
- <location line="+11"/>
+ <location line="+14"/>
<source>&amp;Settings</source>
<translation>و تنظیمات</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>&amp;Help</source>
<translation>و راهنما</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+15"/>
<source>Tabs toolbar</source>
<translation>نوار ابزار</translation>
</message>
<message>
- <location line="-244"/>
- <location line="+321"/>
+ <location line="-284"/>
+ <location line="+376"/>
<source>[testnet]</source>
<translation>[testnet]</translation>
</message>
<message>
- <location line="-331"/>
- <location line="+10"/>
+ <location line="-401"/>
<source>Bitcoin Core</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+121"/>
+ <location line="+163"/>
<source>Request payments (generates QR codes and bitcoin: URIs)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+27"/>
+ <location line="+29"/>
<location line="+2"/>
<source>&amp;About Bitcoin Core</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+34"/>
- <source>&amp;Used sending addresses...</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+35"/>
<source>Show the list of used sending addresses and labels</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Used &amp;receiving addresses...</source>
+ <location line="+2"/>
+ <source>Show the list of used receiving addresses and labels</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Show the list of used receiving addresses and labels</source>
+ <location line="+3"/>
+ <source>Open a bitcoin: URI or payment request</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+2"/>
- <source>Open URI...</source>
+ <source>&amp;Command-line options</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
- <source>Open a bitcoin: URI or payment request</source>
+ <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+126"/>
+ <location line="+159"/>
<location line="+5"/>
<source>Bitcoin client</source>
<translation>مشتری bitcoin</translation>
</message>
<message numerus="yes">
- <location line="+133"/>
+ <location line="+142"/>
<source>%n active connection(s) to Bitcoin network</source>
<translation><numerusform>%n ارتباط Ùعال به شبکه Bitcoin
%n ارتباط Ùعال به شبکه Bitcoin</numerusform></translation>
@@ -585,7 +598,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+20"/>
+ <location line="+23"/>
<source>%n hour(s)</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
@@ -605,7 +618,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
+ <location line="+21"/>
<source>Last received block was generated %1 ago.</source>
<translation type="unfinished"/>
</message>
@@ -630,27 +643,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+77"/>
- <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="-152"/>
+ <location line="-85"/>
<source>Up to date</source>
<translation>روزآمد</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Catching up...</source>
<translation>در حال روزآمد سازی..</translation>
</message>
<message>
- <location line="+124"/>
- <source>Confirm transaction fee</source>
- <translation>تایید هزینه تراکنش</translation>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+130"/>
<source>Sent transaction</source>
<translation>ارسال تراکنش</translation>
</message>
@@ -670,7 +673,7 @@ Address: %4
</translation>
</message>
<message>
- <location line="+67"/>
+ <location line="+69"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation>wallet رمزگذاری شد Ùˆ در حال حاضر از حالت Ù‚ÙÙ„ در آمده است</translation>
</message>
@@ -680,7 +683,7 @@ Address: %4
<translation>wallet رمزگذاری شد Ùˆ در حال حاضر Ù‚ÙÙ„ است</translation>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+116"/>
+ <location filename="../bitcoin.cpp" line="+438"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation type="unfinished"/>
</message>
@@ -902,7 +905,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+171"/>
+ <location line="+31"/>
+ <source>none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+140"/>
<source>Dust</source>
<translation type="unfinished"/>
</message>
@@ -939,7 +947,7 @@ Address: %4
</message>
<message>
<location line="+1"/>
- <source>This label turns red, if the priority is smaller than &quot;medium&quot;</source>
+ <source>This label turns red, if the priority is smaller than &quot;medium&quot;.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1008,7 +1016,7 @@ Address: %4
<translation>حساب&amp;</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+25"/>
+ <location filename="../editaddressdialog.cpp" line="+28"/>
<source>New receiving address</source>
<translation>حساب دریاÙت کننده جدید
</translation>
@@ -1078,20 +1086,24 @@ Address: %4
</message>
</context>
<context>
- <name>GUIUtil::HelpMessageBox</name>
+ <name>HelpMessageDialog</name>
<message>
- <location filename="../guiutil.cpp" line="+597"/>
- <source>version</source>
- <translation>نسخه</translation>
+ <location filename="../forms/helpmessagedialog.ui" line="+19"/>
+ <source>Bitcoin Core - Command-line options</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <location line="+13"/>
+ <location filename="../utilitydialog.cpp" line="+38"/>
<source>Bitcoin Core</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-11"/>
+ <location line="+0"/>
+ <source>version</source>
+ <translation>نسخه</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Usage:</source>
<translation>میزان استÙاده:</translation>
</message>
@@ -1220,7 +1232,7 @@ Address: %4
<translation>انتخاب/آپشن</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+13"/>
<source>&amp;Main</source>
<translation type="unfinished"/>
</message>
@@ -1245,57 +1257,87 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+35"/>
- <source>Reset all client options to default.</source>
+ <location line="+9"/>
+ <source>Size of &amp;database cache</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>&amp;Reset Options</source>
+ <location line="+13"/>
+ <source>Set database cache size in megabytes (default: 25)</source>
+ <translation>حاÙظه بانک داده را به مگابایت تنظیم کنید (پیش Ùرض: 25)</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>MB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Number of script &amp;verification threads</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+13"/>
- <source>&amp;Network</source>
+ <source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</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>
+ <location line="+58"/>
+ <source>Connect to the Bitcoin network through a SOCKS proxy.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
- <source>Map port using &amp;UPnP</source>
+ <source>&amp;Connect through SOCKS proxy (default proxy):</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>
+ <location line="+34"/>
+ <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+224"/>
+ <source>Active command-line options that override above options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
+ <source>Reset all client options to default.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
- <source>&amp;Connect through SOCKS proxy:</source>
+ <source>&amp;Reset Options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+9"/>
- <source>Proxy &amp;IP:</source>
+ <location line="-323"/>
+ <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="+19"/>
- <source>IP address of the proxy (e.g. 127.0.0.1)</source>
+ <source>Proxy &amp;IP:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="+32"/>
<source>&amp;Port:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+19"/>
+ <location line="+25"/>
<source>Port of the proxy (e.g. 9050)</source>
<translation type="unfinished"/>
</message>
@@ -1380,7 +1422,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+71"/>
+ <location line="+136"/>
<source>&amp;OK</source>
<translation>و تایید</translation>
</message>
@@ -1390,44 +1432,38 @@ Address: %4
<translation>و رد</translation>
</message>
<message>
- <location line="+10"/>
- <source>&amp;Apply</source>
- <translation>Ùˆ به کار گرÙتن</translation>
- </message>
- <message>
- <location filename="../optionsdialog.cpp" line="+63"/>
+ <location filename="../optionsdialog.cpp" line="+67"/>
<source>default</source>
<translation>پیش Ùرض</translation>
</message>
<message>
- <location line="+131"/>
- <source>Confirm options reset</source>
+ <location line="+57"/>
+ <source>none</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Some settings may require a client restart to take effect.</source>
+ <location line="+75"/>
+ <source>Confirm options reset</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>Do you want to proceed?</source>
+ <location line="+1"/>
+ <location line="+29"/>
+ <source>Client restart required to activate changes.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
- <location line="+9"/>
- <source>Warning</source>
+ <location line="-29"/>
+ <source>Client will be shutdown, do you want to proceed?</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-9"/>
- <location line="+9"/>
- <source>This setting will take effect after restarting Bitcoin.</source>
+ <location line="+33"/>
+ <source>This change would require a client restart.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+29"/>
+ <location line="+34"/>
<source>The supplied proxy address is invalid.</source>
<translation type="unfinished"/>
</message>
@@ -1441,22 +1477,22 @@ Address: %4
</message>
<message>
<location line="+50"/>
- <location line="+214"/>
+ <location line="+231"/>
<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="-140"/>
+ <location line="-155"/>
<source>Unconfirmed:</source>
<translation>تایید نشده</translation>
</message>
<message>
- <location line="-81"/>
+ <location line="-83"/>
<source>Wallet</source>
<translation>کی٠پول</translation>
</message>
<message>
- <location line="+49"/>
+ <location line="+51"/>
<source>Confirmed:</source>
<translation type="unfinished"/>
</message>
@@ -1491,7 +1527,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+56"/>
+ <location line="+71"/>
<source>&lt;b&gt;Recent transactions&lt;/b&gt;</source>
<translation>تراکنشهای اخیر</translation>
</message>
@@ -1505,7 +1541,8 @@ Address: %4
<context>
<name>PaymentServer</name>
<message>
- <location filename="../paymentserver.cpp" line="+397"/>
+ <location filename="../paymentserver.cpp" line="+403"/>
+ <location line="+13"/>
<source>URI handling</source>
<translation type="unfinished"/>
</message>
@@ -1515,24 +1552,52 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+91"/>
+ <location line="+96"/>
<source>Requested payment amount of %1 is too small (considered dust).</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-204"/>
- <location line="+195"/>
+ <location line="-221"/>
+ <location line="+212"/>
<location line="+13"/>
+ <location line="+95"/>
+ <location line="+18"/>
+ <location line="+16"/>
<source>Payment request error</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-207"/>
+ <location line="-353"/>
<source>Cannot start bitcoin: click-to-pay handler</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+195"/>
+ <location line="+58"/>
+ <source>Net manager warning</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Your active proxy doesn&apos;t support SOCKS5, which is required for payment requests via proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>Payment request fetch URL is invalid: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Payment request file handling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Payment request file can not be read or processed! This can be caused by an invalid payment request file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+73"/>
<source>Unverified payment requests to custom payment scripts are unsupported.</source>
<translation type="unfinished"/>
</message>
@@ -1542,24 +1607,27 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
+ <location line="+43"/>
<source>Error communicating with %1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+28"/>
+ <location line="+24"/>
+ <source>Payment request can not be parsed or processed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
<source>Bad response from server %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+32"/>
+ <location line="+33"/>
<source>Payment acknowledged</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-55"/>
- <location line="+27"/>
- <location line="+17"/>
+ <location line="-11"/>
<source>Network request error</source>
<translation type="unfinished"/>
</message>
@@ -1567,18 +1635,18 @@ Address: %4
<context>
<name>QObject</name>
<message>
- <location filename="../bitcoin.cpp" line="+119"/>
- <location line="+5"/>
+ <location filename="../bitcoin.cpp" line="+71"/>
+ <location line="+11"/>
<source>Bitcoin</source>
<translation>bitcoin</translation>
</message>
<message>
- <location line="-4"/>
+ <location line="+1"/>
<source>Error: Specified data directory &quot;%1&quot; does not exist.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="-12"/>
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation type="unfinished"/>
</message>
@@ -1620,15 +1688,16 @@ Address: %4
<location line="+23"/>
<location line="+23"/>
<location line="+36"/>
- <location line="+53"/>
+ <location line="+23"/>
+ <location line="+36"/>
<location line="+23"/>
<location line="+23"/>
- <location filename="../rpcconsole.cpp" line="+360"/>
+ <location filename="../rpcconsole.cpp" line="+359"/>
<source>N/A</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-217"/>
+ <location line="-223"/>
<source>Client version</source>
<translation>ویرایش کنسول RPC</translation>
</message>
@@ -1643,7 +1712,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+78"/>
+ <location line="+25"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+53"/>
<source>Using OpenSSL version</source>
<translation type="unfinished"/>
</message>
@@ -1659,16 +1733,16 @@ Address: %4
</message>
<message>
<location line="+7"/>
- <source>Number of connections</source>
- <translation>تعداد اتصال</translation>
+ <source>Name</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+23"/>
- <source>On testnet</source>
- <translation type="unfinished"/>
+ <source>Number of connections</source>
+ <translation>تعداد اتصال</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+29"/>
<source>Block chain</source>
<translation>زنجیره مجموعه تراکنش ها</translation>
</message>
@@ -1693,16 +1767,6 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
- <source>Command-line options</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+10"/>
- <source>&amp;Show</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location line="+24"/>
<source>&amp;Console</source>
<translation type="unfinished"/>
@@ -1733,17 +1797,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-541"/>
+ <location line="-521"/>
<source>Build date</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-79"/>
- <source>Bitcoin Core</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+279"/>
+ <location line="+206"/>
<source>Debug log file</source>
<translation type="unfinished"/>
</message>
@@ -1753,11 +1812,6 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+26"/>
- <source>Show the Bitcoin-Core help message to get a list with possible Bitcoin command-line options.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location line="+76"/>
<source>Clear console</source>
<translation type="unfinished"/>
@@ -1778,7 +1832,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+128"/>
+ <location line="+122"/>
<source>%1 B</source>
<translation type="unfinished"/>
</message>
@@ -1821,12 +1875,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+19"/>
- <source>The amount to request</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="-32"/>
+ <location line="-13"/>
<source>&amp;Label:</source>
<translation>و برچسب</translation>
</message>
@@ -1836,12 +1885,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+20"/>
- <source>The message to attach to payment request</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="-37"/>
+ <location line="-17"/>
<source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
@@ -1852,16 +1896,26 @@ Address: %4
</message>
<message>
<location line="+27"/>
- <source>The label to associate with the new receiving address</source>
+ <source>An optional label to associate with the new receiving address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
- <source>Use this form to request payments. All fields are optional.</source>
+ <location line="+7"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+56"/>
+ <location line="+7"/>
+ <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+39"/>
+ <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+17"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"/>
</message>
@@ -1877,11 +1931,11 @@ Address: %4
</message>
<message>
<location line="+47"/>
- <source>Previously requested payments</source>
+ <source>Requested payments</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+12"/>
+ <location line="+16"/>
<source>Show the selected request (does the same as double clicking an entry)</source>
<translation type="unfinished"/>
</message>
@@ -1972,7 +2026,7 @@ Address: %4
<context>
<name>RecentRequestsTableModel</name>
<message>
- <location filename="../recentrequeststablemodel.cpp" line="+14"/>
+ <location filename="../recentrequeststablemodel.cpp" line="+24"/>
<source>Date</source>
<translation>تاریخ</translation>
</message>
@@ -1992,7 +2046,7 @@ Address: %4
<translation>میزان</translation>
</message>
<message>
- <location line="+36"/>
+ <location line="+38"/>
<source>(no label)</source>
<translation>(برچسب ندارد)</translation>
</message>
@@ -2007,7 +2061,7 @@ Address: %4
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
<location filename="../sendcoinsdialog.cpp" line="+381"/>
- <location line="+81"/>
+ <location line="+80"/>
<source>Send Coins</source>
<translation>سکه های ارسالی</translation>
</message>
@@ -2117,7 +2171,7 @@ Address: %4
<translation>و ارسال</translation>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-229"/>
+ <location filename="../sendcoinsdialog.cpp" line="-228"/>
<source>Confirm send coins</source>
<translation>تایید ارسال بیت کوین ها</translation>
</message>
@@ -2220,22 +2274,22 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+113"/>
+ <location line="+112"/>
<source>Warning: Invalid Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+21"/>
<source>(no label)</source>
<translation>(برچسب ندارد)</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="-11"/>
<source>Warning: Unknown change address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-378"/>
+ <location line="-366"/>
<source>Are you sure you want to send?</source>
<translation type="unfinished"/>
</message>
@@ -2259,13 +2313,13 @@ Address: %4
<name>SendCoinsEntry</name>
<message>
<location filename="../forms/sendcoinsentry.ui" line="+131"/>
- <location line="+501"/>
+ <location line="+521"/>
<location line="+536"/>
<source>A&amp;mount:</source>
<translation>و میزان وجه</translation>
</message>
<message>
- <location line="-1132"/>
+ <location line="-1152"/>
<source>Pay &amp;To:</source>
<translation>پرداخت و به چه کسی</translation>
</message>
@@ -2311,23 +2365,33 @@ Address: %4
</message>
<message>
<location line="+7"/>
- <location line="+504"/>
+ <location line="+524"/>
<location line="+536"/>
<source>Remove this entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-40"/>
+ <location line="-1008"/>
+ <source>Message:</source>
+ <translation>پیام:</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+958"/>
<source>This is a verified payment request.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-971"/>
+ <location line="-991"/>
<source>Enter a label for this address to add it to the list of used addresses</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+439"/>
+ <location line="+459"/>
<source>This is an unverified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2350,6 +2414,19 @@ Address: %4
</message>
</context>
<context>
+ <name>ShutdownWindow</name>
+ <message>
+ <location filename="../utilitydialog.cpp" line="+48"/>
+ <source>Bitcoin Core is shutting down...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Do not shut down the computer until this window disappears.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>SignVerifyMessageDialog</name>
<message>
<location filename="../forms/signverifymessagedialog.ui" line="+14"/>
@@ -2357,7 +2434,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+10"/>
<source>&amp;Sign Message</source>
<translation>و امضای پیام </translation>
</message>
@@ -2545,7 +2622,7 @@ Address: %4
<context>
<name>SplashScreen</name>
<message>
- <location filename="../splashscreen.cpp" line="+26"/>
+ <location filename="../splashscreen.cpp" line="+28"/>
<source>Bitcoin Core</source>
<translation type="unfinished"/>
</message>
@@ -2644,12 +2721,12 @@ Address: %4
<location line="+12"/>
<location line="+45"/>
<location line="+17"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Credit</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="-120"/>
+ <location line="-125"/>
<source>matures in %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
@@ -2662,12 +2739,12 @@ Address: %4
<location line="+44"/>
<location line="+8"/>
<location line="+15"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Debit</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-57"/>
+ <location line="-62"/>
<source>Transaction fee</source>
<translation type="unfinished"/>
</message>
@@ -2678,11 +2755,12 @@ Address: %4
</message>
<message>
<location line="+6"/>
+ <location line="+9"/>
<source>Message</source>
<translation>پیام</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="-7"/>
<source>Comment</source>
<translation type="unfinished"/>
</message>
@@ -2692,7 +2770,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+18"/>
<source>Merchant</source>
<translation type="unfinished"/>
</message>
@@ -2732,7 +2810,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-227"/>
+ <location line="-232"/>
<source>, has not been successfully broadcast yet</source>
<translation>ØŒ هنوز با موÙقیت ارسال نگردیده است</translation>
</message>
@@ -2782,8 +2860,13 @@ Address: %4
<source>Amount</source>
<translation>میزان وجه</translation>
</message>
+ <message>
+ <location line="+59"/>
+ <source>Immature (%1 confirmations, will be available after %2)</source>
+ <translation type="unfinished"/>
+ </message>
<message numerus="yes">
- <location line="+57"/>
+ <location line="+16"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
@@ -2803,17 +2886,13 @@ Address: %4
<translation>تایید نشده (%1 از %2 تاییدها)</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="-22"/>
+ <location line="+25"/>
<source>Confirmed (%1 confirmations)</source>
<translation>تایید شده (%1 تاییدها)</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></translation>
- </message>
<message>
- <location line="+5"/>
+ <location line="-22"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation>این block توسط گره های دیگری دریاÙت نشده است Ùˆ ممکن است قبول نشود</translation>
</message>
@@ -2823,7 +2902,7 @@ Address: %4
<translation>تولید شده اما قبول نشده است</translation>
</message>
<message>
- <location line="+43"/>
+ <location line="+62"/>
<source>Received with</source>
<translation>قبول با </translation>
</message>
@@ -3119,7 +3198,7 @@ Address: %4
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+217"/>
+ <location filename="../bitcoinstrings.cpp" line="+221"/>
<source>Usage:</source>
<translation>میزان استÙاده:</translation>
</message>
@@ -3139,7 +3218,7 @@ Address: %4
<translation>انتخابها:</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+22"/>
<source>Specify configuration file (default: bitcoin.conf)</source>
<translation>Ùایل پیکربندی٠را مشخص کنید (پیش Ùرض: bitcoin.conf)</translation>
</message>
@@ -3159,7 +3238,7 @@ Address: %4
<translation>حاÙظه بانک داده را به مگابایت تنظیم کنید (پیش Ùرض: 25)</translation>
</message>
<message>
- <location line="-27"/>
+ <location line="-26"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
<translation>ارتباطات را در &lt;PORT&gt; بشنوید (پیش Ùرض: 8333 or testnet: 18333)</translation>
</message>
@@ -3169,7 +3248,7 @@ Address: %4
<translation>نگهداری &lt;N&gt; ارتباطات برای قرینه سازی (پیش Ùرض:125)</translation>
</message>
<message>
- <location line="-50"/>
+ <location line="-51"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation type="unfinished"/>
</message>
@@ -3179,22 +3258,22 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation>آستانه قطع برای قرینه سازی اشتباه (پیش Ùرض:100)</translation>
</message>
<message>
- <location line="-147"/>
+ <location line="-148"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation>تعداد ثانیه ها برای اتصال دوباره قرینه های اشتباه (پیش Ùرض:86400)</translation>
</message>
<message>
- <location line="-33"/>
+ <location line="-36"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<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>
@@ -3204,7 +3283,7 @@ Address: %4
<translation>command line و JSON-RPC commands را قبول کنید</translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>به عنوان daemon بک گراند را اجرا کنید و دستورات را قبول نمایید</translation>
</message>
@@ -3214,12 +3293,12 @@ Address: %4
<translation>از تست٠شبکه استÙاده نمایید</translation>
</message>
<message>
- <location line="-117"/>
+ <location line="-118"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-92"/>
+ <location line="-95"/>
<source>%s, you must set a rpcpassword in the configuration file:
%s
It is recommended you use the following random password:
@@ -3260,6 +3339,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+4"/>
+ <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</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>
@@ -3365,6 +3449,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+1"/>
+ <source>Do not load the wallet and disable wallet RPC calls</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Do you want to rebuild the block database now?</source>
<translation type="unfinished"/>
</message>
@@ -3529,7 +3618,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+8"/>
+ <location line="+7"/>
<source>Set maximum block size in bytes (default: %d)</source>
<translation type="unfinished"/>
</message>
@@ -3549,7 +3638,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+12"/>
+ <location line="+3"/>
+ <source>This is intended for regression testing tools and app development.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Usage (deprecated, use bitcoin-cli):</source>
<translation type="unfinished"/>
</message>
@@ -3574,7 +3668,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
+ <location line="+2"/>
+ <source>Wallet options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source>
<translation type="unfinished"/>
</message>
@@ -3584,12 +3683,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-78"/>
+ <location line="-79"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-104"/>
+ <location line="-105"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
@@ -3609,7 +3708,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+88"/>
+ <location line="+89"/>
<source>Information</source>
<translation type="unfinished"/>
</message>
@@ -3659,11 +3758,6 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>ارسال اطلاعات پیگیری/خطایابی به کنسول به جای ارسال به Ùایل debug.log</translation>
</message>
<message>
- <location line="+1"/>
- <source>Send trace/debug info to debugger</source>
- <translation>ارسال اطاعات خطایابی/پیگیری به سیستم خطایاب</translation>
- </message>
- <message>
<location line="+6"/>
<source>Set minimum block size in bytes (default: 0)</source>
<translation type="unfinished"/>
@@ -3689,7 +3783,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Transaction amount too small</source>
<translation type="unfinished"/>
</message>
@@ -3719,7 +3813,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>شناسه کاربری برای ارتباطات٠JSON-RPC</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Warning</source>
<translation type="unfinished"/>
</message>
@@ -3739,37 +3833,37 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-57"/>
+ <location line="-58"/>
<source>Password for JSON-RPC connections</source>
<translation>رمز برای ارتباطات٠JSON-RPC</translation>
</message>
<message>
- <location line="-69"/>
+ <location line="-70"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation>ارتباطات٠JSON-RPC را از آدرس آی.پی. مشخصی برقرار کنید.</translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<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="-131"/>
+ <location line="-132"/>
<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="+160"/>
+ <location line="+161"/>
<source>Upgrade wallet to latest format</source>
<translation>wallet را به جدیدترین نسخه روزآمد کنید</translation>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation>حجم key pool را به اندازه &lt;n&gt; تنظیم کنید (پیش Ùرض:100)</translation>
</message>
<message>
- <location line="-12"/>
+ <location line="-11"/>
<source>Rescan the block chain for missing wallet transactions</source>
<translation>زنجیره بلاک را برای تراکنش جا اÙتاده در WALLET دوباره اسکن کنید</translation>
</message>
@@ -3779,7 +3873,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>برای ارتباطات٠JSON-RPC از OpenSSL (https) استÙاده کنید</translation>
</message>
<message>
- <location line="-29"/>
+ <location line="-30"/>
<source>Server certificate file (default: server.cert)</source>
<translation>Ùایل certificate سرور (پیش Ùرض server.cert)</translation>
</message>
@@ -3794,17 +3888,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>این پیام راهنما</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Unable to bind to %s on this computer (bind returned error %d, %s)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-106"/>
+ <location line="-107"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+59"/>
+ <location line="+60"/>
<source>Loading addresses...</source>
<translation>لود شدن آدرسها..</translation>
</message>
@@ -3844,7 +3938,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3854,7 +3948,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+47"/>
+ <location line="+48"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation>میزان اشتباه است for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</translation>
</message>
@@ -3874,7 +3968,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>لود شدن نمایه بلاکها..</translation>
</message>
<message>
- <location line="-61"/>
+ <location line="-62"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation>یک گره برای اتصال اضاÙÙ‡ کنید Ùˆ تلاش کنید تا اتصال را باز نگاه دارید</translation>
</message>
@@ -3884,12 +3978,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+94"/>
+ <location line="+95"/>
<source>Loading wallet...</source>
<translation>wallet در حال لود شدن است...</translation>
</message>
<message>
- <location line="-55"/>
+ <location line="-56"/>
<source>Cannot downgrade wallet</source>
<translation>قابلیت برگشت به نسخه قبلی برای wallet امکان پذیر نیست</translation>
</message>
@@ -3899,7 +3993,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>آدرس پیش Ùرض قابل ذخیره نیست</translation>
</message>
<message>
- <location line="+66"/>
+ <location line="+67"/>
<source>Rescanning...</source>
<translation>اسکن٠دوباره...</translation>
</message>
@@ -3919,7 +4013,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>خطا</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-35"/>
<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 82fa3a8353..2006db509d 100644
--- a/src/qt/locale/bitcoin_fi.ts
+++ b/src/qt/locale/bitcoin_fi.ts
@@ -3,13 +3,13 @@
<name>AboutDialog</name>
<message>
<location filename="../forms/aboutdialog.ui" line="+14"/>
- <source>About Bitcoin</source>
- <translation>Tietoa Bitcoinista</translation>
+ <source>About Bitcoin Core</source>
+ <translation type="unfinished"/>
</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>
+ <source>&lt;b&gt;Bitcoin Core&lt;/b&gt; version</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+57"/>
@@ -28,14 +28,14 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o
</translation>
</message>
<message>
- <location filename="../aboutdialog.cpp" line="+14"/>
+ <location filename="../utilitydialog.cpp" line="+29"/>
<source>Copyright</source>
<translation>Tekijänoikeus</translation>
</message>
<message>
<location line="+0"/>
- <source>The Bitcoin developers</source>
- <translation>Bitcoin kehittäjät</translation>
+ <source>The Bitcoin Core developers</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -71,7 +71,7 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o
<translation type="unfinished"/>
</message>
<message>
- <location filename="../addressbookpage.cpp" line="+72"/>
+ <location filename="../addressbookpage.cpp" line="+74"/>
<source>&amp;Copy Address</source>
<translation>&amp;Kopioi Osoite</translation>
</message>
@@ -141,7 +141,7 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o
<translation>&amp;Muokkaa</translation>
</message>
<message>
- <location line="+197"/>
+ <location line="+194"/>
<source>Export Address List</source>
<translation type="unfinished"/>
</message>
@@ -152,19 +152,19 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o
</message>
<message>
<location line="+13"/>
- <source>Error exporting</source>
- <translation>Virhe viedessä osoitekirjaa</translation>
+ <source>Exporting Failed</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation>Ei voida kirjoittaa tiedostoon %1.</translation>
+ <location line="+1"/>
+ <source>There was an error trying to save the address list to %1.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<name>AddressTableModel</name>
<message>
- <location filename="../addresstablemodel.cpp" line="+164"/>
+ <location filename="../addresstablemodel.cpp" line="+168"/>
<source>Label</source>
<translation>Nimi</translation>
</message>
@@ -202,7 +202,7 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o
<translation>Kiroita uusi tunnuslause uudelleen</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="+34"/>
+ <location filename="../askpassphrasedialog.cpp" line="+40"/>
<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>Anna lompakolle uusi tunnuslause.&lt;br/&gt;Käytä tunnuslausetta, jossa on ainakin &lt;b&gt;10 satunnaista mekkiä&lt;/b&gt; tai &lt;b&gt;kahdeksan sanaa&lt;/b&gt;.</translation>
</message>
@@ -323,22 +323,27 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+250"/>
+ <location filename="../bitcoingui.cpp" line="+295"/>
<source>Sign &amp;message...</source>
<translation>&amp;Allekirjoita viesti...</translation>
</message>
<message>
- <location line="+254"/>
+ <location line="+335"/>
<source>Synchronizing with network...</source>
<translation>Synkronoidaan verkon kanssa...</translation>
</message>
<message>
- <location line="-324"/>
+ <location line="-407"/>
<source>&amp;Overview</source>
<translation>&amp;Yleisnäkymä</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="-137"/>
+ <source>Node</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+138"/>
<source>Show general overview of wallet</source>
<translation>Lompakon tilanteen yleiskatsaus</translation>
</message>
@@ -353,7 +358,7 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o
<translation>Selaa rahansiirtohistoriaa</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>E&amp;xit</source>
<translation>L&amp;opeta</translation>
</message>
@@ -399,7 +404,22 @@ 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="+10"/>
+ <source>&amp;Sending addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Receiving addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open &amp;URI...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+325"/>
<source>Importing blocks from disk...</source>
<translation>Tuodaan lohkoja levyltä</translation>
</message>
@@ -409,12 +429,12 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o
<translation>Ladataan lohkoindeksiä...</translation>
</message>
<message>
- <location line="-322"/>
+ <location line="-405"/>
<source>Send coins to a Bitcoin address</source>
<translation>Lähetä kolikoita Bitcoin-osoitteeseen</translation>
</message>
<message>
- <location line="+47"/>
+ <location line="+49"/>
<source>Modify configuration options for Bitcoin</source>
<translation>Muuta Bitcoinin konfiguraatioasetuksia</translation>
</message>
@@ -444,20 +464,17 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o
<translation>Varmista &amp;viesti...</translation>
</message>
<message>
- <location line="-180"/>
- <location line="+6"/>
- <location line="+513"/>
+ <location line="+430"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-519"/>
- <location line="+6"/>
+ <location line="-643"/>
<source>Wallet</source>
<translation>Lompakko</translation>
</message>
<message>
- <location line="+109"/>
+ <location line="+146"/>
<source>&amp;Send</source>
<translation>&amp;Lähetä</translation>
</message>
@@ -467,13 +484,7 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o
<translation>&amp;Vastaanota</translation>
</message>
<message>
- <location line="+28"/>
- <location line="+2"/>
- <source>&amp;About Bitcoin</source>
- <translation>&amp;Tietoa Bitcoinista</translation>
- </message>
- <message>
- <location line="+14"/>
+ <location line="+46"/>
<location line="+2"/>
<source>&amp;Show / Hide</source>
<translation>&amp;Näytä / Piilota</translation>
@@ -499,64 +510,80 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o
<translation>Varmista, että viestisi on allekirjoitettu määritetyllä Bitcoin -osoitteella</translation>
</message>
<message>
- <location line="+35"/>
+ <location line="+48"/>
<source>&amp;File</source>
<translation>&amp;Tiedosto</translation>
</message>
<message>
- <location line="+10"/>
+ <location line="+14"/>
<source>&amp;Settings</source>
<translation>&amp;Asetukset</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>&amp;Help</source>
<translation>&amp;Apua</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+15"/>
<source>Tabs toolbar</source>
<translation>Välilehtipalkki</translation>
</message>
<message>
- <location line="-235"/>
- <location line="+294"/>
+ <location line="-284"/>
+ <location line="+376"/>
<source>[testnet]</source>
<translation>[testnet]</translation>
</message>
<message>
- <location line="-177"/>
+ <location line="-401"/>
+ <source>Bitcoin Core</source>
+ <translation>Bitcoin-ydin</translation>
+ </message>
+ <message>
+ <location line="+163"/>
<source>Request payments (generates QR codes and bitcoin: URIs)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+63"/>
- <source>&amp;Used sending addresses...</source>
+ <location line="+29"/>
+ <location line="+2"/>
+ <source>&amp;About Bitcoin Core</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="+35"/>
<source>Show the list of used sending addresses and labels</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Used &amp;receiving addresses...</source>
+ <location line="+2"/>
+ <source>Show the list of used receiving addresses and labels</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open a bitcoin: URI or payment request</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Command-line options</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
- <source>Show the list of used receiving addresses and labels</source>
+ <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+106"/>
+ <location line="+159"/>
<location line="+5"/>
<source>Bitcoin client</source>
<translation>Bitcoin-asiakas</translation>
</message>
<message numerus="yes">
- <location line="+120"/>
+ <location line="+142"/>
<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>
@@ -576,7 +603,7 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o
<translation>Käsitelty %1 lohkoa rahansiirtohistoriasta</translation>
</message>
<message numerus="yes">
- <location line="+20"/>
+ <location line="+23"/>
<source>%n hour(s)</source>
<translation><numerusform>%n tunti</numerusform><numerusform>%n tuntia</numerusform></translation>
</message>
@@ -596,7 +623,7 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
+ <location line="+21"/>
<source>Last received block was generated %1 ago.</source>
<translation>Viimeisin vastaanotettu lohko tuotettu %1.</translation>
</message>
@@ -621,27 +648,17 @@ Tämä ohjelma sisältää OpenSSL projektin OpenSSL työkalupakin (http://www.o
<translation>Tietoa</translation>
</message>
<message>
- <location line="+77"/>
- <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>Tämä rahansiirto ylittää kokorajoituksen. Voit siitä huolimatta lähettää sen maksamalla %1 siirtopalkkion, joka menee solmuille jotka käsittelevät rahansiirtosi ja auttaa näin verkon ylläpitoa. Haluatko maksaa siirtopalkkion?</translation>
- </message>
- <message>
- <location line="-152"/>
+ <location line="-85"/>
<source>Up to date</source>
<translation>Rahansiirtohistoria on ajan tasalla</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Catching up...</source>
<translation>Saavutetaan verkkoa...</translation>
</message>
<message>
- <location line="+124"/>
- <source>Confirm transaction fee</source>
- <translation>Vahvista maksukulu</translation>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+130"/>
<source>Sent transaction</source>
<translation>Lähetetyt rahansiirrot</translation>
</message>
@@ -663,17 +680,7 @@ Tyyppi: %3
Osoite: %4</translation>
</message>
<message>
- <location line="+34"/>
- <source>URI handling</source>
- <translation>URI käsittely</translation>
- </message>
- <message>
- <location line="+0"/>
- <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>
- <message>
- <location line="+45"/>
+ <location line="+69"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation>Lompakko on &lt;b&gt;salattu&lt;/b&gt; ja tällä hetkellä &lt;b&gt;avoinna&lt;/b&gt;</translation>
</message>
@@ -683,7 +690,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 filename="../bitcoin.cpp" line="+110"/>
+ <location filename="../bitcoin.cpp" line="+438"/>
<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>
@@ -691,12 +698,304 @@ Osoite: %4</translation>
<context>
<name>ClientModel</name>
<message>
- <location filename="../clientmodel.cpp" line="+115"/>
+ <location filename="../clientmodel.cpp" line="+119"/>
<source>Network Alert</source>
<translation>Verkkohälytys</translation>
</message>
</context>
<context>
+ <name>CoinControlDialog</name>
+ <message>
+ <location filename="../forms/coincontroldialog.ui" line="+14"/>
+ <source>Coin Control Address Selection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>Quantity:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Bytes:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>Amount:</source>
+ <translation>Määrä:</translation>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Priority:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Low Output:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>After Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Change:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+63"/>
+ <source>(un)select all</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Tree mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>List mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>Amount</source>
+ <translation>Määrä</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Address</source>
+ <translation>Osoite</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Date</source>
+ <translation>Aika</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Confirmations</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Confirmed</source>
+ <translation>Vahvistettu</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../coincontroldialog.cpp" line="+42"/>
+ <source>Copy address</source>
+ <translation>Kopioi osoite</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy label</source>
+ <translation>Kopioi nimi</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+26"/>
+ <source>Copy amount</source>
+ <translation>Kopioi määrä</translation>
+ </message>
+ <message>
+ <location line="-25"/>
+ <source>Copy transaction ID</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Lock unspent</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Unlock unspent</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+22"/>
+ <source>Copy quantity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Copy fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy after fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy bytes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy low output</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy change</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+323"/>
+ <source>highest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>higher</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>high</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>medium-high</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>medium</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>low-medium</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>low</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>lower</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>lowest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>(%1 locked)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+140"/>
+ <source>Dust</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>yes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>no</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>This label turns red, if the transaction size is greater than 1000 bytes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+5"/>
+ <source>This means a fee of at least %1 per kB is required.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-4"/>
+ <source>Can vary +/- 1 byte per input.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Transactions with higher priority are more likely to get included into a block.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>This label turns red, if the priority is smaller than &quot;medium&quot;.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>This label turns red, if any recipient receives an amount smaller than %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+4"/>
+ <source>This means a fee of at least %1 is required.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-3"/>
+ <source>Amounts below 0.546 times the minimum relay fee are shown as dust.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>This label turns red, if the change is smaller than %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
+ <location line="+66"/>
+ <source>(no label)</source>
+ <translation>(ei nimeä)</translation>
+ </message>
+ <message>
+ <location line="-9"/>
+ <source>change from %1 (%2)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>(change)</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>EditAddressDialog</name>
<message>
<location filename="../forms/editaddressdialog.ui" line="+14"/>
@@ -724,7 +1023,7 @@ Osoite: %4</translation>
<translation>&amp;Osoite</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+21"/>
+ <location filename="../editaddressdialog.cpp" line="+28"/>
<source>New receiving address</source>
<translation>Uusi vastaanottava osoite</translation>
</message>
@@ -767,7 +1066,7 @@ Osoite: %4</translation>
<context>
<name>FreespaceChecker</name>
<message>
- <location filename="../intro.cpp" line="+61"/>
+ <location filename="../intro.cpp" line="+65"/>
<source>A new data directory will be created.</source>
<translation>Luodaan uusi kansio.</translation>
</message>
@@ -793,15 +1092,19 @@ Osoite: %4</translation>
</message>
</context>
<context>
- <name>GUIUtil::HelpMessageBox</name>
+ <name>HelpMessageDialog</name>
<message>
- <location filename="../guiutil.cpp" line="+558"/>
- <location line="+13"/>
- <source>Bitcoin-Qt</source>
- <translation>Bitcoin-Qt</translation>
+ <location filename="../forms/helpmessagedialog.ui" line="+19"/>
+ <source>Bitcoin Core - Command-line options</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="-13"/>
+ <location filename="../utilitydialog.cpp" line="+38"/>
+ <source>Bitcoin Core</source>
+ <translation>Bitcoin-ydin</translation>
+ </message>
+ <message>
+ <location line="+0"/>
<source>version</source>
<translation>versio</translation>
</message>
@@ -850,17 +1153,17 @@ Osoite: %4</translation>
</message>
<message>
<location line="+9"/>
- <source>Welcome to Bitcoin-Qt.</source>
+ <source>Welcome to Bitcoin Core.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+26"/>
- <source>As this is the first time the program is launched, you can choose where Bitcoin-Qt will store its data.</source>
+ <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+10"/>
- <source>Bitcoin-Qt will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
+ <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -874,7 +1177,17 @@ Osoite: %4</translation>
<translation>Määritä oma kansio:</translation>
</message>
<message>
- <location filename="../intro.cpp" line="+105"/>
+ <location filename="../intro.cpp" line="+85"/>
+ <source>Bitcoin</source>
+ <translation>Bitcoin</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error: Specified data directory &quot;%1&quot; can not be created.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+19"/>
<source>Error</source>
<translation>Virhe</translation>
</message>
@@ -890,6 +1203,34 @@ Osoite: %4</translation>
</message>
</context>
<context>
+ <name>OpenURIDialog</name>
+ <message>
+ <location filename="../forms/openuridialog.ui" line="+14"/>
+ <source>Open URI</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Open payment request from URI or file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>URI:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Select payment request file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../openuridialog.cpp" line="+47"/>
+ <source>Select payment request file to open</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OptionsDialog</name>
<message>
<location filename="../forms/optionsdialog.ui" line="+14"/>
@@ -897,7 +1238,7 @@ Osoite: %4</translation>
<translation>Asetukset</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+13"/>
<source>&amp;Main</source>
<translation>&amp;Yleiset</translation>
</message>
@@ -922,7 +1263,52 @@ Osoite: %4</translation>
<translation>&amp;Käynnistä Bitcoin kirjautumisen yhteydessä</translation>
</message>
<message>
- <location line="+35"/>
+ <location line="+9"/>
+ <source>Size of &amp;database cache</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set database cache size in megabytes (default: 25)</source>
+ <translation>Aseta tietokannan välimuistin koko megatavuina (oletus: 25)</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>MB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Number of script &amp;verification threads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Connect to the Bitcoin network through a SOCKS proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Connect through SOCKS proxy (default proxy):</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+224"/>
+ <source>Active command-line options that override above options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
<source>Reset all client options to default.</source>
<translation type="unfinished"/>
</message>
@@ -932,7 +1318,7 @@ Osoite: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="-323"/>
<source>&amp;Network</source>
<translation>&amp;Verkko</translation>
</message>
@@ -947,32 +1333,17 @@ Osoite: %4</translation>
<translation>Portin uudelleenohjaus &amp;UPnP:llä</translation>
</message>
<message>
- <location line="+7"/>
- <source>Connect to the Bitcoin network through a SOCKS proxy (e.g. when connecting through Tor).</source>
- <translation>Ota yhteys Bitcoin-verkkoon SOCKS-proxyn läpi (esimerkiksi kun haluat käyttää Tor-verkkoa).</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>&amp;Connect through SOCKS proxy:</source>
- <translation>&amp;Ota yhteys SOCKS-proxyn kautta:</translation>
- </message>
- <message>
- <location line="+9"/>
+ <location line="+19"/>
<source>Proxy &amp;IP:</source>
<translation>Proxyn &amp;IP:</translation>
</message>
<message>
- <location line="+19"/>
- <source>IP address of the proxy (e.g. 127.0.0.1)</source>
- <translation>Välityspalvelimen IP-osoite (esim. 127.0.0.1)</translation>
- </message>
- <message>
- <location line="+7"/>
+ <location line="+32"/>
<source>&amp;Port:</source>
<translation>&amp;Portti</translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+25"/>
<source>Port of the proxy (e.g. 9050)</source>
<translation>Proxyn Portti (esim. 9050)</translation>
</message>
@@ -1047,7 +1418,17 @@ Osoite: %4</translation>
<translation>&amp;Näytä osoitteet rahansiirrot listassa</translation>
</message>
<message>
- <location line="+71"/>
+ <location line="+7"/>
+ <source>Whether to show coin control features or not.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Display coin &amp;control features (experts only)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+136"/>
<source>&amp;OK</source>
<translation>&amp;OK</translation>
</message>
@@ -1057,44 +1438,38 @@ Osoite: %4</translation>
<translation>&amp;Peruuta</translation>
</message>
<message>
- <location line="+10"/>
- <source>&amp;Apply</source>
- <translation>&amp;Hyväksy</translation>
- </message>
- <message>
- <location filename="../optionsdialog.cpp" line="+58"/>
+ <location filename="../optionsdialog.cpp" line="+67"/>
<source>default</source>
<translation>oletus</translation>
</message>
<message>
- <location line="+130"/>
- <source>Confirm options reset</source>
+ <location line="+57"/>
+ <source>none</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Some settings may require a client restart to take effect.</source>
+ <location line="+75"/>
+ <source>Confirm options reset</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>Do you want to proceed?</source>
- <translation>Haluatko jatkaa?</translation>
+ <location line="+1"/>
+ <location line="+29"/>
+ <source>Client restart required to activate changes.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
- <location line="+9"/>
- <source>Warning</source>
- <translation>Varoitus</translation>
+ <location line="-29"/>
+ <source>Client will be shutdown, do you want to proceed?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="-9"/>
- <location line="+9"/>
- <source>This setting will take effect after restarting Bitcoin.</source>
- <translation>Tämä asetus astuu voimaan seuraavalla kerralla, kun Bitcoin käynnistetään.</translation>
+ <location line="+33"/>
+ <source>This change would require a client restart.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+29"/>
+ <location line="+34"/>
<source>The supplied proxy address is invalid.</source>
<translation>Antamasi proxy-osoite on virheellinen.</translation>
</message>
@@ -1108,22 +1483,22 @@ Osoite: %4</translation>
</message>
<message>
<location line="+50"/>
- <location line="+202"/>
+ <location line="+231"/>
<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="-131"/>
+ <location line="-155"/>
<source>Unconfirmed:</source>
<translation>Vahvistamatta:</translation>
</message>
<message>
- <location line="-78"/>
+ <location line="-83"/>
<source>Wallet</source>
<translation>Lompakko</translation>
</message>
<message>
- <location line="+49"/>
+ <location line="+51"/>
<source>Confirmed:</source>
<translation>Vahvistettu</translation>
</message>
@@ -1133,12 +1508,12 @@ Osoite: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="+29"/>
+ <location line="+32"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+16"/>
<source>Immature:</source>
<translation>Epäkypsää:</translation>
</message>
@@ -1148,7 +1523,7 @@ Osoite: %4</translation>
<translation>Louhittu saldo, joka ei ole vielä kypsynyt</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+16"/>
<source>Total:</source>
<translation type="unfinished"/>
</message>
@@ -1158,12 +1533,12 @@ Osoite: %4</translation>
<translation>Tililläsi tällä hetkellä olevien Bitcoinien määrä</translation>
</message>
<message>
- <location line="+53"/>
+ <location line="+71"/>
<source>&lt;b&gt;Recent transactions&lt;/b&gt;</source>
<translation>&lt;b&gt;Viimeisimmät rahansiirrot&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../overviewpage.cpp" line="+116"/>
+ <location filename="../overviewpage.cpp" line="+120"/>
<location line="+1"/>
<source>out of sync</source>
<translation>Ei ajan tasalla</translation>
@@ -1172,7 +1547,8 @@ Osoite: %4</translation>
<context>
<name>PaymentServer</name>
<message>
- <location filename="../paymentserver.cpp" line="+392"/>
+ <location filename="../paymentserver.cpp" line="+403"/>
+ <location line="+13"/>
<source>URI handling</source>
<translation>URI käsittely</translation>
</message>
@@ -1182,45 +1558,82 @@ Osoite: %4</translation>
<translation>URIa ei voitu jäsentää! Tämä voi johtua kelvottomasta Bitcoin-osoitteesta tai virheellisistä URI parametreista.</translation>
</message>
<message>
- <location line="+69"/>
+ <location line="+96"/>
<source>Requested payment amount of %1 is too small (considered dust).</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
- <location line="+37"/>
+ <location line="-221"/>
+ <location line="+212"/>
+ <location line="+13"/>
+ <location line="+95"/>
+ <location line="+18"/>
+ <location line="+16"/>
<source>Payment request error</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="-353"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Net manager warning</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+1"/>
- <source>Insecure requests to custom payment scripts unsupported</source>
+ <source>Your active proxy doesn&apos;t support SOCKS5, which is required for payment requests via proxy.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+38"/>
+ <location line="+52"/>
+ <source>Payment request fetch URL is invalid: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Payment request file handling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Payment request file can not be read or processed! This can be caused by an invalid payment request file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+73"/>
+ <source>Unverified payment requests to custom payment scripts are unsupported.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+59"/>
<source>Refund from %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
+ <location line="+43"/>
<source>Error communicating with %1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+24"/>
+ <source>Payment request can not be parsed or processed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
<source>Bad response from server %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+32"/>
+ <location line="+33"/>
<source>Payment acknowledged</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-58"/>
- <location line="+30"/>
- <location line="+17"/>
+ <location line="-11"/>
<source>Network request error</source>
<translation type="unfinished"/>
</message>
@@ -1228,32 +1641,26 @@ Osoite: %4</translation>
<context>
<name>QObject</name>
<message>
- <location filename="../bitcoin.cpp" line="+114"/>
- <location line="+5"/>
- <location filename="../intro.cpp" line="-32"/>
+ <location filename="../bitcoin.cpp" line="+71"/>
+ <location line="+11"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-4"/>
+ <location line="+1"/>
<source>Error: Specified data directory &quot;%1&quot; does not exist.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="-12"/>
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../intro.cpp" line="+1"/>
- <source>Error: Specified data directory &quot;%1&quot; can not be created.</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>QRImageWidget</name>
<message>
- <location filename="../receiverequestdialog.cpp" line="+32"/>
+ <location filename="../receiverequestdialog.cpp" line="+36"/>
<source>&amp;Save Image...</source>
<translation type="unfinished"/>
</message>
@@ -1269,8 +1676,8 @@ Osoite: %4</translation>
</message>
<message>
<location line="+0"/>
- <source>PNG Images (*.png)</source>
- <translation>PNG kuvat (*png)</translation>
+ <source>PNG Image (*.png)</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1287,15 +1694,16 @@ Osoite: %4</translation>
<location line="+23"/>
<location line="+23"/>
<location line="+36"/>
- <location line="+53"/>
+ <location line="+23"/>
+ <location line="+36"/>
<location line="+23"/>
<location line="+23"/>
- <location filename="../rpcconsole.cpp" line="+352"/>
+ <location filename="../rpcconsole.cpp" line="+359"/>
<source>N/A</source>
<translation>Ei saatavilla</translation>
</message>
<message>
- <location line="-217"/>
+ <location line="-223"/>
<source>Client version</source>
<translation>Pääteohjelman versio</translation>
</message>
@@ -1305,7 +1713,17 @@ Osoite: %4</translation>
<translation>T&amp;ietoa</translation>
</message>
<message>
- <location line="+68"/>
+ <location line="-10"/>
+ <source>Debug window</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+25"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+53"/>
<source>Using OpenSSL version</source>
<translation>Käytössä oleva OpenSSL-versio</translation>
</message>
@@ -1321,16 +1739,16 @@ Osoite: %4</translation>
</message>
<message>
<location line="+7"/>
- <source>Number of connections</source>
- <translation>Yhteyksien lukumäärä</translation>
+ <source>Name</source>
+ <translation>Nimi</translation>
</message>
<message>
<location line="+23"/>
- <source>On testnet</source>
- <translation>Käyttää testiverkkoa</translation>
+ <source>Number of connections</source>
+ <translation>Yhteyksien lukumäärä</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+29"/>
<source>Block chain</source>
<translation>Lohkoketju</translation>
</message>
@@ -1355,21 +1773,6 @@ Osoite: %4</translation>
<translation>&amp;Avaa</translation>
</message>
<message>
- <location line="+16"/>
- <source>Command-line options</source>
- <translation>Komentorivi parametrit</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>Näytä Bitcoin-Qt komentoriviparametrien ohjesivu, jossa on listattuna mahdolliset komentoriviparametrit.</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>&amp;Show</source>
- <translation>&amp;Näytä</translation>
- </message>
- <message>
<location line="+24"/>
<source>&amp;Console</source>
<translation>&amp;Konsoli</translation>
@@ -1400,22 +1803,12 @@ Osoite: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="-541"/>
+ <location line="-521"/>
<source>Build date</source>
<translation>Kääntöpäiväys</translation>
</message>
<message>
- <location line="-104"/>
- <source>Bitcoin - Debug window</source>
- <translation>Bitcoin - Debug ikkuna</translation>
- </message>
- <message>
- <location line="+25"/>
- <source>Bitcoin Core</source>
- <translation>Bitcoin-ydin</translation>
- </message>
- <message>
- <location line="+279"/>
+ <location line="+206"/>
<source>Debug log file</source>
<translation>Debug lokitiedosto</translation>
</message>
@@ -1425,7 +1818,7 @@ Osoite: %4</translation>
<translation>Avaa lokitiedosto nykyisestä data-kansiosta. Tämä voi viedä useamman sekunnin, jos lokitiedosto on iso.</translation>
</message>
<message>
- <location line="+102"/>
+ <location line="+76"/>
<source>Clear console</source>
<translation>Tyhjennä konsoli</translation>
</message>
@@ -1445,7 +1838,7 @@ Osoite: %4</translation>
<translation>Kirjoita &lt;b&gt;help&lt;/b&gt; nähdäksesi yleiskatsauksen käytettävissä olevista komennoista.</translation>
</message>
<message>
- <location line="+128"/>
+ <location line="+122"/>
<source>%1 B</source>
<translation type="unfinished"/>
</message>
@@ -1483,48 +1876,48 @@ Osoite: %4</translation>
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+22"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
<source>&amp;Amount:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
- <source>The amount to request</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+7"/>
+ <location line="-13"/>
<source>&amp;Label:</source>
<translation>&amp;Nimi:</translation>
</message>
<message>
- <location line="+10"/>
- <source>The label to associate with the receiving address</source>
+ <location line="-34"/>
+ <source>&amp;Message:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>&amp;Message:</source>
+ <location line="-17"/>
+ <source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>The message to attach to payment request</source>
+ <location line="+3"/>
+ <source>R&amp;euse an existing receiving address (not recommended)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
- <source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
+ <location line="+27"/>
+ <source>An optional label to associate with the new receiving address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>R&amp;euse an existing receiving address (not recommended)</source>
+ <location line="+7"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+7"/>
- <source>Use this form to request payments. All fields are optional.</source>
+ <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+39"/>
+ <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1542,6 +1935,31 @@ Osoite: %4</translation>
<source>&amp;Request payment</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+47"/>
+ <source>Requested payments</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Show the selected request (does the same as double clicking an entry)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Show</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Remove the selected entries from the list</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Remove</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
@@ -1562,16 +1980,11 @@ Osoite: %4</translation>
</message>
<message>
<location line="+7"/>
- <source>&amp;Copy Image</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+7"/>
<source>&amp;Save Image...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../receiverequestdialog.cpp" line="+58"/>
+ <location filename="../receiverequestdialog.cpp" line="+56"/>
<source>Request payment to %1</source>
<translation type="unfinished"/>
</message>
@@ -1617,16 +2030,119 @@ Osoite: %4</translation>
</message>
</context>
<context>
+ <name>RecentRequestsTableModel</name>
+ <message>
+ <location filename="../recentrequeststablemodel.cpp" line="+24"/>
+ <source>Date</source>
+ <translation>Aika</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Label</source>
+ <translation>Nimi</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Message</source>
+ <translation>Viesti</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Amount</source>
+ <translation>Määrä</translation>
+ </message>
+ <message>
+ <location line="+38"/>
+ <source>(no label)</source>
+ <translation>(ei nimeä)</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>(no message)</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+140"/>
- <location line="+213"/>
+ <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location line="+80"/>
<source>Send Coins</source>
<translation>Lähetä Bitcoineja</translation>
</message>
<message>
- <location line="+50"/>
+ <location line="+76"/>
+ <source>Coin Control Features</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Inputs...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>automatically selected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Insufficient funds!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+89"/>
+ <source>Quantity:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+35"/>
+ <source>Bytes:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Amount:</source>
+ <translation>Määrä:</translation>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Priority:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Low Output:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>After Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Change:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+44"/>
+ <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Custom change address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+115"/>
<source>Send to multiple recipients at once</source>
<translation>Lähetä monelle vastaanottajalle</translation>
</message>
@@ -1651,12 +2167,7 @@ Osoite: %4</translation>
<translation>Saldo:</translation>
</message>
<message>
- <location line="+10"/>
- <source>123.456 BTC</source>
- <translation>123,456 BTC</translation>
- </message>
- <message>
- <location line="+31"/>
+ <location line="+41"/>
<source>Confirm the send action</source>
<translation>Vahvista lähetys</translation>
</message>
@@ -1666,69 +2177,135 @@ Osoite: %4</translation>
<translation>&amp;Lähetä</translation>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-154"/>
+ <location filename="../sendcoinsdialog.cpp" line="-228"/>
<source>Confirm send coins</source>
<translation>Hyväksy Bitcoinien lähettäminen</translation>
</message>
<message>
- <location line="-90"/>
+ <location line="-74"/>
<location line="+5"/>
<location line="+5"/>
+ <location line="+4"/>
<source>%1 to %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+26"/>
+ <location line="-136"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation>Anna Bitcoin-osoite (esim. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Copy quantity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation>Kopioi määrä</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy after fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy bytes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy low output</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy change</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+170"/>
+ <source>Total Amount %1 (= %2)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>or</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+202"/>
<source>The recipient address is not valid, please recheck.</source>
<translation>Vastaanottajan osoite on virheellinen. Tarkista osoite.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The amount to pay must be larger than 0.</source>
<translation>Maksettavan summan tulee olla suurempi kuin 0 Bitcoinia.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The amount exceeds your balance.</source>
<translation>Määrä ylittää käytettävissä olevan saldon.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The total exceeds your balance when the %1 transaction fee is included.</source>
<translation>Kokonaismäärä ylittää saldosi kun %1 maksukulu lisätään summaan.</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+3"/>
<source>Duplicate address found, can only send to each address once per send operation.</source>
<translation>Sama osoite toistuu useamman kerran. Samaan osoitteeseen voi lähettää vain kerran per maksu.</translation>
</message>
<message>
+ <location line="+3"/>
+ <source>Transaction creation failed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+4"/>
- <source>Error: Transaction creation failed!</source>
- <translation>Virhe: Rahansiirron luonti epäonnistui</translation>
+ <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+15"/>
- <source>Are you sure you want to send?</source>
+ <location line="+112"/>
+ <source>Warning: Invalid Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+9"/>
- <source>added as transaction fee</source>
+ <location line="+21"/>
+ <source>(no label)</source>
+ <translation>(ei nimeä)</translation>
+ </message>
+ <message>
+ <location line="-11"/>
+ <source>Warning: Unknown change address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
- <source>Total Amount %1</source>
+ <location line="-366"/>
+ <source>Are you sure you want to send?</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+20"/>
- <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>Virhe: Rahansiirto hylättiin. Tämä voi tapahtua jos jotkin bitcoineistasi on jo käytetty, esimerkiksi jos olet käyttänyt kopiota wallet.dat-lompakkotiedostosta ja bitcoinit on merkitty käytetyksi vain kopiossa.</translation>
+ <location line="+9"/>
+ <source>added as transaction fee</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+144"/>
+ <location line="+170"/>
<source>Payment request expired</source>
<translation type="unfinished"/>
</message>
@@ -1741,39 +2318,44 @@ Osoite: %4</translation>
<context>
<name>SendCoinsEntry</name>
<message>
- <location filename="../forms/sendcoinsentry.ui" line="+33"/>
- <location line="+585"/>
+ <location filename="../forms/sendcoinsentry.ui" line="+131"/>
+ <location line="+521"/>
+ <location line="+536"/>
<source>A&amp;mount:</source>
<translation>M&amp;äärä:</translation>
</message>
<message>
- <location line="-572"/>
- <location line="+585"/>
+ <location line="-1152"/>
<source>Pay &amp;To:</source>
<translation>Maksun saaja:</translation>
</message>
<message>
- <location line="-551"/>
+ <location line="+18"/>
<source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>Osoite, johon Bitcoinit lähetetään (esim. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location filename="../sendcoinsentry.cpp" line="+28"/>
+ <location filename="../sendcoinsentry.cpp" line="+30"/>
<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>
<message>
- <location filename="../forms/sendcoinsentry.ui" line="-18"/>
+ <location filename="../forms/sendcoinsentry.ui" line="+57"/>
<source>&amp;Label:</source>
<translation>&amp;Nimi:</translation>
</message>
<message>
- <location line="+28"/>
+ <location line="-50"/>
<source>Choose previously used address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
+ <location line="-40"/>
+ <source>This is a normal payment.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+50"/>
<source>Alt+A</source>
<translation>Alt+A</translation>
</message>
@@ -1789,16 +2371,45 @@ Osoite: %4</translation>
</message>
<message>
<location line="+7"/>
- <source>Remove this recipient</source>
- <translation>Poista </translation>
+ <location line="+524"/>
+ <location line="+536"/>
+ <source>Remove this entry</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="-1008"/>
+ <source>Message:</source>
+ <translation>Viesti:</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+958"/>
+ <source>This is a verified payment request.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-991"/>
<source>Enter a label for this address to add it to the list of used addresses</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+465"/>
+ <location line="+459"/>
+ <source>This is an unverified payment request.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+18"/>
+ <location line="+532"/>
+ <source>Pay To:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-498"/>
+ <location line="+536"/>
<source>Memo:</source>
<translation type="unfinished"/>
</message>
@@ -1809,6 +2420,19 @@ Osoite: %4</translation>
</message>
</context>
<context>
+ <name>ShutdownWindow</name>
+ <message>
+ <location filename="../utilitydialog.cpp" line="+48"/>
+ <source>Bitcoin Core is shutting down...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Do not shut down the computer until this window disappears.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>SignVerifyMessageDialog</name>
<message>
<location filename="../forms/signverifymessagedialog.ui" line="+14"/>
@@ -1816,7 +2440,7 @@ Osoite: %4</translation>
<translation>Allekirjoitukset - Allekirjoita / Varmista viesti</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+10"/>
<source>&amp;Sign Message</source>
<translation>&amp;Allekirjoita viesti</translation>
</message>
@@ -1919,7 +2543,7 @@ Osoite: %4</translation>
<translation>Tyhjennä kaikki varmista-viesti-kentät</translation>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+27"/>
+ <location filename="../signverifymessagedialog.cpp" line="+29"/>
<location line="+3"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>Anna Bitcoin-osoite (esim. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
@@ -1935,7 +2559,7 @@ Osoite: %4</translation>
<translation>Syötä Bitcoin-allekirjoitus</translation>
</message>
<message>
- <location line="+85"/>
+ <location line="+84"/>
<location line="+81"/>
<source>The entered address is invalid.</source>
<translation>Syötetty osoite on virheellinen.</translation>
@@ -2004,9 +2628,14 @@ Osoite: %4</translation>
<context>
<name>SplashScreen</name>
<message>
- <location filename="../splashscreen.cpp" line="+23"/>
- <source>The Bitcoin developers</source>
- <translation>Bitcoin kehittäjät</translation>
+ <location filename="../splashscreen.cpp" line="+28"/>
+ <source>Bitcoin Core</source>
+ <translation>Bitcoin-ydin</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>The Bitcoin Core developers</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
@@ -2017,7 +2646,7 @@ Osoite: %4</translation>
<context>
<name>TrafficGraphWidget</name>
<message>
- <location filename="../trafficgraphwidget.cpp" line="+75"/>
+ <location filename="../trafficgraphwidget.cpp" line="+79"/>
<source>KB/s</source>
<translation type="unfinished"/>
</message>
@@ -2025,7 +2654,7 @@ Osoite: %4</translation>
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="+22"/>
+ <location filename="../transactiondesc.cpp" line="+28"/>
<source>Open until %1</source>
<translation>Avoinna %1 asti</translation>
</message>
@@ -2098,12 +2727,12 @@ Osoite: %4</translation>
<location line="+12"/>
<location line="+45"/>
<location line="+17"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Credit</source>
<translation>Credit</translation>
</message>
<message numerus="yes">
- <location line="-120"/>
+ <location line="-125"/>
<source>matures in %n more block(s)</source>
<translation><numerusform>kypsyy %n lohkon kuluttua</numerusform><numerusform>kypsyy %n lohkon kuluttua</numerusform></translation>
</message>
@@ -2116,12 +2745,12 @@ Osoite: %4</translation>
<location line="+44"/>
<location line="+8"/>
<location line="+15"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Debit</source>
<translation>Debit</translation>
</message>
<message>
- <location line="-57"/>
+ <location line="-62"/>
<source>Transaction fee</source>
<translation>Maksukulu</translation>
</message>
@@ -2132,11 +2761,12 @@ Osoite: %4</translation>
</message>
<message>
<location line="+6"/>
+ <location line="+9"/>
<source>Message</source>
<translation>Viesti</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="-7"/>
<source>Comment</source>
<translation>Viesti</translation>
</message>
@@ -2146,7 +2776,7 @@ Osoite: %4</translation>
<translation>Siirtotunnus</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+18"/>
<source>Merchant</source>
<translation type="unfinished"/>
</message>
@@ -2186,7 +2816,7 @@ Osoite: %4</translation>
<translation>epätosi</translation>
</message>
<message>
- <location line="-227"/>
+ <location line="-232"/>
<source>, has not been successfully broadcast yet</source>
<translation>, ei ole vielä onnistuneesti lähetetty</translation>
</message>
@@ -2217,7 +2847,7 @@ Osoite: %4</translation>
<context>
<name>TransactionTableModel</name>
<message>
- <location filename="../transactiontablemodel.cpp" line="+227"/>
+ <location filename="../transactiontablemodel.cpp" line="+234"/>
<source>Date</source>
<translation>Päivämäärä</translation>
</message>
@@ -2236,8 +2866,13 @@ Osoite: %4</translation>
<source>Amount</source>
<translation>Määrä</translation>
</message>
+ <message>
+ <location line="+59"/>
+ <source>Immature (%1 confirmations, will be available after %2)</source>
+ <translation type="unfinished"/>
+ </message>
<message numerus="yes">
- <location line="+57"/>
+ <location line="+16"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -2257,17 +2892,13 @@ Osoite: %4</translation>
<translation>Vahvistamatta (%1/%2 vahvistusta)</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="-22"/>
+ <location line="+25"/>
<source>Confirmed (%1 confirmations)</source>
<translation>Vahvistettu (%1 vahvistusta)</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>Louhittu saldo on käytettävissä kun se kypsyy %n lohkon päästä</numerusform><numerusform>Louhittu saldo on käytettävissä kun se kypsyy %n lohkon päästä</numerusform></translation>
- </message>
<message>
- <location line="+5"/>
+ <location line="-22"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation>Tätä lohkoa ei vastaanotettu mistään muusta solmusta ja sitä ei mahdollisesti hyväksytä!</translation>
</message>
@@ -2277,7 +2908,7 @@ Osoite: %4</translation>
<translation>Generoitu mutta ei hyväksytty</translation>
</message>
<message>
- <location line="+43"/>
+ <location line="+62"/>
<source>Received with</source>
<translation>Vastaanotettu osoitteella</translation>
</message>
@@ -2335,7 +2966,7 @@ Osoite: %4</translation>
<context>
<name>TransactionView</name>
<message>
- <location filename="../transactionview.cpp" line="+52"/>
+ <location filename="../transactionview.cpp" line="+57"/>
<location line="+16"/>
<source>All</source>
<translation>Kaikki</translation>
@@ -2396,12 +3027,12 @@ Osoite: %4</translation>
<translation>Muu</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+6"/>
<source>Enter address or label to search</source>
<translation>Anna etsittävä osoite tai tunniste</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+6"/>
<source>Min amount</source>
<translation>Minimimäärä</translation>
</message>
@@ -2436,17 +3067,37 @@ Osoite: %4</translation>
<translation>Näytä rahansiirron yksityiskohdat</translation>
</message>
<message>
- <location line="+143"/>
- <source>Export Transaction Data</source>
- <translation>Vie rahansiirron tiedot</translation>
+ <location line="+142"/>
+ <source>Export Transaction History</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="+19"/>
+ <source>Exporting Failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>There was an error trying to save the transaction history to %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Exporting Successful</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The transaction history was successfully saved to %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-22"/>
<source>Comma separated file (*.csv)</source>
<translation>Comma separated file (*.csv)</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+9"/>
<source>Confirmed</source>
<translation>Vahvistettu</translation>
</message>
@@ -2481,17 +3132,7 @@ Osoite: %4</translation>
<translation>ID</translation>
</message>
<message>
- <location line="+4"/>
- <source>Error exporting</source>
- <translation>Virhe tietojen viennissä</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation>Ei voida kirjoittaa tiedostoon %1.</translation>
- </message>
- <message>
- <location line="+100"/>
+ <location line="+107"/>
<source>Range:</source>
<translation>Alue:</translation>
</message>
@@ -2502,9 +3143,17 @@ Osoite: %4</translation>
</message>
</context>
<context>
+ <name>WalletFrame</name>
+ <message>
+ <location filename="../walletframe.cpp" line="+26"/>
+ <source>No wallet has been loaded.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>WalletModel</name>
<message>
- <location filename="../walletmodel.cpp" line="+218"/>
+ <location filename="../walletmodel.cpp" line="+245"/>
<source>Send Coins</source>
<translation>Lähetä Bitcoineja</translation>
</message>
@@ -2512,7 +3161,7 @@ Osoite: %4</translation>
<context>
<name>WalletView</name>
<message>
- <location filename="../walletview.cpp" line="+46"/>
+ <location filename="../walletview.cpp" line="+43"/>
<source>&amp;Export</source>
<translation type="unfinished"/>
</message>
@@ -2522,65 +3171,60 @@ Osoite: %4</translation>
<translation>Vie auki olevan välilehden tiedot tiedostoon</translation>
</message>
<message>
- <location line="+183"/>
+ <location line="+181"/>
<source>Backup Wallet</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
+ <location line="+1"/>
<source>Wallet Data (*.dat)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
+ <location line="+6"/>
<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>
+ <source>There was an error trying to save the wallet data to %1.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+4"/>
- <source>Backup Successful</source>
- <translation>Varmuuskopio Onnistui</translation>
+ <source>The wallet data was successfully saved to %1.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+0"/>
- <source>The wallet data was successfully saved to the new location.</source>
- <translation type="unfinished"/>
+ <source>Backup Successful</source>
+ <translation>Varmuuskopio Onnistui</translation>
</message>
</context>
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+102"/>
- <source>Bitcoin version</source>
- <translation>Bitcoinin versio</translation>
- </message>
- <message>
- <location line="+107"/>
+ <location filename="../bitcoinstrings.cpp" line="+221"/>
<source>Usage:</source>
<translation>Käyttö:</translation>
</message>
<message>
- <location line="-55"/>
+ <location line="-54"/>
<source>List commands</source>
<translation>Lista komennoista</translation>
</message>
<message>
- <location line="-13"/>
+ <location line="-14"/>
<source>Get help for a command</source>
<translation>Hanki apua käskyyn</translation>
</message>
<message>
- <location line="+25"/>
+ <location line="+26"/>
<source>Options:</source>
<translation>Asetukset:</translation>
</message>
<message>
- <location line="+24"/>
+ <location line="+22"/>
<source>Specify configuration file (default: bitcoin.conf)</source>
<translation>Määritä asetustiedosto (oletus: bitcoin.conf)</translation>
</message>
@@ -2600,7 +3244,7 @@ Osoite: %4</translation>
<translation>Aseta tietokannan välimuistin koko megatavuina (oletus: 25)</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-26"/>
<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>
@@ -2610,7 +3254,7 @@ Osoite: %4</translation>
<translation>Pidä enintään &lt;n&gt; yhteyttä verkkoihin (oletus: 125)</translation>
</message>
<message>
- <location line="-49"/>
+ <location line="-51"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation>Yhdistä noodiin hakeaksesi naapurien osoitteet ja katkaise yhteys</translation>
</message>
@@ -2620,37 +3264,37 @@ Osoite: %4</translation>
<translation>Määritä julkinen osoitteesi</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation>Kynnysarvo aikakatkaisulle heikosti toimiville verkoille (oletus: 100)</translation>
</message>
<message>
- <location line="-142"/>
+ <location line="-148"/>
<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="-33"/>
+ <location line="-36"/>
<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="+31"/>
+ <location line="+34"/>
<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="+40"/>
+ <location line="+45"/>
<source>Accept command line and JSON-RPC commands</source>
<translation>Hyväksy merkkipohjaiset- ja JSON-RPC-käskyt</translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<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="+40"/>
+ <location line="+39"/>
<source>Use the test network</source>
<translation>Käytä test -verkkoa</translation>
</message>
@@ -2660,7 +3304,7 @@ Osoite: %4</translation>
<translation>Hyväksy yhteyksiä ulkopuolelta (vakioasetus: 1 jos -proxy tai -connect ei määritelty)</translation>
</message>
<message>
- <location line="-87"/>
+ <location line="-95"/>
<source>%s, you must set a rpcpassword in the configuration file:
%s
It is recommended you use the following random password:
@@ -2701,6 +3345,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+4"/>
+ <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</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>
@@ -2715,17 +3364,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<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="+6"/>
+ <location line="+18"/>
<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>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
<source>Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source>
<translation>Varoitus: -paytxfee on asetettu erittäin korkeaksi! Tämä on maksukulu jonka tulet maksamaan kun lähetät siirron.</translation>
</message>
@@ -2755,17 +3404,27 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
+ <location line="+9"/>
+ <source>&lt;category&gt; can be:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
<source>Attempt to recover private keys from a corrupt wallet.dat</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
+ <source>Bitcoin Core Daemon</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Bitcoin RPC client version</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
<source>Block creation options:</source>
<translation>Lohkon luonnin asetukset:</translation>
</message>
@@ -2775,7 +3434,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Yhidstä ainoastaan määrättyihin noodeihin</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
+ <source>Connect through SOCKS proxy</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect to JSON-RPC on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation type="unfinished"/>
</message>
@@ -2791,6 +3455,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+1"/>
+ <source>Do not load the wallet and disable wallet RPC calls</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Do you want to rebuild the block database now?</source>
<translation type="unfinished"/>
</message>
@@ -2885,7 +3554,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
+ <source>Fee per kB to add to transactions you send</source>
+ <translation>palkkio per kB lisätty lähettämiisi rahansiirtoihin</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Find peers using DNS lookup (default: 1 unless -connect)</source>
<translation>Hae naapureita DNS hauilla (vakioasetus: 1 paitsi jos -connect)</translation>
</message>
@@ -2905,6 +3579,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
+ <location line="+1"/>
+ <source>If &lt;category&gt; is not supplied, output all debugging information.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+2"/>
<source>Incorrect or no genesis block found. Wrong datadir for network?</source>
<translation type="unfinished"/>
@@ -2920,17 +3599,37 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+8"/>
+ <location line="+5"/>
+ <source>Prepend debug output with timestamp (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>RPC client options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Rebuild block chain index from current blk000??.dat files</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+5"/>
+ <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Send command to Bitcoin server</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
+ <location line="+7"/>
+ <source>Set maximum block size in bytes (default: %d)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Set the number of threads to service RPC calls (default: 4)</source>
<translation type="unfinished"/>
</message>
@@ -2945,12 +3644,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+12"/>
+ <location line="+3"/>
+ <source>This is intended for regression testing tools and app development.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Usage (deprecated, use bitcoin-cli):</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+8"/>
+ <location line="+7"/>
<source>Verifying blocks...</source>
<translation type="unfinished"/>
</message>
@@ -2961,31 +3665,56 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+1"/>
+ <source>Wait for RPC server to start</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Wallet %s resides outside data directory %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+2"/>
+ <source>Wallet options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>You need to rebuild the database using -reindex to change -txindex</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-78"/>
+ <location line="-79"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation>Tuodaan lohkoja ulkoisesta blk000??.dat tiedostosta</translation>
</message>
<message>
- <location line="-98"/>
+ <location line="-105"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+17"/>
+ <location line="+14"/>
+ <source>Output debugging information (default: 0, supplying &lt;category&gt; is optional)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+83"/>
+ <location line="+89"/>
<source>Information</source>
<translation>Tietoa</translation>
</message>
@@ -3025,47 +3754,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Yhdistä vain noodeihin verkossa &lt;net&gt; (IPv4, IPv6 tai Tor)</translation>
</message>
<message>
- <location line="+2"/>
- <source>Output extra debugging information. Implies all other -debug* options</source>
- <translation>Tulosta enemmän debug tietoa. Aktivoi kaikki -debug* asetukset</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Output extra network debugging information</source>
- <translation>Tulosta lisää verkkoyhteys debug tietoa</translation>
- </message>
- <message>
- <location line="+2"/>
- <source>Prepend debug output with timestamp</source>
- <translation>Lisää debuggaustiedon tulostukseen aikaleima</translation>
- </message>
- <message>
- <location line="+5"/>
+ <location line="+9"/>
<source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
<translation>SSL asetukset (katso Bitcoin Wikistä tarkemmat SSL ohjeet)</translation>
</message>
<message>
- <location line="+1"/>
- <source>Select the version of socks proxy to use (4-5, default: 5)</source>
- <translation>Valitse käytettävän SOCKS-proxyn versio (4-5, vakioasetus: 5)</translation>
- </message>
- <message>
- <location line="+3"/>
+ <location line="+4"/>
<source>Send trace/debug info to console instead of debug.log file</source>
<translation>Lähetä jäljitys/debug-tieto konsoliin, debug.log-tiedoston sijaan</translation>
</message>
<message>
- <location line="+1"/>
- <source>Send trace/debug info to debugger</source>
- <translation>Lähetä jäljitys/debug-tieto debuggeriin</translation>
- </message>
- <message>
- <location line="+5"/>
- <source>Set maximum block size in bytes (default: 250000)</source>
- <translation>Aseta suurin lohkon koko tavuissa (vakioasetus: 250000)</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+6"/>
<source>Set minimum block size in bytes (default: 0)</source>
<translation>Asetan pienin lohkon koko tavuissa (vakioasetus: 0)</translation>
</message>
@@ -3090,7 +3789,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Järjestelmävirhe:</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Transaction amount too small</source>
<translation>Siirtosumma liian pieni</translation>
</message>
@@ -3115,32 +3814,32 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Käytä UPnP:tä kuunneltavan portin avaamiseen (vakioasetus: 1 kun kuuntelemassa)</translation>
</message>
<message>
- <location line="+1"/>
- <source>Use proxy to reach tor hidden services (default: same as -proxy)</source>
- <translation>Käytä proxyä tor yhteyksien avaamiseen (vakioasetus: sama kuin -proxy)</translation>
- </message>
- <message>
<location line="+2"/>
<source>Username for JSON-RPC connections</source>
<translation>Käyttäjätunnus JSON-RPC-yhteyksille</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+7"/>
<source>Warning</source>
<translation>Varoitus</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Warning: This version is obsolete, upgrade required!</source>
<translation>Varoitus: Tämä versio on vanhentunut, päivitys tarpeen!</translation>
</message>
<message>
<location line="+2"/>
+ <source>version</source>
+ <translation>versio</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>wallet.dat corrupt, salvage failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-54"/>
+ <location line="-58"/>
<source>Password for JSON-RPC connections</source>
<translation>Salasana JSON-RPC-yhteyksille</translation>
</message>
@@ -3150,27 +3849,27 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Salli JSON-RPC yhteydet tietystä ip-osoitteesta</translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<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="-126"/>
+ <location line="-132"/>
<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="+155"/>
+ <location line="+161"/>
<source>Upgrade wallet to latest format</source>
<translation>Päivitä lompakko uusimpaan formaattiin</translation>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation>Aseta avainpoolin koko arvoon &lt;n&gt; (oletus: 100)</translation>
</message>
<message>
- <location line="-12"/>
+ <location line="-11"/>
<source>Rescan the block chain for missing wallet transactions</source>
<translation>Skannaa uudelleen lohkoketju lompakon puuttuvien rahasiirtojen vuoksi</translation>
</message>
@@ -3180,7 +3879,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Käytä OpenSSL:ää (https) JSON-RPC-yhteyksille</translation>
</message>
<message>
- <location line="-29"/>
+ <location line="-30"/>
<source>Server certificate file (default: server.cert)</source>
<translation>Palvelimen sertifikaatti-tiedosto (oletus: server.cert)</translation>
</message>
@@ -3195,27 +3894,22 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Tämä ohjeviesti</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Unable to bind to %s on this computer (bind returned error %d, %s)</source>
<translation>Kytkeytyminen %s tällä tietokonella ei onnistu (kytkeytyminen palautti virheen %d, %s)</translation>
</message>
<message>
- <location line="-95"/>
- <source>Connect through socks proxy</source>
- <translation>Yhdistä socks proxyn läpi</translation>
- </message>
- <message>
- <location line="-11"/>
+ <location line="-107"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation>Salli DNS kyselyt -addnode, -seednode ja -connect yhteydessä</translation>
</message>
<message>
- <location line="+58"/>
+ <location line="+60"/>
<source>Loading addresses...</source>
<translation>Ladataan osoitteita...</translation>
</message>
<message>
- <location line="-36"/>
+ <location line="-37"/>
<source>Error loading wallet.dat: Wallet corrupted</source>
<translation>Virhe ladattaessa wallet.dat-tiedostoa: Lompakko vioittunut</translation>
</message>
@@ -3235,12 +3929,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Virhe ladattaessa wallet.dat-tiedostoa</translation>
</message>
<message>
- <location line="+30"/>
+ <location line="+31"/>
<source>Invalid -proxy address: &apos;%s&apos;</source>
<translation>Virheellinen proxy-osoite &apos;%s&apos;</translation>
</message>
<message>
- <location line="+57"/>
+ <location line="+56"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation>Tuntematon verkko -onlynet parametrina: &apos;%s&apos;</translation>
</message>
@@ -3250,7 +3944,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Tuntematon -socks proxy versio pyydetty: %i</translation>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation>-bind osoitteen &apos;%s&apos; selvittäminen epäonnistui</translation>
</message>
@@ -3260,7 +3954,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>-externalip osoitteen &apos;%s&apos; selvittäminen epäonnistui</translation>
</message>
<message>
- <location line="+46"/>
+ <location line="+48"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation>-paytxfee=&lt;amount&gt;: &apos;%s&apos; on virheellinen</translation>
</message>
@@ -3280,27 +3974,22 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Ladataan lohkoindeksiä...</translation>
</message>
<message>
- <location line="-60"/>
+ <location line="-62"/>
<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>
<message>
- <location line="-28"/>
+ <location line="-32"/>
<source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source>
<translation>Kytkeytyminen %s ei onnistu tällä tietokoneella. Bitcoin on todennäköisesti jo ajamassa.</translation>
</message>
<message>
- <location line="+69"/>
- <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="+20"/>
+ <location line="+95"/>
<source>Loading wallet...</source>
<translation>Ladataan lompakkoa...</translation>
</message>
<message>
- <location line="-54"/>
+ <location line="-56"/>
<source>Cannot downgrade wallet</source>
<translation>Et voi päivittää lompakkoasi vanhempaan versioon</translation>
</message>
@@ -3310,7 +3999,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Oletusosoitetta ei voi kirjoittaa</translation>
</message>
<message>
- <location line="+66"/>
+ <location line="+67"/>
<source>Rescanning...</source>
<translation>Skannataan uudelleen...</translation>
</message>
@@ -3330,7 +4019,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Virhe</translation>
</message>
<message>
- <location line="-33"/>
+ <location line="-35"/>
<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 84cb2414a3..3ae5a8154c 100644
--- a/src/qt/locale/bitcoin_fr.ts
+++ b/src/qt/locale/bitcoin_fr.ts
@@ -27,14 +27,14 @@ This product includes software developed by the OpenSSL Project for use in the O
Ce produit comprend des logiciels développés par le projet OpenSSL afin d&apos;être utilisés dans la boîte à outils OpenSSL (http://www.openssl.org/), un logiciel de chiffrement écrit par Eric Young (eay@cryptsoft.com), et un logiciel UPnP développé par Thomas Bernard.</translation>
</message>
<message>
- <location filename="../aboutdialog.cpp" line="+19"/>
+ <location filename="../utilitydialog.cpp" line="+29"/>
<source>Copyright</source>
<translation>Tous droits réservés</translation>
</message>
<message>
<location line="+0"/>
- <source>The Bitcoin developers</source>
- <translation>Les développeurs Bitcoin</translation>
+ <source>The Bitcoin Core developers</source>
+ <translation>Les développeurs Bitcoin Core</translation>
</message>
</context>
<context>
@@ -151,13 +151,13 @@ This product includes software developed by the OpenSSL Project for use in the O
</message>
<message>
<location line="+13"/>
- <source>Error exporting</source>
- <translation>Erreur lors de l&apos;exportation</translation>
+ <source>Exporting Failed</source>
+ <translation>L&apos;exportation a échoué</translation>
</message>
<message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation>Impossible d&apos;écrire dans le fichier %1.</translation>
+ <location line="+1"/>
+ <source>There was an error trying to save the address list to %1.</source>
+ <translation>Une erreur est survenue lors de l&apos;enregistrement de la liste d&apos;adresses vers %1.</translation>
</message>
</context>
<context>
@@ -322,22 +322,27 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+260"/>
+ <location filename="../bitcoingui.cpp" line="+295"/>
<source>Sign &amp;message...</source>
<translation>&amp;Signer le message...</translation>
</message>
<message>
- <location line="+290"/>
+ <location line="+335"/>
<source>Synchronizing with network...</source>
<translation>Synchronisation avec le réseau en cours…</translation>
</message>
<message>
- <location line="-360"/>
+ <location line="-407"/>
<source>&amp;Overview</source>
<translation>&amp;Vue d&apos;ensemble</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="-137"/>
+ <source>Node</source>
+ <translation>NÅ“ud</translation>
+ </message>
+ <message>
+ <location line="+138"/>
<source>Show general overview of wallet</source>
<translation>Afficher une vue d’ensemble du portefeuille</translation>
</message>
@@ -352,7 +357,7 @@ 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="+15"/>
+ <location line="+17"/>
<source>E&amp;xit</source>
<translation>Q&amp;uitter</translation>
</message>
@@ -398,7 +403,22 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>&amp;Changer la phrase de passe...</translation>
</message>
<message>
- <location line="+295"/>
+ <location line="+10"/>
+ <source>&amp;Sending addresses...</source>
+ <translation>Adresses d&apos;&amp;envoi...</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Receiving addresses...</source>
+ <translation>Adresses de &amp;réception...</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open &amp;URI...</source>
+ <translation>Ouvrir un &amp;URI...</translation>
+ </message>
+ <message>
+ <location line="+325"/>
<source>Importing blocks from disk...</source>
<translation>Importation des blocs depuis le disque...</translation>
</message>
@@ -408,12 +428,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Réindexation des blocs sur le disque...</translation>
</message>
<message>
- <location line="-358"/>
+ <location line="-405"/>
<source>Send coins to a Bitcoin address</source>
<translation>Envoyer des pièces à une adresse Bitcoin</translation>
</message>
<message>
- <location line="+47"/>
+ <location line="+49"/>
<source>Modify configuration options for Bitcoin</source>
<translation>Modifier les options de configuration de Bitcoin</translation>
</message>
@@ -443,18 +463,17 @@ 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="+375"/>
+ <location line="+430"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-563"/>
- <location line="+10"/>
+ <location line="-643"/>
<source>Wallet</source>
<translation>Portefeuille</translation>
</message>
<message>
- <location line="+113"/>
+ <location line="+146"/>
<source>&amp;Send</source>
<translation>&amp;Envoyer</translation>
</message>
@@ -464,7 +483,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>&amp;Recevoir</translation>
</message>
<message>
- <location line="+44"/>
+ <location line="+46"/>
<location line="+2"/>
<source>&amp;Show / Hide</source>
<translation>&amp;Afficher / Cacher</translation>
@@ -490,86 +509,80 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Vérifier les messages pour vous assurer qu&apos;ils ont été signés avec les adresses Bitcoin spécifiées</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+48"/>
<source>&amp;File</source>
<translation>&amp;Fichier</translation>
</message>
<message>
- <location line="+11"/>
+ <location line="+14"/>
<source>&amp;Settings</source>
<translation>&amp;Réglages</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>&amp;Help</source>
<translation>&amp;Aide</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+15"/>
<source>Tabs toolbar</source>
<translation>Barre d&apos;outils des onglets</translation>
</message>
<message>
- <location line="-244"/>
- <location line="+321"/>
+ <location line="-284"/>
+ <location line="+376"/>
<source>[testnet]</source>
<translation>[testnet]</translation>
</message>
<message>
- <location line="-331"/>
- <location line="+10"/>
+ <location line="-401"/>
<source>Bitcoin Core</source>
<translation>Bitcoin Core</translation>
</message>
<message>
- <location line="+121"/>
+ <location line="+163"/>
<source>Request payments (generates QR codes and bitcoin: URIs)</source>
<translation>Demander des paiements (génère des codes QR et des URIs bitcoin:)</translation>
</message>
<message>
- <location line="+27"/>
+ <location line="+29"/>
<location line="+2"/>
<source>&amp;About Bitcoin Core</source>
<translation>À &amp;propos de Bitcoin Core</translation>
</message>
<message>
- <location line="+34"/>
- <source>&amp;Used sending addresses...</source>
- <translation>Adresses d&apos;envoi &amp;utilisées...</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+35"/>
<source>Show the list of used sending addresses and labels</source>
<translation>Afficher la liste d&apos;adresses d&apos;envoi et d&apos;étiquettes utilisées</translation>
</message>
<message>
- <location line="+1"/>
- <source>Used &amp;receiving addresses...</source>
- <translation>Adresses de &amp;réception utilisées...</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Show the list of used receiving addresses and labels</source>
<translation>Afficher la liste d&apos;adresses de réception et d&apos;étiquettes utilisées</translation>
</message>
<message>
+ <location line="+3"/>
+ <source>Open a bitcoin: URI or payment request</source>
+ <translation>Ouvrir un URI bitcoin: ou une demande de paiement</translation>
+ </message>
+ <message>
<location line="+2"/>
- <source>Open URI...</source>
- <translation>Ouvrir l&apos;URI...</translation>
+ <source>&amp;Command-line options</source>
+ <translation>Options de ligne de &amp;commande</translation>
</message>
<message>
<location line="+1"/>
- <source>Open a bitcoin: URI or payment request</source>
- <translation>Ouvrir un URI bitcoin: ou une demande de paiement</translation>
+ <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
+ <translation>Afficher le message d&apos;aide de Bitcoin Core pour obtenir une liste des options de ligne de commande Bitcoin possibles.</translation>
</message>
<message>
- <location line="+126"/>
+ <location line="+159"/>
<location line="+5"/>
<source>Bitcoin client</source>
<translation>Client Bitcoin</translation>
</message>
<message numerus="yes">
- <location line="+133"/>
+ <location line="+142"/>
<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>
@@ -589,7 +602,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>À traité %1 blocs de l&apos;historique des transactions.</translation>
</message>
<message numerus="yes">
- <location line="+20"/>
+ <location line="+23"/>
<source>%n hour(s)</source>
<translation><numerusform>%n heure</numerusform><numerusform>%n heures</numerusform></translation>
</message>
@@ -609,7 +622,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>%1 en retard</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="+21"/>
<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>
@@ -634,27 +647,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Information</translation>
</message>
<message>
- <location line="+77"/>
- <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 moyennant des frais 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="-152"/>
+ <location line="-85"/>
<source>Up to date</source>
<translation>À jour</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Catching up...</source>
<translation>Rattrapage en cours…</translation>
</message>
<message>
- <location line="+124"/>
- <source>Confirm transaction fee</source>
- <translation>Confirmer les frais de transaction</translation>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+130"/>
<source>Sent transaction</source>
<translation>Transaction envoyée</translation>
</message>
@@ -677,7 +680,7 @@ Adresse : %4
</translation>
</message>
<message>
- <location line="+67"/>
+ <location line="+69"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation>Le portefeuille est &lt;b&gt;chiffré&lt;/b&gt; et est actuellement &lt;b&gt;déverrouillé&lt;/b&gt;</translation>
</message>
@@ -687,7 +690,7 @@ Adresse : %4
<translation>Le portefeuille est &lt;b&gt;chiffré&lt;/b&gt; et actuellement &lt;b&gt;verrouillé&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+116"/>
+ <location filename="../bitcoin.cpp" line="+438"/>
<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 de façon sûre et va s&apos;arrêter.</translation>
</message>
@@ -909,7 +912,12 @@ Adresse : %4
<translation>(%1 verrouillé)</translation>
</message>
<message>
- <location line="+171"/>
+ <location line="+31"/>
+ <source>none</source>
+ <translation>aucun</translation>
+ </message>
+ <message>
+ <location line="+140"/>
<source>Dust</source>
<translation>Poussière</translation>
</message>
@@ -946,7 +954,7 @@ Adresse : %4
</message>
<message>
<location line="+1"/>
- <source>This label turns red, if the priority is smaller than &quot;medium&quot;</source>
+ <source>This label turns red, if the priority is smaller than &quot;medium&quot;.</source>
<translation>Cette étiquette devient rouge si la priorité est plus basse que « moyenne »</translation>
</message>
<message>
@@ -1015,7 +1023,7 @@ Adresse : %4
<translation>&amp;Adresse</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+25"/>
+ <location filename="../editaddressdialog.cpp" line="+28"/>
<source>New receiving address</source>
<translation>Nouvelle adresse de réception</translation>
</message>
@@ -1084,20 +1092,24 @@ Adresse : %4
</message>
</context>
<context>
- <name>GUIUtil::HelpMessageBox</name>
+ <name>HelpMessageDialog</name>
<message>
- <location filename="../guiutil.cpp" line="+597"/>
- <source>version</source>
- <translation>version</translation>
+ <location filename="../forms/helpmessagedialog.ui" line="+19"/>
+ <source>Bitcoin Core - Command-line options</source>
+ <translation>Bitcoin Core - Options de ligne de commande</translation>
</message>
<message>
- <location line="+0"/>
- <location line="+13"/>
+ <location filename="../utilitydialog.cpp" line="+38"/>
<source>Bitcoin Core</source>
<translation>Bitcoin Core</translation>
</message>
<message>
- <location line="-11"/>
+ <location line="+0"/>
+ <source>version</source>
+ <translation>version</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Usage:</source>
<translation>Utilisation :</translation>
</message>
@@ -1195,12 +1207,12 @@ Adresse : %4
<message>
<location filename="../forms/openuridialog.ui" line="+14"/>
<source>Open URI</source>
- <translation>Ouvrir l&apos;URI</translation>
+ <translation>Ouvrir un URI</translation>
</message>
<message>
<location line="+6"/>
<source>Open payment request from URI or file</source>
- <translation>Ouvrir une demande de paiement à partir d&apos;une URI ou d&apos;un fichier</translation>
+ <translation>Ouvrir une demande de paiement à partir d&apos;un URI ou d&apos;un fichier</translation>
</message>
<message>
<location line="+9"/>
@@ -1226,7 +1238,7 @@ Adresse : %4
<translation>Options</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+13"/>
<source>&amp;Main</source>
<translation>Réglages &amp;principaux</translation>
</message>
@@ -1251,7 +1263,52 @@ Adresse : %4
<translation>&amp;Démarrer Bitcoin lors de l&apos;ouverture d&apos;une session</translation>
</message>
<message>
- <location line="+35"/>
+ <location line="+9"/>
+ <source>Size of &amp;database cache</source>
+ <translation>Taille du cache de la base de &amp;données</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set database cache size in megabytes (default: 25)</source>
+ <translation>Définir la taille du cache de la base de données en mégaoctets (par défaut : 25)</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>MB</source>
+ <translation>Mo</translation>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Number of script &amp;verification threads</source>
+ <translation>Nombre d&apos;exétrons de &amp;vérification de script</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
+ <translation>Défini le nombre d&apos;exétrons de vérification de script (jusqu&apos;à 16, 0 = auto, &lt;0 = laisse autant de cœurs libre, par défaut : 0)</translation>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Connect to the Bitcoin network through a SOCKS proxy.</source>
+ <translation>Se connecter au réseau Bitcoin par un mandataire SOCKS.</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Connect through SOCKS proxy (default proxy):</source>
+ <translation>Se &amp;connecter par un mandataire SOCKS (mandataire par défaut) :</translation>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
+ <translation>Adresse IP du mandataire (par ex. IPv4 : 127.0.0.1 / IPv6 : ::1)</translation>
+ </message>
+ <message>
+ <location line="+224"/>
+ <source>Active command-line options that override above options:</source>
+ <translation>Options actives de ligne de commande qui annulent les options ci-dessus :</translation>
+ </message>
+ <message>
+ <location line="+43"/>
<source>Reset all client options to default.</source>
<translation>Réinitialiser toutes les options du client aux valeurs par défaut.</translation>
</message>
@@ -1261,7 +1318,7 @@ Adresse : %4
<translation>&amp;Réinitialisation des options</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="-323"/>
<source>&amp;Network</source>
<translation>&amp;Réseau</translation>
</message>
@@ -1276,32 +1333,17 @@ Adresse : %4
<translation>Mapper le port avec l&apos;&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>Connexion au réseau Bitcoin à travers un serveur mandataire SOCKS (par ex. lors d&apos;une connexion via Tor).</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>&amp;Connect through SOCKS proxy:</source>
- <translation>&amp;Connexion à travers un serveur mandataire SOCKS :</translation>
- </message>
- <message>
- <location line="+9"/>
+ <location line="+19"/>
<source>Proxy &amp;IP:</source>
<translation>&amp;IP du serveur mandataire :</translation>
</message>
<message>
- <location line="+19"/>
- <source>IP address of the proxy (e.g. 127.0.0.1)</source>
- <translation>Adresse IP du serveur mandataire (par ex. 127.0.0.1)</translation>
- </message>
- <message>
- <location line="+7"/>
+ <location line="+32"/>
<source>&amp;Port:</source>
<translation>&amp;Port :</translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+25"/>
<source>Port of the proxy (e.g. 9050)</source>
<translation>Port du serveur mandataire (par ex. 9050)</translation>
</message>
@@ -1386,7 +1428,7 @@ Adresse : %4
<translation>Afficher les fonctions de &amp;contrôle des pièces (experts seulement)</translation>
</message>
<message>
- <location line="+71"/>
+ <location line="+136"/>
<source>&amp;OK</source>
<translation>&amp;OK</translation>
</message>
@@ -1396,44 +1438,38 @@ Adresse : %4
<translation>A&amp;nnuler</translation>
</message>
<message>
- <location line="+10"/>
- <source>&amp;Apply</source>
- <translation>&amp;Appliquer</translation>
- </message>
- <message>
- <location filename="../optionsdialog.cpp" line="+63"/>
+ <location filename="../optionsdialog.cpp" line="+67"/>
<source>default</source>
<translation>par défaut</translation>
</message>
<message>
- <location line="+131"/>
+ <location line="+57"/>
+ <source>none</source>
+ <translation>aucune</translation>
+ </message>
+ <message>
+ <location line="+75"/>
<source>Confirm options reset</source>
<translation>Confirmer la réinitialisation des options</translation>
</message>
<message>
<location line="+1"/>
- <source>Some settings may require a client restart to take effect.</source>
- <translation>La prise en compte de certains réglages peut nécessiter un redémarrage du client.</translation>
+ <location line="+29"/>
+ <source>Client restart required to activate changes.</source>
+ <translation>Le redémarrage du client est nécessaire pour activer les changements.</translation>
</message>
<message>
- <location line="+0"/>
- <source>Do you want to proceed?</source>
- <translation>Voulez-vous continuer ?</translation>
+ <location line="-29"/>
+ <source>Client will be shutdown, do you want to proceed?</source>
+ <translation>Le client sera arrêté, voulez-vous continuer?</translation>
</message>
<message>
- <location line="+42"/>
- <location line="+9"/>
- <source>Warning</source>
- <translation>Avertissement</translation>
+ <location line="+33"/>
+ <source>This change would require a client restart.</source>
+ <translation>Ce changement nécessite un redémarrage du client.</translation>
</message>
<message>
- <location line="-9"/>
- <location line="+9"/>
- <source>This setting will take effect after restarting Bitcoin.</source>
- <translation>Ce réglage sera pris en compte après un redémarrage de Bitcoin.</translation>
- </message>
- <message>
- <location line="+29"/>
+ <location line="+34"/>
<source>The supplied proxy address is invalid.</source>
<translation>L&apos;adresse de serveur mandataire fournie est invalide.</translation>
</message>
@@ -1447,22 +1483,22 @@ Adresse : %4
</message>
<message>
<location line="+50"/>
- <location line="+214"/>
+ <location line="+231"/>
<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 portefeuille 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="-140"/>
+ <location line="-155"/>
<source>Unconfirmed:</source>
<translation>Non confirmé :</translation>
</message>
<message>
- <location line="-81"/>
+ <location line="-83"/>
<source>Wallet</source>
<translation>Portefeuille</translation>
</message>
<message>
- <location line="+49"/>
+ <location line="+51"/>
<source>Confirmed:</source>
<translation>Confirmé :</translation>
</message>
@@ -1497,7 +1533,7 @@ Adresse : %4
<translation>Votre solde total actuel</translation>
</message>
<message>
- <location line="+56"/>
+ <location line="+71"/>
<source>&lt;b&gt;Recent transactions&lt;/b&gt;</source>
<translation>&lt;b&gt;Transactions récentes&lt;/b&gt;</translation>
</message>
@@ -1511,34 +1547,63 @@ Adresse : %4
<context>
<name>PaymentServer</name>
<message>
- <location filename="../paymentserver.cpp" line="+397"/>
+ <location filename="../paymentserver.cpp" line="+403"/>
+ <location line="+13"/>
<source>URI handling</source>
<translation>Gestion des URIs</translation>
</message>
<message>
<location line="+1"/>
<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é ! Ceci peut être causé par une adresse Bitcoin invalide ou par des paramètres d&apos;URI mal formés.</translation>
+ <translation>L&apos;URI ne peut être analysé ! Ceci peut être causé par une adresse Bitcoin invalide ou par des paramètres d&apos;URI mal composé.</translation>
</message>
<message>
- <location line="+91"/>
+ <location line="+96"/>
<source>Requested payment amount of %1 is too small (considered dust).</source>
<translation>Le paiement demandé d&apos;un montant de %1 est trop faible (considéré comme de la poussière).</translation>
</message>
<message>
- <location line="-204"/>
- <location line="+195"/>
+ <location line="-221"/>
+ <location line="+212"/>
<location line="+13"/>
+ <location line="+95"/>
+ <location line="+18"/>
+ <location line="+16"/>
<source>Payment request error</source>
<translation>Erreur de demande de paiement</translation>
</message>
<message>
- <location line="-207"/>
+ <location line="-353"/>
<source>Cannot start bitcoin: click-to-pay handler</source>
<translation>Impossible de démarrer le gestionnaire de cliquer-pour-payer bitcoin :</translation>
</message>
<message>
- <location line="+195"/>
+ <location line="+58"/>
+ <source>Net manager warning</source>
+ <translation>Avertissement du gestionnaire de réseau</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Your active proxy doesn&apos;t support SOCKS5, which is required for payment requests via proxy.</source>
+ <translation>Votre serveur mandataire actif ne prend pas en charge SOCKS5 ce qui est exigé pour les demandes de paiements par serveur mandataire.</translation>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>Payment request fetch URL is invalid: %1</source>
+ <translation>L&apos;URL de récupération de la demande de paiement est invalide : %1</translation>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Payment request file handling</source>
+ <translation>Gestion des fichiers de demande de paiement</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Payment request file can not be read or processed! This can be caused by an invalid payment request file.</source>
+ <translation>Le fichier de demande de paiement ne peut pas être lu ou traité ! Ceci peut être causé par un fichier de demande de paiement invalide.</translation>
+ </message>
+ <message>
+ <location line="+73"/>
<source>Unverified payment requests to custom payment scripts are unsupported.</source>
<translation>Les demandes de paiements non vérifiées à des scripts de paiement personnalisés ne sont pas prises en charge.</translation>
</message>
@@ -1548,24 +1613,27 @@ Adresse : %4
<translation>Remboursement de %1</translation>
</message>
<message>
- <location line="+42"/>
+ <location line="+43"/>
<source>Error communicating with %1: %2</source>
<translation>Erreur de communication avec %1 : %2</translation>
</message>
<message>
- <location line="+28"/>
+ <location line="+24"/>
+ <source>Payment request can not be parsed or processed!</source>
+ <translation>La demande de paiement ne peut pas être analysée ou traitée !</translation>
+ </message>
+ <message>
+ <location line="+11"/>
<source>Bad response from server %1</source>
<translation>Mauvaise réponse du serveur %1</translation>
</message>
<message>
- <location line="+32"/>
+ <location line="+33"/>
<source>Payment acknowledged</source>
<translation>Le paiement a été confirmé</translation>
</message>
<message>
- <location line="-55"/>
- <location line="+27"/>
- <location line="+17"/>
+ <location line="-11"/>
<source>Network request error</source>
<translation>Erreur de demande réseau</translation>
</message>
@@ -1573,18 +1641,18 @@ Adresse : %4
<context>
<name>QObject</name>
<message>
- <location filename="../bitcoin.cpp" line="+119"/>
- <location line="+5"/>
+ <location filename="../bitcoin.cpp" line="+71"/>
+ <location line="+11"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-4"/>
+ <location line="+1"/>
<source>Error: Specified data directory &quot;%1&quot; does not exist.</source>
<translation>Erreur : le répertoire de données spécifié « %1 » n&apos;existe pas.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="-12"/>
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation>Erreur : combinaison invalide de -regtest et de -testnet.</translation>
</message>
@@ -1626,15 +1694,16 @@ Adresse : %4
<location line="+23"/>
<location line="+23"/>
<location line="+36"/>
- <location line="+53"/>
+ <location line="+23"/>
+ <location line="+36"/>
<location line="+23"/>
<location line="+23"/>
- <location filename="../rpcconsole.cpp" line="+360"/>
+ <location filename="../rpcconsole.cpp" line="+359"/>
<source>N/A</source>
<translation>N.D.</translation>
</message>
<message>
- <location line="-217"/>
+ <location line="-223"/>
<source>Client version</source>
<translation>Version du client</translation>
</message>
@@ -1649,7 +1718,12 @@ Adresse : %4
<translation>Fenêtre de débogage</translation>
</message>
<message>
- <location line="+78"/>
+ <location line="+25"/>
+ <source>General</source>
+ <translation>Général</translation>
+ </message>
+ <message>
+ <location line="+53"/>
<source>Using OpenSSL version</source>
<translation>Version d&apos;OpenSSL utilisée</translation>
</message>
@@ -1665,16 +1739,16 @@ Adresse : %4
</message>
<message>
<location line="+7"/>
- <source>Number of connections</source>
- <translation>Nombre de connexions</translation>
+ <source>Name</source>
+ <translation>Nom</translation>
</message>
<message>
<location line="+23"/>
- <source>On testnet</source>
- <translation>Sur testnet</translation>
+ <source>Number of connections</source>
+ <translation>Nombre de connexions</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+29"/>
<source>Block chain</source>
<translation>Chaîne de blocs</translation>
</message>
@@ -1699,16 +1773,6 @@ Adresse : %4
<translation>&amp;Ouvrir</translation>
</message>
<message>
- <location line="+16"/>
- <source>Command-line options</source>
- <translation>Options de ligne de commande</translation>
- </message>
- <message>
- <location line="+10"/>
- <source>&amp;Show</source>
- <translation>&amp;Afficher</translation>
- </message>
- <message>
<location line="+24"/>
<source>&amp;Console</source>
<translation>&amp;Console</translation>
@@ -1739,17 +1803,12 @@ Adresse : %4
<translation>Sortant :</translation>
</message>
<message>
- <location line="-541"/>
+ <location line="-521"/>
<source>Build date</source>
<translation>Date de compilation</translation>
</message>
<message>
- <location line="-79"/>
- <source>Bitcoin Core</source>
- <translation>Bitcoin Core</translation>
- </message>
- <message>
- <location line="+279"/>
+ <location line="+206"/>
<source>Debug log file</source>
<translation>Journal de débogage</translation>
</message>
@@ -1759,11 +1818,6 @@ Adresse : %4
<translation>Ouvrir le journal de débogage de Bitcoin depuis le répertoire de données actuel. Ceci peut prendre quelques secondes pour les journaux de grande taille.</translation>
</message>
<message>
- <location line="+26"/>
- <source>Show the Bitcoin-Core help message to get a list with possible Bitcoin command-line options.</source>
- <translation>Afficher le message d&apos;aide de Bitcoin Core pour obtenir une liste des options de ligne de commande Bitcoin possibles.</translation>
- </message>
- <message>
<location line="+76"/>
<source>Clear console</source>
<translation>Nettoyer la console</translation>
@@ -1784,7 +1838,7 @@ Adresse : %4
<translation>Taper &lt;b&gt;help&lt;/b&gt; pour afficher une vue générale des commandes disponibles.</translation>
</message>
<message>
- <location line="+128"/>
+ <location line="+122"/>
<source>%1 B</source>
<translation>%1 o</translation>
</message>
@@ -1827,12 +1881,7 @@ Adresse : %4
<translation>&amp;Montant :</translation>
</message>
<message>
- <location line="+19"/>
- <source>The amount to request</source>
- <translation>Le montant à demander</translation>
- </message>
- <message>
- <location line="-32"/>
+ <location line="-13"/>
<source>&amp;Label:</source>
<translation>&amp;Étiquette :</translation>
</message>
@@ -1842,12 +1891,7 @@ Adresse : %4
<translation>M&amp;essage :</translation>
</message>
<message>
- <location line="+20"/>
- <source>The message to attach to payment request</source>
- <translation>Le message à attacher à la demande de paiement</translation>
- </message>
- <message>
- <location line="-37"/>
+ <location line="-17"/>
<source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation>Réutilise une adresse de réception précédemment utilisée. Réutiliser une adresse pose des problèmes de sécurité et de vie privée. N&apos;utilisez pas cette option sauf si vous générez à nouveau une demande de paiement déjà faite.</translation>
</message>
@@ -1858,16 +1902,26 @@ Adresse : %4
</message>
<message>
<location line="+27"/>
- <source>The label to associate with the new receiving address</source>
- <translation>L&apos;étiquette à associer à la nouvelle adresse de réception</translation>
+ <source>An optional label to associate with the new receiving address</source>
+ <translation>Un étiquette optionnelle à associer à la nouvelle adresse de réception</translation>
</message>
<message>
- <location line="+14"/>
- <source>Use this form to request payments. All fields are optional.</source>
- <translation>Utilisez ce formulaire pour demander des paiements. Tous les champs sont optionnels.</translation>
+ <location line="+7"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
+ <translation>Un message optionnel à joindre à la demande de paiement qui sera affiché à l&apos;ouverture de celle-ci. Note : le message ne sera pas envoyé avec le paiement par le réseau Bitcoin.</translation>
</message>
<message>
- <location line="+56"/>
+ <location line="+7"/>
+ <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
+ <translation>Utiliser ce formulaire pour demander des paiements. Tous les champs sont &lt;b&gt;optionnels&lt;/b&gt;.</translation>
+ </message>
+ <message>
+ <location line="+39"/>
+ <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
+ <translation>Un montant optionnel à demander. Laisser ceci vide ou à zéro pour ne pas demander de montant spécifique.</translation>
+ </message>
+ <message>
+ <location line="+17"/>
<source>Clear all fields of the form.</source>
<translation>Effacer tous les champs du formulaire.</translation>
</message>
@@ -1883,11 +1937,11 @@ Adresse : %4
</message>
<message>
<location line="+47"/>
- <source>Previously requested payments</source>
- <translation>Paiements demandés précédemment</translation>
+ <source>Requested payments</source>
+ <translation>Paiements demandés</translation>
</message>
<message>
- <location line="+12"/>
+ <location line="+16"/>
<source>Show the selected request (does the same as double clicking an entry)</source>
<translation>Afficher la demande choisie (identique à un double-clic sur une entrée)</translation>
</message>
@@ -1978,7 +2032,7 @@ Adresse : %4
<context>
<name>RecentRequestsTableModel</name>
<message>
- <location filename="../recentrequeststablemodel.cpp" line="+14"/>
+ <location filename="../recentrequeststablemodel.cpp" line="+24"/>
<source>Date</source>
<translation>Date</translation>
</message>
@@ -1998,7 +2052,7 @@ Adresse : %4
<translation>Montant</translation>
</message>
<message>
- <location line="+36"/>
+ <location line="+38"/>
<source>(no label)</source>
<translation>(pas d&apos;étiquette)</translation>
</message>
@@ -2013,7 +2067,7 @@ Adresse : %4
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
<location filename="../sendcoinsdialog.cpp" line="+381"/>
- <location line="+81"/>
+ <location line="+80"/>
<source>Send Coins</source>
<translation>Envoyer des pièces</translation>
</message>
@@ -2123,7 +2177,7 @@ Adresse : %4
<translation>E&amp;nvoyer</translation>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-229"/>
+ <location filename="../sendcoinsdialog.cpp" line="-228"/>
<source>Confirm send coins</source>
<translation>Confirmer l’envoi des pièces</translation>
</message>
@@ -2226,22 +2280,22 @@ Adresse : %4
<translation>La transaction a été rejetée ! Ceci peut arriver si certaines pièces de votre portefeuille étaient déjà dépensées, par exemple si vous avez utilisé une copie de wallet.dat et que des pièces ont été dépensées dans la copie sans être marquées comme telles ici.</translation>
</message>
<message>
- <location line="+113"/>
+ <location line="+112"/>
<source>Warning: Invalid Bitcoin address</source>
<translation>Attention : adresse Bitcoin invalide</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+21"/>
<source>(no label)</source>
<translation>(pas d&apos;étiquette)</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="-11"/>
<source>Warning: Unknown change address</source>
<translation>Attention : adresse de monnaie rendue inconnue</translation>
</message>
<message>
- <location line="-378"/>
+ <location line="-366"/>
<source>Are you sure you want to send?</source>
<translation>Êtes-vous sûr de vouloir envoyer ?</translation>
</message>
@@ -2265,13 +2319,13 @@ Adresse : %4
<name>SendCoinsEntry</name>
<message>
<location filename="../forms/sendcoinsentry.ui" line="+131"/>
- <location line="+501"/>
+ <location line="+521"/>
<location line="+536"/>
<source>A&amp;mount:</source>
<translation>&amp;Montant :</translation>
</message>
<message>
- <location line="-1132"/>
+ <location line="-1152"/>
<source>Pay &amp;To:</source>
<translation>&amp;Payer à :</translation>
</message>
@@ -2317,23 +2371,33 @@ Adresse : %4
</message>
<message>
<location line="+7"/>
- <location line="+504"/>
+ <location line="+524"/>
<location line="+536"/>
<source>Remove this entry</source>
<translation>Enlever cette entrée</translation>
</message>
<message>
- <location line="-40"/>
+ <location line="-1008"/>
+ <source>Message:</source>
+ <translation>Message :</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation>Un message qui était joint à l&apos;URI Bitcoin et qui sera stocké avec la transaction pour référence. Note : ce message ne sera pas envoyé par le réseau Bitcoin.</translation>
+ </message>
+ <message>
+ <location line="+958"/>
<source>This is a verified payment request.</source>
<translation>Ceci est une demande de paiement vérifiée.</translation>
</message>
<message>
- <location line="-971"/>
+ <location line="-991"/>
<source>Enter a label for this address to add it to the list of used addresses</source>
<translation>Saisir une étiquette pour cette adresse afin de l&apos;ajouter à la liste d&apos;adresses utilisées</translation>
</message>
<message>
- <location line="+439"/>
+ <location line="+459"/>
<source>This is an unverified payment request.</source>
<translation>Ceci est une demande de paiement non vérifiée.</translation>
</message>
@@ -2356,6 +2420,19 @@ Adresse : %4
</message>
</context>
<context>
+ <name>ShutdownWindow</name>
+ <message>
+ <location filename="../utilitydialog.cpp" line="+48"/>
+ <source>Bitcoin Core is shutting down...</source>
+ <translation>Arrêt de Bitcoin Core...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Do not shut down the computer until this window disappears.</source>
+ <translation>Ne pas fermer l&apos;ordinateur jusqu&apos;à la disparition de cette fenêtre.</translation>
+ </message>
+</context>
+<context>
<name>SignVerifyMessageDialog</name>
<message>
<location filename="../forms/signverifymessagedialog.ui" line="+14"/>
@@ -2363,7 +2440,7 @@ Adresse : %4
<translation>Signatures - Signer / Vérifier un message</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+10"/>
<source>&amp;Sign Message</source>
<translation>&amp;Signer un message</translation>
</message>
@@ -2551,7 +2628,7 @@ Adresse : %4
<context>
<name>SplashScreen</name>
<message>
- <location filename="../splashscreen.cpp" line="+26"/>
+ <location filename="../splashscreen.cpp" line="+28"/>
<source>Bitcoin Core</source>
<translation>Bitcoin Core</translation>
</message>
@@ -2650,12 +2727,12 @@ Adresse : %4
<location line="+12"/>
<location line="+45"/>
<location line="+17"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Credit</source>
<translation>Crédit</translation>
</message>
<message numerus="yes">
- <location line="-120"/>
+ <location line="-125"/>
<source>matures in %n more block(s)</source>
<translation><numerusform>arrive à maturité dans %n bloc de plus</numerusform><numerusform>arrive à maturité dans %n blocs de plus</numerusform></translation>
</message>
@@ -2668,12 +2745,12 @@ Adresse : %4
<location line="+44"/>
<location line="+8"/>
<location line="+15"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Debit</source>
<translation>Débit</translation>
</message>
<message>
- <location line="-57"/>
+ <location line="-62"/>
<source>Transaction fee</source>
<translation>Frais de transaction</translation>
</message>
@@ -2684,11 +2761,12 @@ Adresse : %4
</message>
<message>
<location line="+6"/>
+ <location line="+9"/>
<source>Message</source>
<translation>Message</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="-7"/>
<source>Comment</source>
<translation>Commentaire</translation>
</message>
@@ -2698,7 +2776,7 @@ Adresse : %4
<translation>ID de la transaction</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+18"/>
<source>Merchant</source>
<translation>Marchand</translation>
</message>
@@ -2738,7 +2816,7 @@ Adresse : %4
<translation>faux</translation>
</message>
<message>
- <location line="-227"/>
+ <location line="-232"/>
<source>, has not been successfully broadcast yet</source>
<translation>, n’a pas encore été diffusée avec succès</translation>
</message>
@@ -2788,8 +2866,13 @@ Adresse : %4
<source>Amount</source>
<translation>Montant</translation>
</message>
+ <message>
+ <location line="+59"/>
+ <source>Immature (%1 confirmations, will be available after %2)</source>
+ <translation>Immature (%1 confirmations, sera disponible après %2)</translation>
+ </message>
<message numerus="yes">
- <location line="+57"/>
+ <location line="+16"/>
<source>Open for %n more block(s)</source>
<translation><numerusform>Ouvert pour %n bloc de plus</numerusform><numerusform>Ouvert pour %n blocs de plus</numerusform></translation>
</message>
@@ -2809,17 +2892,13 @@ Adresse : %4
<translation>Non confirmée (%1 confirmations sur %2)</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="-22"/>
+ <location line="+25"/>
<source>Confirmed (%1 confirmations)</source>
<translation>Confirmée (%1 confirmations)</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>Le solde généré (mined) sera disponible quand il aura mûri dans %n bloc</numerusform><numerusform>Le solde extrait sera disponible quand il aura mûri dans %n blocs</numerusform></translation>
- </message>
<message>
- <location line="+5"/>
+ <location line="-22"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation>Ce bloc n’a été reçu par aucun autre nœud et ne sera probablement pas accepté !</translation>
</message>
@@ -2829,7 +2908,7 @@ Adresse : %4
<translation>Généré mais pas accepté</translation>
</message>
<message>
- <location line="+43"/>
+ <location line="+62"/>
<source>Received with</source>
<translation>Reçue avec</translation>
</message>
@@ -3125,7 +3204,7 @@ Adresse : %4
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+217"/>
+ <location filename="../bitcoinstrings.cpp" line="+221"/>
<source>Usage:</source>
<translation>Utilisation :</translation>
</message>
@@ -3145,7 +3224,7 @@ Adresse : %4
<translation>Options :</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+22"/>
<source>Specify configuration file (default: bitcoin.conf)</source>
<translation>Spécifier le fichier de configuration (par défaut : bitcoin.conf)</translation>
</message>
@@ -3165,7 +3244,7 @@ Adresse : %4
<translation>Définir la taille du tampon en mégaoctets (par défaut : 25)</translation>
</message>
<message>
- <location line="-27"/>
+ <location line="-26"/>
<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>
@@ -3175,7 +3254,7 @@ Adresse : %4
<translation>Garder au plus &lt;n&gt; connexions avec les pairs (par défaut : 125)</translation>
</message>
<message>
- <location line="-50"/>
+ <location line="-51"/>
<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>
@@ -3185,22 +3264,22 @@ Adresse : %4
<translation>Spécifier votre propre adresse publique</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<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="-147"/>
+ <location line="-148"/>
<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="-33"/>
+ <location line="-36"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
<translation>Une erreur est survenue lors du réglage du port RPC %u pour écouter sur IPv4 : %s</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<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>
@@ -3210,7 +3289,7 @@ Adresse : %4
<translation>Accepter les commandes de JSON-RPC et de la ligne de commande</translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<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>
@@ -3220,12 +3299,12 @@ Adresse : %4
<translation>Utiliser le réseau de test</translation>
</message>
<message>
- <location line="-117"/>
+ <location line="-118"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation>Accepter les connexions entrantes (par défaut : 1 si aucun -proxy ou -connect )</translation>
</message>
<message>
- <location line="-92"/>
+ <location line="-95"/>
<source>%s, you must set a rpcpassword in the configuration file:
%s
It is recommended you use the following random password:
@@ -3276,6 +3355,11 @@ par exemple : alertnotify=echo %%s | mail -s &quot;Alerte Bitcoin&quot; admin@fo
</message>
<message>
<location line="+4"/>
+ <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</source>
+ <translation>Passer en mode de test de régression qui utilise une chaîne spéciale dans laquelle les blocs sont résolus instantanément.</translation>
+ </message>
+ <message>
+ <location line="+3"/>
<source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
<translation>Erreur : La transaction a été rejetée ! Ceci peut arriver si certaines pièces de votre portefeuille étaient déjà dépensées, par exemple si vous avez utilisé une copie de wallet.dat et les pièces ont été dépensées avec cette copie sans être marquées comme tel ici.</translation>
</message>
@@ -3381,6 +3465,11 @@ par exemple : alertnotify=echo %%s | mail -s &quot;Alerte Bitcoin&quot; admin@fo
</message>
<message>
<location line="+1"/>
+ <source>Do not load the wallet and disable wallet RPC calls</source>
+ <translation>Ne pas charger le portefeuille et désactiver les appels RPC</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>
@@ -3545,7 +3634,7 @@ par exemple : alertnotify=echo %%s | mail -s &quot;Alerte Bitcoin&quot; admin@fo
<translation>Envoyer une commande au serveur Bitcoin</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+7"/>
<source>Set maximum block size in bytes (default: %d)</source>
<translation>Définir la taille minimale de bloc en octets (par défaut : %d)</translation>
</message>
@@ -3565,7 +3654,12 @@ par exemple : alertnotify=echo %%s | mail -s &quot;Alerte Bitcoin&quot; admin@fo
<translation>Démarrer le serveur Bitcoin</translation>
</message>
<message>
- <location line="+12"/>
+ <location line="+3"/>
+ <source>This is intended for regression testing tools and app development.</source>
+ <translation>Ceci est à l&apos;intention des outils de test de régression et du développement applicatif.</translation>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Usage (deprecated, use bitcoin-cli):</source>
<translation>Utilisation (obsolète, utiliser bitcoin-cli) :</translation>
</message>
@@ -3590,7 +3684,12 @@ par exemple : alertnotify=echo %%s | mail -s &quot;Alerte Bitcoin&quot; admin@fo
<translation>Le portefeuille %s réside en dehors du répertoire de données %s</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="+2"/>
+ <source>Wallet options:</source>
+ <translation>Options du portefeuille :</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source>
<translation>Attention : l&apos;argument obsolète -debugnet a été ignoré, utiliser -debug=net</translation>
</message>
@@ -3600,12 +3699,12 @@ par exemple : alertnotify=echo %%s | mail -s &quot;Alerte Bitcoin&quot; admin@fo
<translation>Vous devez reconstruire la base de données en utilisant -reindex afin de modifier -txindex</translation>
</message>
<message>
- <location line="-78"/>
+ <location line="-79"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation>Importe des blocs depuis un fichier blk000??.dat externe</translation>
</message>
<message>
- <location line="-104"/>
+ <location line="-105"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation>Exécuter une commande lorsqu&apos;une alerte pertinente est reçue ou si nous voyons une bifurcation vraiment étendue (%s dans la commande est remplacé par le message)</translation>
</message>
@@ -3625,7 +3724,7 @@ par exemple : alertnotify=echo %%s | mail -s &quot;Alerte Bitcoin&quot; admin@fo
<translation>Définir le nombre d&apos;exétrons de vérification des scripts (maximum 16, 0 = auto, &lt; 0 = laisser ce nombre de cœurs libres, par défaut : 0)</translation>
</message>
<message>
- <location line="+88"/>
+ <location line="+89"/>
<source>Information</source>
<translation>Informations</translation>
</message>
@@ -3675,11 +3774,6 @@ par exemple : alertnotify=echo %%s | mail -s &quot;Alerte Bitcoin&quot; admin@fo
<translation>Envoyer les informations de débogage/trace à la console au lieu du fichier debug.log</translation>
</message>
<message>
- <location line="+1"/>
- <source>Send trace/debug info to debugger</source>
- <translation>Envoyer les informations de débogage/trace au débogueur</translation>
- </message>
- <message>
<location line="+6"/>
<source>Set minimum block size in bytes (default: 0)</source>
<translation>Définir la taille minimale de bloc en octets (par défaut : 0)</translation>
@@ -3705,7 +3799,7 @@ par exemple : alertnotify=echo %%s | mail -s &quot;Alerte Bitcoin&quot; admin@fo
<translation>Erreur système :</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Transaction amount too small</source>
<translation>Montant de la transaction trop bas</translation>
</message>
@@ -3735,7 +3829,7 @@ par exemple : alertnotify=echo %%s | mail -s &quot;Alerte Bitcoin&quot; admin@fo
<translation>Nom d&apos;utilisateur pour les connexions JSON-RPC</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Warning</source>
<translation>Avertissement</translation>
</message>
@@ -3755,37 +3849,37 @@ par exemple : alertnotify=echo %%s | mail -s &quot;Alerte Bitcoin&quot; admin@fo
<translation>wallet.dat corrompu, la récupération a échoué</translation>
</message>
<message>
- <location line="-57"/>
+ <location line="-58"/>
<source>Password for JSON-RPC connections</source>
<translation>Mot de passe pour les connexions JSON-RPC</translation>
</message>
<message>
- <location line="-69"/>
+ <location line="-70"/>
<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="+79"/>
+ <location line="+80"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation>Envoyer des commandes au nœud fonctionnant sur &lt;ip&gt; (par défaut : 127.0.0.1)</translation>
</message>
<message>
- <location line="-131"/>
+ <location line="-132"/>
<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 dans cmd est remplacé par le hachage du bloc)</translation>
</message>
<message>
- <location line="+160"/>
+ <location line="+161"/>
<source>Upgrade wallet to latest format</source>
<translation>Mettre à niveau le portefeuille vers le format le plus récent</translation>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation>Régler la taille de la réserve de clefs sur &lt;n&gt; (par défaut : 100)</translation>
</message>
<message>
- <location line="-12"/>
+ <location line="-11"/>
<source>Rescan the block chain for missing wallet transactions</source>
<translation>Réanalyser la chaîne de blocs pour les transactions de portefeuille manquantes</translation>
</message>
@@ -3795,7 +3889,7 @@ par exemple : alertnotify=echo %%s | mail -s &quot;Alerte Bitcoin&quot; admin@fo
<translation>Utiliser OpenSSL (https) pour les connexions JSON-RPC</translation>
</message>
<message>
- <location line="-29"/>
+ <location line="-30"/>
<source>Server certificate file (default: server.cert)</source>
<translation>Fichier de certificat serveur (par défaut : server.cert)</translation>
</message>
@@ -3810,17 +3904,17 @@ par exemple : alertnotify=echo %%s | mail -s &quot;Alerte Bitcoin&quot; admin@fo
<translation>Ce message d&apos;aide</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Unable to bind to %s on this computer (bind returned error %d, %s)</source>
<translation>Impossible de se lier à %s sur cet ordinateur (bind a retourné l&apos;erreur %d, %s)</translation>
</message>
<message>
- <location line="-106"/>
+ <location line="-107"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation>Autoriser les recherches DNS pour -addnode, -seednode et -connect</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+60"/>
<source>Loading addresses...</source>
<translation>Chargement des adresses…</translation>
</message>
@@ -3860,7 +3954,7 @@ par exemple : alertnotify=echo %%s | mail -s &quot;Alerte Bitcoin&quot; admin@fo
<translation>Version inconnue de serveur mandataire -socks demandée : %i</translation>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation>Impossible de résoudre l&apos;adresse -bind : « %s »</translation>
</message>
@@ -3870,7 +3964,7 @@ par exemple : alertnotify=echo %%s | mail -s &quot;Alerte Bitcoin&quot; admin@fo
<translation>Impossible de résoudre l&apos;adresse -externalip : « %s »</translation>
</message>
<message>
- <location line="+47"/>
+ <location line="+48"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation>Montant invalide pour -paytxfee=&lt;montant&gt; : « %s »</translation>
</message>
@@ -3890,7 +3984,7 @@ par exemple : alertnotify=echo %%s | mail -s &quot;Alerte Bitcoin&quot; admin@fo
<translation>Chargement de l’index des blocs…</translation>
</message>
<message>
- <location line="-61"/>
+ <location line="-62"/>
<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>
@@ -3900,12 +3994,12 @@ par exemple : alertnotify=echo %%s | mail -s &quot;Alerte Bitcoin&quot; admin@fo
<translation>Impossible de se lier à %s sur cet ordinateur. Bitcoin fonctionne probablement déjà.</translation>
</message>
<message>
- <location line="+94"/>
+ <location line="+95"/>
<source>Loading wallet...</source>
<translation>Chargement du portefeuille…</translation>
</message>
<message>
- <location line="-55"/>
+ <location line="-56"/>
<source>Cannot downgrade wallet</source>
<translation>Impossible de revenir à une version inférieure du portefeuille</translation>
</message>
@@ -3915,7 +4009,7 @@ par exemple : alertnotify=echo %%s | mail -s &quot;Alerte Bitcoin&quot; admin@fo
<translation>Impossible d&apos;écrire l&apos;adresse par défaut</translation>
</message>
<message>
- <location line="+66"/>
+ <location line="+67"/>
<source>Rescanning...</source>
<translation>Nouvelle analyse…</translation>
</message>
@@ -3935,7 +4029,7 @@ par exemple : alertnotify=echo %%s | mail -s &quot;Alerte Bitcoin&quot; admin@fo
<translation>Erreur</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-35"/>
<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 7fa6337485..71de06dea0 100644
--- a/src/qt/locale/bitcoin_fr_CA.ts
+++ b/src/qt/locale/bitcoin_fr_CA.ts
@@ -3,13 +3,13 @@
<name>AboutDialog</name>
<message>
<location filename="../forms/aboutdialog.ui" line="+14"/>
- <source>About Bitcoin</source>
- <translation>A propos de Bitcoin</translation>
+ <source>About Bitcoin Core</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+39"/>
- <source>&lt;b&gt;Bitcoin&lt;/b&gt; version</source>
- <translation>&lt;b&gt;Bitcoin&lt;/b&gt; version</translation>
+ <source>&lt;b&gt;Bitcoin Core&lt;/b&gt; version</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+57"/>
@@ -27,13 +27,13 @@ Distribué sous licence MIT/X11, voir le fichier COPYING ou http://www.opensourc
Ce produit comprend des logiciels développés par le projet OpenSSL pour être utilisés dans la boîte à outils OpenSSL (http://www.openssl.org/), un logiciel cryptographique écrit par Eric Young (eay@cryptsoft.com) et un logiciel UPnP écrit par Thomas Bernard.</translation>
</message>
<message>
- <location filename="../aboutdialog.cpp" line="+14"/>
+ <location filename="../utilitydialog.cpp" line="+29"/>
<source>Copyright</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+0"/>
- <source>The Bitcoin developers</source>
+ <source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
</context>
@@ -70,7 +70,7 @@ Ce produit comprend des logiciels développés par le projet OpenSSL pour être
<translation type="unfinished"/>
</message>
<message>
- <location filename="../addressbookpage.cpp" line="+72"/>
+ <location filename="../addressbookpage.cpp" line="+74"/>
<source>&amp;Copy Address</source>
<translation type="unfinished"/>
</message>
@@ -140,7 +140,7 @@ Ce produit comprend des logiciels développés par le projet OpenSSL pour être
<translation type="unfinished"/>
</message>
<message>
- <location line="+197"/>
+ <location line="+194"/>
<source>Export Address List</source>
<translation type="unfinished"/>
</message>
@@ -151,19 +151,19 @@ Ce produit comprend des logiciels développés par le projet OpenSSL pour être
</message>
<message>
<location line="+13"/>
- <source>Error exporting</source>
+ <source>Exporting Failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
+ <location line="+1"/>
+ <source>There was an error trying to save the address list to %1.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>AddressTableModel</name>
<message>
- <location filename="../addresstablemodel.cpp" line="+164"/>
+ <location filename="../addresstablemodel.cpp" line="+168"/>
<source>Label</source>
<translation type="unfinished"/>
</message>
@@ -201,7 +201,7 @@ Ce produit comprend des logiciels développés par le projet OpenSSL pour être
<translation type="unfinished"/>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="+34"/>
+ <location filename="../askpassphrasedialog.cpp" line="+40"/>
<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>
@@ -322,22 +322,27 @@ Ce produit comprend des logiciels développés par le projet OpenSSL pour être
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+250"/>
+ <location filename="../bitcoingui.cpp" line="+295"/>
<source>Sign &amp;message...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+254"/>
+ <location line="+335"/>
<source>Synchronizing with network...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-324"/>
+ <location line="-407"/>
<source>&amp;Overview</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="-137"/>
+ <source>Node</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+138"/>
<source>Show general overview of wallet</source>
<translation type="unfinished"/>
</message>
@@ -352,7 +357,7 @@ Ce produit comprend des logiciels développés par le projet OpenSSL pour être
<translation type="unfinished"/>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>E&amp;xit</source>
<translation type="unfinished"/>
</message>
@@ -398,7 +403,22 @@ Ce produit comprend des logiciels développés par le projet OpenSSL pour être
<translation type="unfinished"/>
</message>
<message>
- <location line="+259"/>
+ <location line="+10"/>
+ <source>&amp;Sending addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Receiving addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open &amp;URI...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+325"/>
<source>Importing blocks from disk...</source>
<translation type="unfinished"/>
</message>
@@ -408,12 +428,12 @@ Ce produit comprend des logiciels développés par le projet OpenSSL pour être
<translation type="unfinished"/>
</message>
<message>
- <location line="-322"/>
+ <location line="-405"/>
<source>Send coins to a Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+47"/>
+ <location line="+49"/>
<source>Modify configuration options for Bitcoin</source>
<translation type="unfinished"/>
</message>
@@ -443,20 +463,17 @@ Ce produit comprend des logiciels développés par le projet OpenSSL pour être
<translation type="unfinished"/>
</message>
<message>
- <location line="-180"/>
- <location line="+6"/>
- <location line="+513"/>
+ <location line="+430"/>
<source>Bitcoin</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-519"/>
- <location line="+6"/>
+ <location line="-643"/>
<source>Wallet</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+109"/>
+ <location line="+146"/>
<source>&amp;Send</source>
<translation type="unfinished"/>
</message>
@@ -466,13 +483,7 @@ Ce produit comprend des logiciels développés par le projet OpenSSL pour être
<translation type="unfinished"/>
</message>
<message>
- <location line="+28"/>
- <location line="+2"/>
- <source>&amp;About Bitcoin</source>
- <translation>&amp;A propos de Bitcoin</translation>
- </message>
- <message>
- <location line="+14"/>
+ <location line="+46"/>
<location line="+2"/>
<source>&amp;Show / Hide</source>
<translation type="unfinished"/>
@@ -498,64 +509,80 @@ Ce produit comprend des logiciels développés par le projet OpenSSL pour être
<translation type="unfinished"/>
</message>
<message>
- <location line="+35"/>
+ <location line="+48"/>
<source>&amp;File</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
+ <location line="+14"/>
<source>&amp;Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>&amp;Help</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+9"/>
+ <location line="+15"/>
<source>Tabs toolbar</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-235"/>
- <location line="+294"/>
+ <location line="-284"/>
+ <location line="+376"/>
<source>[testnet]</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-177"/>
+ <location line="-401"/>
+ <source>Bitcoin Core</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+163"/>
<source>Request payments (generates QR codes and bitcoin: URIs)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+63"/>
- <source>&amp;Used sending addresses...</source>
+ <location line="+29"/>
+ <location line="+2"/>
+ <source>&amp;About Bitcoin Core</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="+35"/>
<source>Show the list of used sending addresses and labels</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Used &amp;receiving addresses...</source>
+ <location line="+2"/>
+ <source>Show the list of used receiving addresses and labels</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open a bitcoin: URI or payment request</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Command-line options</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
- <source>Show the list of used receiving addresses and labels</source>
+ <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+106"/>
+ <location line="+159"/>
<location line="+5"/>
<source>Bitcoin client</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+120"/>
+ <location line="+142"/>
<source>%n active connection(s) to Bitcoin network</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -575,7 +602,7 @@ Ce produit comprend des logiciels développés par le projet OpenSSL pour être
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+20"/>
+ <location line="+23"/>
<source>%n hour(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -595,7 +622,7 @@ Ce produit comprend des logiciels développés par le projet OpenSSL pour être
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
+ <location line="+21"/>
<source>Last received block was generated %1 ago.</source>
<translation type="unfinished"/>
</message>
@@ -620,27 +647,17 @@ Ce produit comprend des logiciels développés par le projet OpenSSL pour être
<translation type="unfinished"/>
</message>
<message>
- <location line="+77"/>
- <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="-152"/>
+ <location line="-85"/>
<source>Up to date</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Catching up...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+124"/>
- <source>Confirm transaction fee</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+130"/>
<source>Sent transaction</source>
<translation type="unfinished"/>
</message>
@@ -659,17 +676,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+34"/>
- <source>URI handling</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+0"/>
- <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="+45"/>
+ <location line="+69"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation type="unfinished"/>
</message>
@@ -679,7 +686,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+110"/>
+ <location filename="../bitcoin.cpp" line="+438"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation type="unfinished"/>
</message>
@@ -687,12 +694,304 @@ Address: %4
<context>
<name>ClientModel</name>
<message>
- <location filename="../clientmodel.cpp" line="+115"/>
+ <location filename="../clientmodel.cpp" line="+119"/>
<source>Network Alert</source>
<translation type="unfinished"/>
</message>
</context>
<context>
+ <name>CoinControlDialog</name>
+ <message>
+ <location filename="../forms/coincontroldialog.ui" line="+14"/>
+ <source>Coin Control Address Selection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>Quantity:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Bytes:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>Amount:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Priority:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Low Output:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>After Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Change:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+63"/>
+ <source>(un)select all</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Tree mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>List mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>Amount</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Date</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Confirmations</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Confirmed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../coincontroldialog.cpp" line="+42"/>
+ <source>Copy address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy label</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+26"/>
+ <source>Copy amount</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-25"/>
+ <source>Copy transaction ID</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Lock unspent</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Unlock unspent</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+22"/>
+ <source>Copy quantity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Copy fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy after fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy bytes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy low output</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy change</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+323"/>
+ <source>highest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>higher</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>high</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>medium-high</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>medium</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>low-medium</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>low</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>lower</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>lowest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>(%1 locked)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+140"/>
+ <source>Dust</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>yes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>no</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>This label turns red, if the transaction size is greater than 1000 bytes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+5"/>
+ <source>This means a fee of at least %1 per kB is required.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-4"/>
+ <source>Can vary +/- 1 byte per input.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Transactions with higher priority are more likely to get included into a block.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>This label turns red, if the priority is smaller than &quot;medium&quot;.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>This label turns red, if any recipient receives an amount smaller than %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+4"/>
+ <source>This means a fee of at least %1 is required.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-3"/>
+ <source>Amounts below 0.546 times the minimum relay fee are shown as dust.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>This label turns red, if the change is smaller than %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
+ <location line="+66"/>
+ <source>(no label)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-9"/>
+ <source>change from %1 (%2)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>(change)</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>EditAddressDialog</name>
<message>
<location filename="../forms/editaddressdialog.ui" line="+14"/>
@@ -720,7 +1019,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+21"/>
+ <location filename="../editaddressdialog.cpp" line="+28"/>
<source>New receiving address</source>
<translation type="unfinished"/>
</message>
@@ -763,7 +1062,7 @@ Address: %4
<context>
<name>FreespaceChecker</name>
<message>
- <location filename="../intro.cpp" line="+61"/>
+ <location filename="../intro.cpp" line="+65"/>
<source>A new data directory will be created.</source>
<translation type="unfinished"/>
</message>
@@ -789,15 +1088,19 @@ Address: %4
</message>
</context>
<context>
- <name>GUIUtil::HelpMessageBox</name>
+ <name>HelpMessageDialog</name>
<message>
- <location filename="../guiutil.cpp" line="+558"/>
- <location line="+13"/>
- <source>Bitcoin-Qt</source>
+ <location filename="../forms/helpmessagedialog.ui" line="+19"/>
+ <source>Bitcoin Core - Command-line options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-13"/>
+ <location filename="../utilitydialog.cpp" line="+38"/>
+ <source>Bitcoin Core</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
<source>version</source>
<translation type="unfinished"/>
</message>
@@ -846,17 +1149,17 @@ Address: %4
</message>
<message>
<location line="+9"/>
- <source>Welcome to Bitcoin-Qt.</source>
+ <source>Welcome to Bitcoin Core.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+26"/>
- <source>As this is the first time the program is launched, you can choose where Bitcoin-Qt will store its data.</source>
+ <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+10"/>
- <source>Bitcoin-Qt will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
+ <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -870,7 +1173,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../intro.cpp" line="+105"/>
+ <location filename="../intro.cpp" line="+85"/>
+ <source>Bitcoin</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error: Specified data directory &quot;%1&quot; can not be created.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+19"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
@@ -886,6 +1199,34 @@ Address: %4
</message>
</context>
<context>
+ <name>OpenURIDialog</name>
+ <message>
+ <location filename="../forms/openuridialog.ui" line="+14"/>
+ <source>Open URI</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Open payment request from URI or file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>URI:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Select payment request file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../openuridialog.cpp" line="+47"/>
+ <source>Select payment request file to open</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OptionsDialog</name>
<message>
<location filename="../forms/optionsdialog.ui" line="+14"/>
@@ -893,7 +1234,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+13"/>
<source>&amp;Main</source>
<translation type="unfinished"/>
</message>
@@ -918,57 +1259,87 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+35"/>
- <source>Reset all client options to default.</source>
+ <location line="+9"/>
+ <source>Size of &amp;database cache</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>&amp;Reset Options</source>
+ <location line="+13"/>
+ <source>Set database cache size in megabytes (default: 25)</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+13"/>
- <source>&amp;Network</source>
+ <source>MB</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>
+ <location line="+27"/>
+ <source>Number of script &amp;verification threads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Connect to the Bitcoin network through a SOCKS proxy.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
- <source>Map port using &amp;UPnP</source>
+ <source>&amp;Connect through SOCKS proxy (default proxy):</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>
+ <location line="+34"/>
+ <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+224"/>
+ <source>Active command-line options that override above options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
+ <source>Reset all client options to default.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
- <source>&amp;Connect through SOCKS proxy:</source>
+ <source>&amp;Reset Options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+9"/>
- <source>Proxy &amp;IP:</source>
+ <location line="-323"/>
+ <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="+19"/>
- <source>IP address of the proxy (e.g. 127.0.0.1)</source>
+ <source>Proxy &amp;IP:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="+32"/>
<source>&amp;Port:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+19"/>
+ <location line="+25"/>
<source>Port of the proxy (e.g. 9050)</source>
<translation type="unfinished"/>
</message>
@@ -1043,7 +1414,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+71"/>
+ <location line="+7"/>
+ <source>Whether to show coin control features or not.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Display coin &amp;control features (experts only)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+136"/>
<source>&amp;OK</source>
<translation type="unfinished"/>
</message>
@@ -1053,44 +1434,38 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>&amp;Apply</source>
+ <location filename="../optionsdialog.cpp" line="+67"/>
+ <source>default</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+58"/>
- <source>default</source>
+ <location line="+57"/>
+ <source>none</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+130"/>
+ <location line="+75"/>
<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>
+ <location line="+29"/>
+ <source>Client restart required to activate changes.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
- <location line="+9"/>
- <source>Warning</source>
+ <location line="-29"/>
+ <source>Client will be shutdown, do you want to proceed?</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-9"/>
- <location line="+9"/>
- <source>This setting will take effect after restarting Bitcoin.</source>
+ <location line="+33"/>
+ <source>This change would require a client restart.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+29"/>
+ <location line="+34"/>
<source>The supplied proxy address is invalid.</source>
<translation type="unfinished"/>
</message>
@@ -1104,22 +1479,22 @@ Address: %4
</message>
<message>
<location line="+50"/>
- <location line="+202"/>
+ <location line="+231"/>
<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="-131"/>
+ <location line="-155"/>
<source>Unconfirmed:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-78"/>
+ <location line="-83"/>
<source>Wallet</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+49"/>
+ <location line="+51"/>
<source>Confirmed:</source>
<translation type="unfinished"/>
</message>
@@ -1129,12 +1504,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+29"/>
+ <location line="+32"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+16"/>
<source>Immature:</source>
<translation type="unfinished"/>
</message>
@@ -1144,7 +1519,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+16"/>
<source>Total:</source>
<translation type="unfinished"/>
</message>
@@ -1154,12 +1529,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+53"/>
+ <location line="+71"/>
<source>&lt;b&gt;Recent transactions&lt;/b&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../overviewpage.cpp" line="+116"/>
+ <location filename="../overviewpage.cpp" line="+120"/>
<location line="+1"/>
<source>out of sync</source>
<translation type="unfinished"/>
@@ -1168,7 +1543,8 @@ Address: %4
<context>
<name>PaymentServer</name>
<message>
- <location filename="../paymentserver.cpp" line="+392"/>
+ <location filename="../paymentserver.cpp" line="+403"/>
+ <location line="+13"/>
<source>URI handling</source>
<translation type="unfinished"/>
</message>
@@ -1178,45 +1554,82 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+69"/>
+ <location line="+96"/>
<source>Requested payment amount of %1 is too small (considered dust).</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
- <location line="+37"/>
+ <location line="-221"/>
+ <location line="+212"/>
+ <location line="+13"/>
+ <location line="+95"/>
+ <location line="+18"/>
+ <location line="+16"/>
<source>Payment request error</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="-353"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Net manager warning</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+1"/>
- <source>Insecure requests to custom payment scripts unsupported</source>
+ <source>Your active proxy doesn&apos;t support SOCKS5, which is required for payment requests via proxy.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+38"/>
+ <location line="+52"/>
+ <source>Payment request fetch URL is invalid: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Payment request file handling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Payment request file can not be read or processed! This can be caused by an invalid payment request file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+73"/>
+ <source>Unverified payment requests to custom payment scripts are unsupported.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+59"/>
<source>Refund from %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
+ <location line="+43"/>
<source>Error communicating with %1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+24"/>
+ <source>Payment request can not be parsed or processed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
<source>Bad response from server %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+32"/>
+ <location line="+33"/>
<source>Payment acknowledged</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-58"/>
- <location line="+30"/>
- <location line="+17"/>
+ <location line="-11"/>
<source>Network request error</source>
<translation type="unfinished"/>
</message>
@@ -1224,32 +1637,26 @@ Address: %4
<context>
<name>QObject</name>
<message>
- <location filename="../bitcoin.cpp" line="+114"/>
- <location line="+5"/>
- <location filename="../intro.cpp" line="-32"/>
+ <location filename="../bitcoin.cpp" line="+71"/>
+ <location line="+11"/>
<source>Bitcoin</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-4"/>
+ <location line="+1"/>
<source>Error: Specified data directory &quot;%1&quot; does not exist.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="-12"/>
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../intro.cpp" line="+1"/>
- <source>Error: Specified data directory &quot;%1&quot; can not be created.</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>QRImageWidget</name>
<message>
- <location filename="../receiverequestdialog.cpp" line="+32"/>
+ <location filename="../receiverequestdialog.cpp" line="+36"/>
<source>&amp;Save Image...</source>
<translation type="unfinished"/>
</message>
@@ -1265,7 +1672,7 @@ Address: %4
</message>
<message>
<location line="+0"/>
- <source>PNG Images (*.png)</source>
+ <source>PNG Image (*.png)</source>
<translation type="unfinished"/>
</message>
</context>
@@ -1283,15 +1690,16 @@ Address: %4
<location line="+23"/>
<location line="+23"/>
<location line="+36"/>
- <location line="+53"/>
+ <location line="+23"/>
+ <location line="+36"/>
<location line="+23"/>
<location line="+23"/>
- <location filename="../rpcconsole.cpp" line="+352"/>
+ <location filename="../rpcconsole.cpp" line="+359"/>
<source>N/A</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-217"/>
+ <location line="-223"/>
<source>Client version</source>
<translation type="unfinished"/>
</message>
@@ -1301,7 +1709,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+68"/>
+ <location line="-10"/>
+ <source>Debug window</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+25"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+53"/>
<source>Using OpenSSL version</source>
<translation type="unfinished"/>
</message>
@@ -1317,16 +1735,16 @@ Address: %4
</message>
<message>
<location line="+7"/>
- <source>Number of connections</source>
+ <source>Name</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+23"/>
- <source>On testnet</source>
+ <source>Number of connections</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+23"/>
+ <location line="+29"/>
<source>Block chain</source>
<translation type="unfinished"/>
</message>
@@ -1351,21 +1769,6 @@ Address: %4
<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"/>
@@ -1396,22 +1799,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-541"/>
+ <location line="-521"/>
<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"/>
+ <location line="+206"/>
<source>Debug log file</source>
<translation type="unfinished"/>
</message>
@@ -1421,7 +1814,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+102"/>
+ <location line="+76"/>
<source>Clear console</source>
<translation type="unfinished"/>
</message>
@@ -1441,7 +1834,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+128"/>
+ <location line="+122"/>
<source>%1 B</source>
<translation type="unfinished"/>
</message>
@@ -1479,48 +1872,48 @@ Address: %4
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+22"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
<source>&amp;Amount:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
- <source>The amount to request</source>
+ <location line="-13"/>
+ <source>&amp;Label:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>&amp;Label:</source>
+ <location line="-34"/>
+ <source>&amp;Message:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>The label to associate with the receiving address</source>
+ <location line="-17"/>
+ <source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>&amp;Message:</source>
+ <location line="+3"/>
+ <source>R&amp;euse an existing receiving address (not recommended)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>The message to attach to payment request</source>
+ <location line="+27"/>
+ <source>An optional label to associate with the new receiving address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
- <source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
+ <location line="+7"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>R&amp;euse an existing receiving address (not recommended)</source>
+ <location line="+7"/>
+ <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>Use this form to request payments. All fields are optional.</source>
+ <location line="+39"/>
+ <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1538,6 +1931,31 @@ Address: %4
<source>&amp;Request payment</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+47"/>
+ <source>Requested payments</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Show the selected request (does the same as double clicking an entry)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Show</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Remove the selected entries from the list</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Remove</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
@@ -1558,16 +1976,11 @@ Address: %4
</message>
<message>
<location line="+7"/>
- <source>&amp;Copy Image</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+7"/>
<source>&amp;Save Image...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../receiverequestdialog.cpp" line="+58"/>
+ <location filename="../receiverequestdialog.cpp" line="+56"/>
<source>Request payment to %1</source>
<translation type="unfinished"/>
</message>
@@ -1613,16 +2026,119 @@ Address: %4
</message>
</context>
<context>
+ <name>RecentRequestsTableModel</name>
+ <message>
+ <location filename="../recentrequeststablemodel.cpp" line="+24"/>
+ <source>Date</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Label</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Amount</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+38"/>
+ <source>(no label)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>(no message)</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+140"/>
- <location line="+213"/>
+ <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location line="+80"/>
<source>Send Coins</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+50"/>
+ <location line="+76"/>
+ <source>Coin Control Features</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Inputs...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>automatically selected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Insufficient funds!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+89"/>
+ <source>Quantity:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+35"/>
+ <source>Bytes:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Amount:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Priority:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Low Output:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>After Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Change:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+44"/>
+ <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Custom change address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+115"/>
<source>Send to multiple recipients at once</source>
<translation type="unfinished"/>
</message>
@@ -1647,12 +2163,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>123.456 BTC</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+31"/>
+ <location line="+41"/>
<source>Confirm the send action</source>
<translation type="unfinished"/>
</message>
@@ -1662,69 +2173,135 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-154"/>
+ <location filename="../sendcoinsdialog.cpp" line="-228"/>
<source>Confirm send coins</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-90"/>
+ <location line="-74"/>
<location line="+5"/>
<location line="+5"/>
+ <location line="+4"/>
<source>%1 to %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+26"/>
+ <location line="-136"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Copy quantity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy after fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy bytes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy low output</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy change</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+170"/>
+ <source>Total Amount %1 (= %2)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>or</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+202"/>
<source>The recipient address is not valid, please recheck.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The amount to pay must be larger than 0.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The amount exceeds your balance.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The total exceeds your balance when the %1 transaction fee is included.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+3"/>
<source>Duplicate address found, can only send to each address once per send operation.</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="+3"/>
+ <source>Transaction creation failed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+4"/>
- <source>Error: Transaction creation failed!</source>
+ <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+15"/>
- <source>Are you sure you want to send?</source>
+ <location line="+112"/>
+ <source>Warning: Invalid Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+9"/>
- <source>added as transaction fee</source>
+ <location line="+21"/>
+ <source>(no label)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
- <source>Total Amount %1</source>
+ <location line="-11"/>
+ <source>Warning: Unknown change address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+20"/>
- <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>
+ <location line="-366"/>
+ <source>Are you sure you want to send?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>added as transaction fee</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+144"/>
+ <location line="+170"/>
<source>Payment request expired</source>
<translation type="unfinished"/>
</message>
@@ -1737,39 +2314,44 @@ Address: %4
<context>
<name>SendCoinsEntry</name>
<message>
- <location filename="../forms/sendcoinsentry.ui" line="+33"/>
- <location line="+585"/>
+ <location filename="../forms/sendcoinsentry.ui" line="+131"/>
+ <location line="+521"/>
+ <location line="+536"/>
<source>A&amp;mount:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-572"/>
- <location line="+585"/>
+ <location line="-1152"/>
<source>Pay &amp;To:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-551"/>
+ <location line="+18"/>
<source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../sendcoinsentry.cpp" line="+28"/>
+ <location filename="../sendcoinsentry.cpp" line="+30"/>
<source>Enter a label for this address to add it to your address book</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../forms/sendcoinsentry.ui" line="-18"/>
+ <location filename="../forms/sendcoinsentry.ui" line="+57"/>
<source>&amp;Label:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+28"/>
+ <location line="-50"/>
<source>Choose previously used address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
+ <location line="-40"/>
+ <source>This is a normal payment.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+50"/>
<source>Alt+A</source>
<translation type="unfinished"/>
</message>
@@ -1785,16 +2367,45 @@ Address: %4
</message>
<message>
<location line="+7"/>
- <source>Remove this recipient</source>
+ <location line="+524"/>
+ <location line="+536"/>
+ <source>Remove this entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="-1008"/>
+ <source>Message:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+958"/>
+ <source>This is a verified payment request.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-991"/>
<source>Enter a label for this address to add it to the list of used addresses</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+465"/>
+ <location line="+459"/>
+ <source>This is an unverified payment request.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+18"/>
+ <location line="+532"/>
+ <source>Pay To:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-498"/>
+ <location line="+536"/>
<source>Memo:</source>
<translation type="unfinished"/>
</message>
@@ -1805,6 +2416,19 @@ Address: %4
</message>
</context>
<context>
+ <name>ShutdownWindow</name>
+ <message>
+ <location filename="../utilitydialog.cpp" line="+48"/>
+ <source>Bitcoin Core is shutting down...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Do not shut down the computer until this window disappears.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>SignVerifyMessageDialog</name>
<message>
<location filename="../forms/signverifymessagedialog.ui" line="+14"/>
@@ -1812,7 +2436,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+10"/>
<source>&amp;Sign Message</source>
<translation type="unfinished"/>
</message>
@@ -1915,7 +2539,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+27"/>
+ <location filename="../signverifymessagedialog.cpp" line="+29"/>
<location line="+3"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation type="unfinished"/>
@@ -1931,7 +2555,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+85"/>
+ <location line="+84"/>
<location line="+81"/>
<source>The entered address is invalid.</source>
<translation type="unfinished"/>
@@ -2000,8 +2624,13 @@ Address: %4
<context>
<name>SplashScreen</name>
<message>
- <location filename="../splashscreen.cpp" line="+23"/>
- <source>The Bitcoin developers</source>
+ <location filename="../splashscreen.cpp" line="+28"/>
+ <source>Bitcoin Core</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
<message>
@@ -2013,7 +2642,7 @@ Address: %4
<context>
<name>TrafficGraphWidget</name>
<message>
- <location filename="../trafficgraphwidget.cpp" line="+75"/>
+ <location filename="../trafficgraphwidget.cpp" line="+79"/>
<source>KB/s</source>
<translation type="unfinished"/>
</message>
@@ -2021,7 +2650,7 @@ Address: %4
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="+22"/>
+ <location filename="../transactiondesc.cpp" line="+28"/>
<source>Open until %1</source>
<translation type="unfinished"/>
</message>
@@ -2094,12 +2723,12 @@ Address: %4
<location line="+12"/>
<location line="+45"/>
<location line="+17"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Credit</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="-120"/>
+ <location line="-125"/>
<source>matures in %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -2112,12 +2741,12 @@ Address: %4
<location line="+44"/>
<location line="+8"/>
<location line="+15"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Debit</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-57"/>
+ <location line="-62"/>
<source>Transaction fee</source>
<translation type="unfinished"/>
</message>
@@ -2128,11 +2757,12 @@ Address: %4
</message>
<message>
<location line="+6"/>
+ <location line="+9"/>
<source>Message</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="-7"/>
<source>Comment</source>
<translation type="unfinished"/>
</message>
@@ -2142,7 +2772,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+18"/>
<source>Merchant</source>
<translation type="unfinished"/>
</message>
@@ -2182,7 +2812,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-227"/>
+ <location line="-232"/>
<source>, has not been successfully broadcast yet</source>
<translation type="unfinished"/>
</message>
@@ -2213,7 +2843,7 @@ Address: %4
<context>
<name>TransactionTableModel</name>
<message>
- <location filename="../transactiontablemodel.cpp" line="+227"/>
+ <location filename="../transactiontablemodel.cpp" line="+234"/>
<source>Date</source>
<translation type="unfinished"/>
</message>
@@ -2232,8 +2862,13 @@ Address: %4
<source>Amount</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+59"/>
+ <source>Immature (%1 confirmations, will be available after %2)</source>
+ <translation type="unfinished"/>
+ </message>
<message numerus="yes">
- <location line="+57"/>
+ <location line="+16"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -2253,17 +2888,13 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
+ <location line="-22"/>
+ <location line="+25"/>
<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"/>
+ <location line="-22"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation type="unfinished"/>
</message>
@@ -2273,7 +2904,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+43"/>
+ <location line="+62"/>
<source>Received with</source>
<translation type="unfinished"/>
</message>
@@ -2331,7 +2962,7 @@ Address: %4
<context>
<name>TransactionView</name>
<message>
- <location filename="../transactionview.cpp" line="+52"/>
+ <location filename="../transactionview.cpp" line="+57"/>
<location line="+16"/>
<source>All</source>
<translation type="unfinished"/>
@@ -2392,12 +3023,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="+6"/>
<source>Enter address or label to search</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="+6"/>
<source>Min amount</source>
<translation type="unfinished"/>
</message>
@@ -2432,17 +3063,37 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+143"/>
- <source>Export Transaction Data</source>
+ <location line="+142"/>
+ <source>Export Transaction History</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="+19"/>
+ <source>Exporting Failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>There was an error trying to save the transaction history to %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Exporting Successful</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The transaction history was successfully saved to %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-22"/>
<source>Comma separated file (*.csv)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+8"/>
+ <location line="+9"/>
<source>Confirmed</source>
<translation type="unfinished"/>
</message>
@@ -2477,17 +3128,7 @@ Address: %4
<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"/>
+ <location line="+107"/>
<source>Range:</source>
<translation type="unfinished"/>
</message>
@@ -2498,9 +3139,17 @@ Address: %4
</message>
</context>
<context>
+ <name>WalletFrame</name>
+ <message>
+ <location filename="../walletframe.cpp" line="+26"/>
+ <source>No wallet has been loaded.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>WalletModel</name>
<message>
- <location filename="../walletmodel.cpp" line="+218"/>
+ <location filename="../walletmodel.cpp" line="+245"/>
<source>Send Coins</source>
<translation type="unfinished"/>
</message>
@@ -2508,7 +3157,7 @@ Address: %4
<context>
<name>WalletView</name>
<message>
- <location filename="../walletview.cpp" line="+46"/>
+ <location filename="../walletview.cpp" line="+43"/>
<source>&amp;Export</source>
<translation type="unfinished"/>
</message>
@@ -2518,65 +3167,60 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+183"/>
+ <location line="+181"/>
<source>Backup Wallet</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
+ <location line="+1"/>
<source>Wallet Data (*.dat)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
+ <location line="+6"/>
<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>
+ <source>There was an error trying to save the wallet data to %1.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+4"/>
- <source>Backup Successful</source>
+ <source>The wallet data was successfully saved to %1.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+0"/>
- <source>The wallet data was successfully saved to the new location.</source>
+ <source>Backup Successful</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+102"/>
- <source>Bitcoin version</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+107"/>
+ <location filename="../bitcoinstrings.cpp" line="+221"/>
<source>Usage:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-55"/>
+ <location line="-54"/>
<source>List commands</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-13"/>
+ <location line="-14"/>
<source>Get help for a command</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+25"/>
+ <location line="+26"/>
<source>Options:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+24"/>
+ <location line="+22"/>
<source>Specify configuration file (default: bitcoin.conf)</source>
<translation type="unfinished"/>
</message>
@@ -2596,7 +3240,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-28"/>
+ <location line="-26"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
<translation type="unfinished"/>
</message>
@@ -2606,7 +3250,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-49"/>
+ <location line="-51"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation type="unfinished"/>
</message>
@@ -2616,37 +3260,37 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-142"/>
+ <location line="-148"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-33"/>
+ <location line="-36"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+40"/>
+ <location line="+45"/>
<source>Accept command line and JSON-RPC commands</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<source>Run in the background as a daemon and accept commands</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+40"/>
+ <location line="+39"/>
<source>Use the test network</source>
<translation type="unfinished"/>
</message>
@@ -2656,7 +3300,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-87"/>
+ <location line="-95"/>
<source>%s, you must set a rpcpassword in the configuration file:
%s
It is recommended you use the following random password:
@@ -2697,6 +3341,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+4"/>
+ <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</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>
@@ -2711,17 +3360,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+11"/>
- <source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source>
+ <location line="+18"/>
+ <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="+6"/>
- <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
+ <location line="+5"/>
+ <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+3"/>
<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>
@@ -2751,17 +3400,27 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
+ <location line="+9"/>
+ <source>&lt;category&gt; can be:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
<source>Attempt to recover private keys from a corrupt wallet.dat</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
+ <source>Bitcoin Core Daemon</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Bitcoin RPC client version</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
<source>Block creation options:</source>
<translation type="unfinished"/>
</message>
@@ -2771,7 +3430,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
+ <source>Connect through SOCKS proxy</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect to JSON-RPC on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation type="unfinished"/>
</message>
@@ -2787,6 +3451,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+1"/>
+ <source>Do not load the wallet and disable wallet RPC calls</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Do you want to rebuild the block database now?</source>
<translation type="unfinished"/>
</message>
@@ -2881,7 +3550,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
+ <source>Fee per kB to add to transactions you send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Find peers using DNS lookup (default: 1 unless -connect)</source>
<translation type="unfinished"/>
</message>
@@ -2901,6 +3575,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
+ <location line="+1"/>
+ <source>If &lt;category&gt; is not supplied, output all debugging information.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+2"/>
<source>Incorrect or no genesis block found. Wrong datadir for network?</source>
<translation type="unfinished"/>
@@ -2916,17 +3595,37 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+8"/>
+ <location line="+5"/>
+ <source>Prepend debug output with timestamp (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>RPC client options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Rebuild block chain index from current blk000??.dat files</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+5"/>
+ <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Send command to Bitcoin server</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
+ <location line="+7"/>
+ <source>Set maximum block size in bytes (default: %d)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Set the number of threads to service RPC calls (default: 4)</source>
<translation type="unfinished"/>
</message>
@@ -2941,12 +3640,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+12"/>
+ <location line="+3"/>
+ <source>This is intended for regression testing tools and app development.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Usage (deprecated, use bitcoin-cli):</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+8"/>
+ <location line="+7"/>
<source>Verifying blocks...</source>
<translation type="unfinished"/>
</message>
@@ -2957,31 +3661,56 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+1"/>
+ <source>Wait for RPC server to start</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Wallet %s resides outside data directory %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+2"/>
+ <source>Wallet options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>You need to rebuild the database using -reindex to change -txindex</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-78"/>
+ <location line="-79"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-98"/>
+ <location line="-105"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+17"/>
+ <location line="+14"/>
+ <source>Output debugging information (default: 0, supplying &lt;category&gt; is optional)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+83"/>
+ <location line="+89"/>
<source>Information</source>
<translation type="unfinished"/>
</message>
@@ -3021,47 +3750,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<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"/>
+ <location line="+9"/>
<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"/>
+ <location line="+4"/>
<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"/>
+ <location line="+6"/>
<source>Set minimum block size in bytes (default: 0)</source>
<translation type="unfinished"/>
</message>
@@ -3086,7 +3785,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Transaction amount too small</source>
<translation type="unfinished"/>
</message>
@@ -3111,32 +3810,32 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<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="+5"/>
+ <location line="+7"/>
<source>Warning</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Warning: This version is obsolete, upgrade required!</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+2"/>
+ <source>version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>wallet.dat corrupt, salvage failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-54"/>
+ <location line="-58"/>
<source>Password for JSON-RPC connections</source>
<translation type="unfinished"/>
</message>
@@ -3146,27 +3845,27 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-126"/>
+ <location line="-132"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+155"/>
+ <location line="+161"/>
<source>Upgrade wallet to latest format</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-12"/>
+ <location line="-11"/>
<source>Rescan the block chain for missing wallet transactions</source>
<translation type="unfinished"/>
</message>
@@ -3176,7 +3875,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-29"/>
+ <location line="-30"/>
<source>Server certificate file (default: server.cert)</source>
<translation type="unfinished"/>
</message>
@@ -3191,27 +3890,22 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Unable to bind to %s on this computer (bind returned error %d, %s)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-95"/>
- <source>Connect through socks proxy</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="-11"/>
+ <location line="-107"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+58"/>
+ <location line="+60"/>
<source>Loading addresses...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-36"/>
+ <location line="-37"/>
<source>Error loading wallet.dat: Wallet corrupted</source>
<translation type="unfinished"/>
</message>
@@ -3231,12 +3925,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+30"/>
+ <location line="+31"/>
<source>Invalid -proxy address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+57"/>
+ <location line="+56"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3246,7 +3940,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3256,7 +3950,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+46"/>
+ <location line="+48"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3276,27 +3970,22 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-60"/>
+ <location line="-62"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-28"/>
+ <location line="-32"/>
<source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+69"/>
- <source>Fee per KB to add to transactions you send</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+20"/>
+ <location line="+95"/>
<source>Loading wallet...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-54"/>
+ <location line="-56"/>
<source>Cannot downgrade wallet</source>
<translation type="unfinished"/>
</message>
@@ -3306,7 +3995,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+66"/>
+ <location line="+67"/>
<source>Rescanning...</source>
<translation type="unfinished"/>
</message>
@@ -3326,7 +4015,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-33"/>
+ <location line="-35"/>
<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_gl.ts b/src/qt/locale/bitcoin_gl.ts
index f12d641e99..3d572ae8c4 100644
--- a/src/qt/locale/bitcoin_gl.ts
+++ b/src/qt/locale/bitcoin_gl.ts
@@ -3,13 +3,13 @@
<name>AboutDialog</name>
<message>
<location filename="../forms/aboutdialog.ui" line="+14"/>
- <source>About Bitcoin</source>
- <translation>Sobre Bitcoin</translation>
+ <source>About Bitcoin Core</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+39"/>
- <source>&lt;b&gt;Bitcoin&lt;/b&gt; version</source>
- <translation>Versión &lt;b&gt;Bitcoin&lt;/b&gt;</translation>
+ <source>&lt;b&gt;Bitcoin Core&lt;/b&gt; version</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+57"/>
@@ -27,14 +27,14 @@ Distribuído baixo a licencia de software MIT/X11, véxase o arquivo que acompaÃ
Este produto inclúe software desenvolvido polo OpenSSL Project para o uso no OpenSSL Toolkit (http://www.openssl.org/) e 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="+14"/>
+ <location filename="../utilitydialog.cpp" line="+29"/>
<source>Copyright</source>
<translation>Copyright</translation>
</message>
<message>
<location line="+0"/>
- <source>The Bitcoin developers</source>
- <translation>Os desenvolvedores de Bitcoin.</translation>
+ <source>The Bitcoin Core developers</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -70,7 +70,7 @@ Este produto inclúe software desenvolvido polo OpenSSL Project para o uso no Op
<translation>&amp;Pechar</translation>
</message>
<message>
- <location filename="../addressbookpage.cpp" line="+72"/>
+ <location filename="../addressbookpage.cpp" line="+74"/>
<source>&amp;Copy Address</source>
<translation>&amp;Copiar Dirección</translation>
</message>
@@ -140,7 +140,7 @@ Este produto inclúe software desenvolvido polo OpenSSL Project para o uso no Op
<translation>&amp;Modificar</translation>
</message>
<message>
- <location line="+197"/>
+ <location line="+194"/>
<source>Export Address List</source>
<translation>Exportar Lista de Direccións</translation>
</message>
@@ -151,19 +151,19 @@ Este produto inclúe software desenvolvido polo OpenSSL Project para o uso no Op
</message>
<message>
<location line="+13"/>
- <source>Error exporting</source>
- <translation>Error na exportación</translation>
+ <source>Exporting Failed</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation>Non se puido escribir ao arquivo %1.</translation>
+ <location line="+1"/>
+ <source>There was an error trying to save the address list to %1.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<name>AddressTableModel</name>
<message>
- <location filename="../addresstablemodel.cpp" line="+164"/>
+ <location filename="../addresstablemodel.cpp" line="+168"/>
<source>Label</source>
<translation>Etiqueta</translation>
</message>
@@ -201,7 +201,7 @@ Este produto inclúe software desenvolvido polo OpenSSL Project para o uso no Op
<translation>Repite novo contrasinal</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="+34"/>
+ <location filename="../askpassphrasedialog.cpp" line="+40"/>
<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>Introduce o novo contrasinal ao moedeiro.&lt;br/&gt;Por favor empregue un contrasinal de &lt;b&gt;10 ou máis caracteres aleatorios&lt;/b&gt;, ou &lt;b&gt;oito ou máis palabras&lt;/b&gt;.</translation>
</message>
@@ -322,22 +322,27 @@ Este produto inclúe software desenvolvido polo OpenSSL Project para o uso no Op
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+250"/>
+ <location filename="../bitcoingui.cpp" line="+295"/>
<source>Sign &amp;message...</source>
<translation>&amp;Asinar mensaxe...</translation>
</message>
<message>
- <location line="+254"/>
+ <location line="+335"/>
<source>Synchronizing with network...</source>
<translation>Sincronizando coa rede...</translation>
</message>
<message>
- <location line="-324"/>
+ <location line="-407"/>
<source>&amp;Overview</source>
<translation>&amp;Vista xeral</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="-137"/>
+ <source>Node</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+138"/>
<source>Show general overview of wallet</source>
<translation>Amosar vista xeral do moedeiro</translation>
</message>
@@ -352,7 +357,7 @@ Este produto inclúe software desenvolvido polo OpenSSL Project para o uso no Op
<translation>Navegar historial de transaccións</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>E&amp;xit</source>
<translation>&amp;Saír</translation>
</message>
@@ -398,7 +403,22 @@ Este produto inclúe software desenvolvido polo OpenSSL Project para o uso no Op
<translation>&amp;Cambiar contrasinal...</translation>
</message>
<message>
- <location line="+259"/>
+ <location line="+10"/>
+ <source>&amp;Sending addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Receiving addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open &amp;URI...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+325"/>
<source>Importing blocks from disk...</source>
<translation>Importando bloques de disco...</translation>
</message>
@@ -408,12 +428,12 @@ Este produto inclúe software desenvolvido polo OpenSSL Project para o uso no Op
<translation>Reindexando bloques no disco...</translation>
</message>
<message>
- <location line="-322"/>
+ <location line="-405"/>
<source>Send coins to a Bitcoin address</source>
<translation>Enviar moedas a unha dirección Bitcoin</translation>
</message>
<message>
- <location line="+47"/>
+ <location line="+49"/>
<source>Modify configuration options for Bitcoin</source>
<translation>Modificar opcións de configuración para Bitcoin</translation>
</message>
@@ -443,20 +463,17 @@ Este produto inclúe software desenvolvido polo OpenSSL Project para o uso no Op
<translation>&amp;Verificar mensaxe...</translation>
</message>
<message>
- <location line="-180"/>
- <location line="+6"/>
- <location line="+513"/>
+ <location line="+430"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-519"/>
- <location line="+6"/>
+ <location line="-643"/>
<source>Wallet</source>
<translation>Moedeiro</translation>
</message>
<message>
- <location line="+109"/>
+ <location line="+146"/>
<source>&amp;Send</source>
<translation>&amp;Enviar</translation>
</message>
@@ -466,13 +483,7 @@ Este produto inclúe software desenvolvido polo OpenSSL Project para o uso no Op
<translation>&amp;Recibir</translation>
</message>
<message>
- <location line="+28"/>
- <location line="+2"/>
- <source>&amp;About Bitcoin</source>
- <translation>&amp;Acerca de Bitcoin</translation>
- </message>
- <message>
- <location line="+14"/>
+ <location line="+46"/>
<location line="+2"/>
<source>&amp;Show / Hide</source>
<translation>&amp;Amosar/Agachar</translation>
@@ -498,64 +509,80 @@ Este produto inclúe software desenvolvido polo OpenSSL Project para o uso no Op
<translation>Verificar mensaxes para asegurar que foron asinados con direccións Bitcoin dadas.</translation>
</message>
<message>
- <location line="+35"/>
+ <location line="+48"/>
<source>&amp;File</source>
<translation>&amp;Arquivo</translation>
</message>
<message>
- <location line="+10"/>
+ <location line="+14"/>
<source>&amp;Settings</source>
<translation>Axus&amp;tes</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>&amp;Help</source>
<translation>A&amp;xuda</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+15"/>
<source>Tabs toolbar</source>
<translation>Barra de ferramentas</translation>
</message>
<message>
- <location line="-235"/>
- <location line="+294"/>
+ <location line="-284"/>
+ <location line="+376"/>
<source>[testnet]</source>
<translation>[testnet]</translation>
</message>
<message>
- <location line="-177"/>
+ <location line="-401"/>
+ <source>Bitcoin Core</source>
+ <translation>Core de Bitcoin</translation>
+ </message>
+ <message>
+ <location line="+163"/>
<source>Request payments (generates QR codes and bitcoin: URIs)</source>
<translation>Solicitar pagos (xenera códigos QR e bitcoin: URIs)</translation>
</message>
<message>
- <location line="+63"/>
- <source>&amp;Used sending addresses...</source>
- <translation>Direccións para enviar &amp;empregadas</translation>
+ <location line="+29"/>
+ <location line="+2"/>
+ <source>&amp;About Bitcoin Core</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="+35"/>
<source>Show the list of used sending addresses and labels</source>
<translation>Amosar a listaxe de direccións e etiquetas para enviar empregadas</translation>
</message>
<message>
- <location line="+1"/>
- <source>Used &amp;receiving addresses...</source>
- <translation>Direccións para &amp;recibir empregadas</translation>
+ <location line="+2"/>
+ <source>Show the list of used receiving addresses and labels</source>
+ <translation>Amosar a listaxe de etiquetas e direccións para recibir empregadas</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open a bitcoin: URI or payment request</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Command-line options</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
- <source>Show the list of used receiving addresses and labels</source>
- <translation>Amosar a listaxe de etiquetas e direccións para recibir empregadas</translation>
+ <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+106"/>
+ <location line="+159"/>
<location line="+5"/>
<source>Bitcoin client</source>
<translation>Cliente Bitcoin</translation>
</message>
<message numerus="yes">
- <location line="+120"/>
+ <location line="+142"/>
<source>%n active connection(s) to Bitcoin network</source>
<translation><numerusform>%n conexión activa coa rede Bitcoin</numerusform><numerusform>%n conexións activas coa rede Bitcoin</numerusform></translation>
</message>
@@ -575,7 +602,7 @@ Este produto inclúe software desenvolvido polo OpenSSL Project para o uso no Op
<translation>Procesados %1 bloques do historial de transacccións.</translation>
</message>
<message numerus="yes">
- <location line="+20"/>
+ <location line="+23"/>
<source>%n hour(s)</source>
<translation><numerusform>%n hora</numerusform><numerusform>%n horas</numerusform></translation>
</message>
@@ -595,7 +622,7 @@ Este produto inclúe software desenvolvido polo OpenSSL Project para o uso no Op
<translation>%1 detrás</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="+21"/>
<source>Last received block was generated %1 ago.</source>
<translation>O último bloque recibido foi xerado fai %1.</translation>
</message>
@@ -620,27 +647,17 @@ Este produto inclúe software desenvolvido polo OpenSSL Project para o uso no Op
<translation>Información</translation>
</message>
<message>
- <location line="+77"/>
- <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 está sobre o límite de tamaño. Aínda así podes enviala por unha tarifa de %1, que vai aos nodos que procesan a túa transacción e axuda a soporta-la rede. Queres paga-la tarifa?</translation>
- </message>
- <message>
- <location line="-152"/>
+ <location line="-85"/>
<source>Up to date</source>
<translation>Actualizado</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Catching up...</source>
<translation>Poñendo ao día...</translation>
</message>
<message>
- <location line="+124"/>
- <source>Confirm transaction fee</source>
- <translation>Confirmar tarifa de transacción</translation>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+130"/>
<source>Sent transaction</source>
<translation>Transacción enviada</translation>
</message>
@@ -663,17 +680,7 @@ Dirección: %4
</translation>
</message>
<message>
- <location line="+34"/>
- <source>URI handling</source>
- <translation>Manexo de URI</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
- <translation>Non se pode parsear a URI! Esto pode ser causado por unha dirección Bitcoin inválida ou parámetros da URI malformados.</translation>
- </message>
- <message>
- <location line="+45"/>
+ <location line="+69"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation>O moedeiro está &lt;b&gt;encriptado&lt;/b&gt; e actualmente &lt;b&gt;desbloqueado&lt;/b&gt;</translation>
</message>
@@ -683,7 +690,7 @@ Dirección: %4
<translation>O moedeiro está &lt;b&gt;encriptado&lt;/b&gt; e actualmente &lt;b&gt;bloqueado&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+110"/>
+ <location filename="../bitcoin.cpp" line="+438"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation>Ocorriu un erro fatal. Bitcoin non pode continuar en condicións de seguridade e pecharáse.</translation>
</message>
@@ -691,12 +698,304 @@ Dirección: %4
<context>
<name>ClientModel</name>
<message>
- <location filename="../clientmodel.cpp" line="+115"/>
+ <location filename="../clientmodel.cpp" line="+119"/>
<source>Network Alert</source>
<translation>Alerta de Rede</translation>
</message>
</context>
<context>
+ <name>CoinControlDialog</name>
+ <message>
+ <location filename="../forms/coincontroldialog.ui" line="+14"/>
+ <source>Coin Control Address Selection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>Quantity:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Bytes:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>Amount:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Priority:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Low Output:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>After Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Change:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+63"/>
+ <source>(un)select all</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Tree mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>List mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>Amount</source>
+ <translation>Cantidade</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Address</source>
+ <translation>Dirección</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Date</source>
+ <translation>Data</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Confirmations</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Confirmed</source>
+ <translation>Confirmado</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../coincontroldialog.cpp" line="+42"/>
+ <source>Copy address</source>
+ <translation>Copiar dirección</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy label</source>
+ <translation>Copiar etiqueta</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+26"/>
+ <source>Copy amount</source>
+ <translation>Copiar cantidade</translation>
+ </message>
+ <message>
+ <location line="-25"/>
+ <source>Copy transaction ID</source>
+ <translation>Copiar ID de transacción</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Lock unspent</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Unlock unspent</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+22"/>
+ <source>Copy quantity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Copy fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy after fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy bytes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy low output</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy change</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+323"/>
+ <source>highest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>higher</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>high</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>medium-high</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>medium</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>low-medium</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>low</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>lower</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>lowest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>(%1 locked)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+140"/>
+ <source>Dust</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>yes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>no</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>This label turns red, if the transaction size is greater than 1000 bytes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+5"/>
+ <source>This means a fee of at least %1 per kB is required.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-4"/>
+ <source>Can vary +/- 1 byte per input.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Transactions with higher priority are more likely to get included into a block.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>This label turns red, if the priority is smaller than &quot;medium&quot;.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>This label turns red, if any recipient receives an amount smaller than %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+4"/>
+ <source>This means a fee of at least %1 is required.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-3"/>
+ <source>Amounts below 0.546 times the minimum relay fee are shown as dust.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>This label turns red, if the change is smaller than %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
+ <location line="+66"/>
+ <source>(no label)</source>
+ <translation>(sen etiqueta)</translation>
+ </message>
+ <message>
+ <location line="-9"/>
+ <source>change from %1 (%2)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>(change)</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>EditAddressDialog</name>
<message>
<location filename="../forms/editaddressdialog.ui" line="+14"/>
@@ -724,7 +1023,7 @@ Dirección: %4
<translation>&amp;Dirección</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+21"/>
+ <location filename="../editaddressdialog.cpp" line="+28"/>
<source>New receiving address</source>
<translation>Nova dirección para recibir</translation>
</message>
@@ -767,7 +1066,7 @@ Dirección: %4
<context>
<name>FreespaceChecker</name>
<message>
- <location filename="../intro.cpp" line="+61"/>
+ <location filename="../intro.cpp" line="+65"/>
<source>A new data directory will be created.</source>
<translation>Crearáse un novo directorio de datos.</translation>
</message>
@@ -793,15 +1092,19 @@ Dirección: %4
</message>
</context>
<context>
- <name>GUIUtil::HelpMessageBox</name>
+ <name>HelpMessageDialog</name>
<message>
- <location filename="../guiutil.cpp" line="+558"/>
- <location line="+13"/>
- <source>Bitcoin-Qt</source>
- <translation>Bitcoin-Qt</translation>
+ <location filename="../forms/helpmessagedialog.ui" line="+19"/>
+ <source>Bitcoin Core - Command-line options</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="-13"/>
+ <location filename="../utilitydialog.cpp" line="+38"/>
+ <source>Bitcoin Core</source>
+ <translation>Core de Bitcoin</translation>
+ </message>
+ <message>
+ <location line="+0"/>
<source>version</source>
<translation>versión</translation>
</message>
@@ -850,18 +1153,18 @@ Dirección: %4
</message>
<message>
<location line="+9"/>
- <source>Welcome to Bitcoin-Qt.</source>
- <translation>Benvido a Bitcoin-Qt</translation>
+ <source>Welcome to Bitcoin Core.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+26"/>
- <source>As this is the first time the program is launched, you can choose where Bitcoin-Qt will store its data.</source>
- <translation>Como é a primeira vez que se lanza este programa, podes escroller onde almacenará Bitcoin os seus datos.</translation>
+ <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+10"/>
- <source>Bitcoin-Qt will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
- <translation>Bitcoin-Qt descargará e almacenará unha copia da cadea de bloque. Alomenos %1 GB de datos van ser almacenados neste directorio, e crecerá co tempo. O moedeiro tamén se almacenará neste directorio.</translation>
+ <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+10"/>
@@ -874,7 +1177,17 @@ Dirección: %4
<translation>Empregar un directorio de datos personalizado</translation>
</message>
<message>
- <location filename="../intro.cpp" line="+105"/>
+ <location filename="../intro.cpp" line="+85"/>
+ <source>Bitcoin</source>
+ <translation>Bitcoin</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error: Specified data directory &quot;%1&quot; can not be created.</source>
+ <translation>Erro: O directorio de datos especificado &quot;%1&quot; non pode ser creado.</translation>
+ </message>
+ <message>
+ <location line="+19"/>
<source>Error</source>
<translation>Erro</translation>
</message>
@@ -890,6 +1203,34 @@ Dirección: %4
</message>
</context>
<context>
+ <name>OpenURIDialog</name>
+ <message>
+ <location filename="../forms/openuridialog.ui" line="+14"/>
+ <source>Open URI</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Open payment request from URI or file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>URI:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Select payment request file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../openuridialog.cpp" line="+47"/>
+ <source>Select payment request file to open</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OptionsDialog</name>
<message>
<location filename="../forms/optionsdialog.ui" line="+14"/>
@@ -897,7 +1238,7 @@ Dirección: %4
<translation>Opcións</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+13"/>
<source>&amp;Main</source>
<translation>&amp;Principal</translation>
</message>
@@ -922,7 +1263,52 @@ Dirección: %4
<translation>&amp;Comezar Bitcoin ao facer login no sistema</translation>
</message>
<message>
- <location line="+35"/>
+ <location line="+9"/>
+ <source>Size of &amp;database cache</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set database cache size in megabytes (default: 25)</source>
+ <translation>Fixar tamaño da caché da base de datos en megabytes (por defecto: 25)</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>MB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Number of script &amp;verification threads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
+ <translation>Fixar o número de fíos para sripts de verificación (ata 16, 0 = auto, &lt;0 = deixa tantos cores libres, por defecto: 0)</translation>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Connect to the Bitcoin network through a SOCKS proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Connect through SOCKS proxy (default proxy):</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+224"/>
+ <source>Active command-line options that override above options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
<source>Reset all client options to default.</source>
<translation>Restaurar todas as opcións de cliente ás por defecto</translation>
</message>
@@ -932,7 +1318,7 @@ Dirección: %4
<translation>Opcións de &amp;Restaurar</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="-323"/>
<source>&amp;Network</source>
<translation>&amp;Rede</translation>
</message>
@@ -947,32 +1333,17 @@ Dirección: %4
<translation>Mapear porto empregando &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>Conectar coa rede Bitcoin a través dun proxy SOCKS (exemplo: ao conectar a través de Tor).</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>&amp;Connect through SOCKS proxy:</source>
- <translation>&amp;Connectar a través do proxy SOCKS:</translation>
- </message>
- <message>
- <location line="+9"/>
+ <location line="+19"/>
<source>Proxy &amp;IP:</source>
<translation>&amp;IP do Proxy:</translation>
</message>
<message>
- <location line="+19"/>
- <source>IP address of the proxy (e.g. 127.0.0.1)</source>
- <translation>Dirección IP do proxy (exemplo: 127.0.0.1)</translation>
- </message>
- <message>
- <location line="+7"/>
+ <location line="+32"/>
<source>&amp;Port:</source>
<translation>&amp;Porto:</translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+25"/>
<source>Port of the proxy (e.g. 9050)</source>
<translation>Porto do proxy (exemplo: 9050)</translation>
</message>
@@ -1047,7 +1418,17 @@ Dirección: %4
<translation>&amp;Visualizar direccións na listaxe de transaccións</translation>
</message>
<message>
- <location line="+71"/>
+ <location line="+7"/>
+ <source>Whether to show coin control features or not.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Display coin &amp;control features (experts only)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+136"/>
<source>&amp;OK</source>
<translation>&amp;OK</translation>
</message>
@@ -1057,44 +1438,38 @@ Dirección: %4
<translation>&amp;Cancelar</translation>
</message>
<message>
- <location line="+10"/>
- <source>&amp;Apply</source>
- <translation>&amp;Aplicar</translation>
- </message>
- <message>
- <location filename="../optionsdialog.cpp" line="+58"/>
+ <location filename="../optionsdialog.cpp" line="+67"/>
<source>default</source>
<translation>por defecto</translation>
</message>
<message>
- <location line="+130"/>
+ <location line="+57"/>
+ <source>none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+75"/>
<source>Confirm options reset</source>
<translation>Confirmar opcións de restaurar</translation>
</message>
<message>
<location line="+1"/>
- <source>Some settings may require a client restart to take effect.</source>
- <translation>Algúns axustes poden precisar un reinicio do cliente para ter efecto.</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Do you want to proceed?</source>
- <translation>Queres proceder?</translation>
+ <location line="+29"/>
+ <source>Client restart required to activate changes.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
- <location line="+9"/>
- <source>Warning</source>
- <translation>Precaución</translation>
+ <location line="-29"/>
+ <source>Client will be shutdown, do you want to proceed?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="-9"/>
- <location line="+9"/>
- <source>This setting will take effect after restarting Bitcoin.</source>
- <translation>Esta configuración terá efecto tras reiniciar Bitcoin</translation>
+ <location line="+33"/>
+ <source>This change would require a client restart.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+29"/>
+ <location line="+34"/>
<source>The supplied proxy address is invalid.</source>
<translation>A dirección de proxy suministrada é inválida.</translation>
</message>
@@ -1108,22 +1483,22 @@ Dirección: %4
</message>
<message>
<location line="+50"/>
- <location line="+202"/>
+ <location line="+231"/>
<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 información amosada por estar desactualizada. O teu moedeiro sincronízase automáticamente coa rede Bitcoin despois de que se estableza unha conexión, pero este proceso non está todavía rematado.</translation>
</message>
<message>
- <location line="-131"/>
+ <location line="-155"/>
<source>Unconfirmed:</source>
<translation>Sen confirmar:</translation>
</message>
<message>
- <location line="-78"/>
+ <location line="-83"/>
<source>Wallet</source>
<translation>Moedeiro</translation>
</message>
<message>
- <location line="+49"/>
+ <location line="+51"/>
<source>Confirmed:</source>
<translation>Confirmado:</translation>
</message>
@@ -1133,12 +1508,12 @@ Dirección: %4
<translation>O teu balance actualmente dispoñible</translation>
</message>
<message>
- <location line="+29"/>
+ <location line="+32"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation>Total de transaccións que aínda teñen que ser confirmadas, e non contan todavía dentro do balance gastable</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+16"/>
<source>Immature:</source>
<translation>Inmaduro:</translation>
</message>
@@ -1148,7 +1523,7 @@ Dirección: %4
<translation>O balance minado todavía non madurou</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+16"/>
<source>Total:</source>
<translation>Total:</translation>
</message>
@@ -1158,12 +1533,12 @@ Dirección: %4
<translation>O teu balance actual total</translation>
</message>
<message>
- <location line="+53"/>
+ <location line="+71"/>
<source>&lt;b&gt;Recent transactions&lt;/b&gt;</source>
<translation>&lt;b&gt;Transaccións recentes&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../overviewpage.cpp" line="+116"/>
+ <location filename="../overviewpage.cpp" line="+120"/>
<location line="+1"/>
<source>out of sync</source>
<translation>non sincronizado</translation>
@@ -1172,7 +1547,8 @@ Dirección: %4
<context>
<name>PaymentServer</name>
<message>
- <location filename="../paymentserver.cpp" line="+392"/>
+ <location filename="../paymentserver.cpp" line="+403"/>
+ <location line="+13"/>
<source>URI handling</source>
<translation>Manexo de URI</translation>
</message>
@@ -1182,45 +1558,82 @@ Dirección: %4
<translation>Non se pode parsear a URI! Esto pode ser causado por unha dirección Bitcoin inválida ou parámetros da URI malformados.</translation>
</message>
<message>
- <location line="+69"/>
+ <location line="+96"/>
<source>Requested payment amount of %1 is too small (considered dust).</source>
<translation>A cantidade de %1 na solicitude de pado é moi pequena (considerada po).</translation>
</message>
<message>
- <location line="+4"/>
- <location line="+37"/>
+ <location line="-221"/>
+ <location line="+212"/>
+ <location line="+13"/>
+ <location line="+95"/>
+ <location line="+18"/>
+ <location line="+16"/>
<source>Payment request error</source>
<translation>Erro na petición de pago</translation>
</message>
<message>
+ <location line="-353"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Net manager warning</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+1"/>
- <source>Insecure requests to custom payment scripts unsupported</source>
- <translation>Non se soportan as peticións inseguras a scrips de pagos propios</translation>
+ <source>Your active proxy doesn&apos;t support SOCKS5, which is required for payment requests via proxy.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+38"/>
+ <location line="+52"/>
+ <source>Payment request fetch URL is invalid: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Payment request file handling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Payment request file can not be read or processed! This can be caused by an invalid payment request file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+73"/>
+ <source>Unverified payment requests to custom payment scripts are unsupported.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+59"/>
<source>Refund from %1</source>
<translation>Devolución dende %1</translation>
</message>
<message>
- <location line="+42"/>
+ <location line="+43"/>
<source>Error communicating with %1: %2</source>
<translation>Erro comunicando con %1: %2</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+24"/>
+ <source>Payment request can not be parsed or processed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
<source>Bad response from server %1</source>
<translation>Responsa errónea do servidor %1</translation>
</message>
<message>
- <location line="+32"/>
+ <location line="+33"/>
<source>Payment acknowledged</source>
<translation>Pago admitido</translation>
</message>
<message>
- <location line="-58"/>
- <location line="+30"/>
- <location line="+17"/>
+ <location line="-11"/>
<source>Network request error</source>
<translation>Erro de solicitude de rede</translation>
</message>
@@ -1228,32 +1641,26 @@ Dirección: %4
<context>
<name>QObject</name>
<message>
- <location filename="../bitcoin.cpp" line="+114"/>
- <location line="+5"/>
- <location filename="../intro.cpp" line="-32"/>
+ <location filename="../bitcoin.cpp" line="+71"/>
+ <location line="+11"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-4"/>
+ <location line="+1"/>
<source>Error: Specified data directory &quot;%1&quot; does not exist.</source>
<translation>Erro: O directorio de datos especificado &quot;%1&quot; non existe.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="-12"/>
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation>Erro: combinación inválida de -regtest e -testnet.</translation>
</message>
- <message>
- <location filename="../intro.cpp" line="+1"/>
- <source>Error: Specified data directory &quot;%1&quot; can not be created.</source>
- <translation>Erro: O directorio de datos especificado &quot;%1&quot; non pode ser creado.</translation>
- </message>
</context>
<context>
<name>QRImageWidget</name>
<message>
- <location filename="../receiverequestdialog.cpp" line="+32"/>
+ <location filename="../receiverequestdialog.cpp" line="+36"/>
<source>&amp;Save Image...</source>
<translation>&amp;Gardar Imaxe...</translation>
</message>
@@ -1269,8 +1676,8 @@ Dirección: %4
</message>
<message>
<location line="+0"/>
- <source>PNG Images (*.png)</source>
- <translation>Imaxes PNG (*.png)</translation>
+ <source>PNG Image (*.png)</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1287,15 +1694,16 @@ Dirección: %4
<location line="+23"/>
<location line="+23"/>
<location line="+36"/>
- <location line="+53"/>
+ <location line="+23"/>
+ <location line="+36"/>
<location line="+23"/>
<location line="+23"/>
- <location filename="../rpcconsole.cpp" line="+352"/>
+ <location filename="../rpcconsole.cpp" line="+359"/>
<source>N/A</source>
<translation>N/A</translation>
</message>
<message>
- <location line="-217"/>
+ <location line="-223"/>
<source>Client version</source>
<translation>Versión do cliente</translation>
</message>
@@ -1305,7 +1713,17 @@ Dirección: %4
<translation>&amp;Información</translation>
</message>
<message>
- <location line="+68"/>
+ <location line="-10"/>
+ <source>Debug window</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+25"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+53"/>
<source>Using OpenSSL version</source>
<translation>Usar versión OpenSSL</translation>
</message>
@@ -1321,16 +1739,16 @@ Dirección: %4
</message>
<message>
<location line="+7"/>
- <source>Number of connections</source>
- <translation>Número de conexións</translation>
+ <source>Name</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+23"/>
- <source>On testnet</source>
- <translation>Na testnet</translation>
+ <source>Number of connections</source>
+ <translation>Número de conexións</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+29"/>
<source>Block chain</source>
<translation>Cadea de bloques</translation>
</message>
@@ -1355,21 +1773,6 @@ Dirección: %4
<translation>&amp;Abrir</translation>
</message>
<message>
- <location line="+16"/>
- <source>Command-line options</source>
- <translation>Opcións da liña de comandos</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>Amosar a mensaxe de axuda de Bitcoin-Qt para obter unha lista coas posibles opcións da liña de comandos de Bitcoin.</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>&amp;Show</source>
- <translation>&amp;Amosar</translation>
- </message>
- <message>
<location line="+24"/>
<source>&amp;Console</source>
<translation>&amp;Consola</translation>
@@ -1400,22 +1803,12 @@ Dirección: %4
<translation>Fóra:</translation>
</message>
<message>
- <location line="-541"/>
+ <location line="-521"/>
<source>Build date</source>
<translation>Data de construción</translation>
</message>
<message>
- <location line="-104"/>
- <source>Bitcoin - Debug window</source>
- <translation>Bitcoin - Ventana de depuración</translation>
- </message>
- <message>
- <location line="+25"/>
- <source>Bitcoin Core</source>
- <translation>Core de Bitcoin</translation>
- </message>
- <message>
- <location line="+279"/>
+ <location line="+206"/>
<source>Debug log file</source>
<translation>Arquivo de log de depuración</translation>
</message>
@@ -1425,7 +1818,7 @@ Dirección: %4
<translation>Abrir o arquivo de log de depuración de Bitcoin dende o directorio actual de datos. Esto pode levar uns cantos segundos para grandes arquivos de log.</translation>
</message>
<message>
- <location line="+102"/>
+ <location line="+76"/>
<source>Clear console</source>
<translation>Limpar consola</translation>
</message>
@@ -1445,7 +1838,7 @@ Dirección: %4
<translation>Escribe &lt;b&gt;axuda&lt;/b&gt; para unha vista xeral dos comandos dispoñibles.</translation>
</message>
<message>
- <location line="+128"/>
+ <location line="+122"/>
<source>%1 B</source>
<translation>%1 B</translation>
</message>
@@ -1483,37 +1876,22 @@ Dirección: %4
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+22"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
<source>&amp;Amount:</source>
<translation>&amp;Cantidade:</translation>
</message>
<message>
- <location line="+16"/>
- <source>The amount to request</source>
- <translation>A cantidade a solicitar</translation>
- </message>
- <message>
- <location line="+7"/>
+ <location line="-13"/>
<source>&amp;Label:</source>
<translation>&amp;Etiqueta:</translation>
</message>
<message>
- <location line="+10"/>
- <source>The label to associate with the receiving address</source>
- <translation>A etiqueta asociada coa dirección para recibir</translation>
- </message>
- <message>
- <location line="+7"/>
+ <location line="-34"/>
<source>&amp;Message:</source>
<translation>&amp;Mensaxe:</translation>
</message>
<message>
- <location line="+10"/>
- <source>The message to attach to payment request</source>
- <translation>A mensaxe para incluír na solicitude de pago</translation>
- </message>
- <message>
- <location line="+14"/>
+ <location line="-17"/>
<source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation>Reutilizar unha das direccións para recibir previas. Reutilizar direccións ten problemas de seguridade e privacidade. Non empregues esto agás que antes se fixese unha solicitude de rexeneración dun pago.</translation>
</message>
@@ -1523,9 +1901,24 @@ Dirección: %4
<translation>R&amp;eutilizar unha dirección para recibir existente (non recomendado)</translation>
</message>
<message>
+ <location line="+27"/>
+ <source>An optional label to associate with the new receiving address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+7"/>
- <source>Use this form to request payments. All fields are optional.</source>
- <translation>Emprega este formulario para solicitar pagos. Tódolos campos son opcionais.</translation>
+ <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+39"/>
+ <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+17"/>
@@ -1542,6 +1935,31 @@ Dirección: %4
<source>&amp;Request payment</source>
<translation>&amp;Solicitar pago</translation>
</message>
+ <message>
+ <location line="+47"/>
+ <source>Requested payments</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Show the selected request (does the same as double clicking an entry)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Show</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Remove the selected entries from the list</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Remove</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
@@ -1562,16 +1980,11 @@ Dirección: %4
</message>
<message>
<location line="+7"/>
- <source>&amp;Copy Image</source>
- <translation>&amp;Copiar Imaxe</translation>
- </message>
- <message>
- <location line="+7"/>
<source>&amp;Save Image...</source>
<translation>&amp;Gardar Imaxe...</translation>
</message>
<message>
- <location filename="../receiverequestdialog.cpp" line="+58"/>
+ <location filename="../receiverequestdialog.cpp" line="+56"/>
<source>Request payment to %1</source>
<translation>Solicitar pago a %1</translation>
</message>
@@ -1617,16 +2030,119 @@ Dirección: %4
</message>
</context>
<context>
+ <name>RecentRequestsTableModel</name>
+ <message>
+ <location filename="../recentrequeststablemodel.cpp" line="+24"/>
+ <source>Date</source>
+ <translation>Data</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Label</source>
+ <translation>Etiqueta</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Message</source>
+ <translation>Mensaxe</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Amount</source>
+ <translation>Cantidade</translation>
+ </message>
+ <message>
+ <location line="+38"/>
+ <source>(no label)</source>
+ <translation>(sen etiqueta)</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>(no message)</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+140"/>
- <location line="+213"/>
+ <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location line="+80"/>
<source>Send Coins</source>
<translation>Moedas Enviadas</translation>
</message>
<message>
- <location line="+50"/>
+ <location line="+76"/>
+ <source>Coin Control Features</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Inputs...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>automatically selected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Insufficient funds!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+89"/>
+ <source>Quantity:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+35"/>
+ <source>Bytes:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Amount:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Priority:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Low Output:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>After Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Change:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+44"/>
+ <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Custom change address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+115"/>
<source>Send to multiple recipients at once</source>
<translation>Enviar a múltiples receptores á vez</translation>
</message>
@@ -1651,12 +2167,7 @@ Dirección: %4
<translation>Balance:</translation>
</message>
<message>
- <location line="+10"/>
- <source>123.456 BTC</source>
- <translation>123.456 BTC</translation>
- </message>
- <message>
- <location line="+31"/>
+ <location line="+41"/>
<source>Confirm the send action</source>
<translation>Confirmar a acción de envío</translation>
</message>
@@ -1666,49 +2177,125 @@ Dirección: %4
<translation>&amp;Enviar</translation>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-154"/>
+ <location filename="../sendcoinsdialog.cpp" line="-228"/>
<source>Confirm send coins</source>
<translation>Confirmar envío de moedas</translation>
</message>
<message>
- <location line="-90"/>
+ <location line="-74"/>
<location line="+5"/>
<location line="+5"/>
+ <location line="+4"/>
<source>%1 to %2</source>
<translation>%1 a %2</translation>
</message>
<message>
- <location line="+26"/>
+ <location line="-136"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation>Introduce unha dirección Bitcoin (exemplo: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Copy quantity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation>Copiar cantidade</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy after fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy bytes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy low output</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy change</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+170"/>
+ <source>Total Amount %1 (= %2)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>or</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+202"/>
<source>The recipient address is not valid, please recheck.</source>
<translation>A dirección de recepción non é válida, por favor compróbea.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The amount to pay must be larger than 0.</source>
<translation>A cantidade a pagar debe ser maior que 0.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The amount exceeds your balance.</source>
<translation>A cantidade sobrepasa o teu balance.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The total exceeds your balance when the %1 transaction fee is included.</source>
<translation>O total sobrepasa o teu balance cando se inclúe a tarifa de transacción %1.</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+3"/>
<source>Duplicate address found, can only send to each address once per send operation.</source>
<translation>Atopouse dirección duplicada, so se pode enviar a cada dirección unha vez por operación.</translation>
</message>
<message>
+ <location line="+3"/>
+ <source>Transaction creation failed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+4"/>
- <source>Error: Transaction creation failed!</source>
- <translation>Erro: Fallou a creación da transacción!</translation>
+ <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+15"/>
+ <location line="+112"/>
+ <source>Warning: Invalid Bitcoin address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+21"/>
+ <source>(no label)</source>
+ <translation>(sen etiqueta)</translation>
+ </message>
+ <message>
+ <location line="-11"/>
+ <source>Warning: Unknown change address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-366"/>
<source>Are you sure you want to send?</source>
<translation>Seguro que queres enviar?</translation>
</message>
@@ -1718,17 +2305,7 @@ Dirección: %4
<translation>engadido como tarifa de transacción</translation>
</message>
<message>
- <location line="+6"/>
- <source>Total Amount %1</source>
- <translation>Cantidade Total %1</translation>
- </message>
- <message>
- <location line="+20"/>
- <source>Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
- <translation>Erro: a transacción foi rexeitada. Esto pode ocorrer se algunha das moedas no teu moedeiro xa foi gastada, como por exemplo se tés unha copia de wallet.dat e gastas algunhas moedas na copia pero todavía non están marcadas como gastadas aquí.</translation>
- </message>
- <message>
- <location line="+144"/>
+ <location line="+170"/>
<source>Payment request expired</source>
<translation>A petición de pago expirou</translation>
</message>
@@ -1741,39 +2318,44 @@ Dirección: %4
<context>
<name>SendCoinsEntry</name>
<message>
- <location filename="../forms/sendcoinsentry.ui" line="+33"/>
- <location line="+585"/>
+ <location filename="../forms/sendcoinsentry.ui" line="+131"/>
+ <location line="+521"/>
+ <location line="+536"/>
<source>A&amp;mount:</source>
<translation>&amp;Cantidade:</translation>
</message>
<message>
- <location line="-572"/>
- <location line="+585"/>
+ <location line="-1152"/>
<source>Pay &amp;To:</source>
<translation>Pagar &amp;A:</translation>
</message>
<message>
- <location line="-551"/>
+ <location line="+18"/>
<source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>A dirección á que enviar o pago (exemplo: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location filename="../sendcoinsentry.cpp" line="+28"/>
+ <location filename="../sendcoinsentry.cpp" line="+30"/>
<source>Enter a label for this address to add it to your address book</source>
<translation>Introduce unha etiqueta para esta dirección para engadila ao teu libro de direccións</translation>
</message>
<message>
- <location filename="../forms/sendcoinsentry.ui" line="-18"/>
+ <location filename="../forms/sendcoinsentry.ui" line="+57"/>
<source>&amp;Label:</source>
<translation>&amp;Etiqueta:</translation>
</message>
<message>
- <location line="+28"/>
+ <location line="-50"/>
<source>Choose previously used address</source>
<translation>Escoller dirección previamente empregada</translation>
</message>
<message>
- <location line="+10"/>
+ <location line="-40"/>
+ <source>This is a normal payment.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+50"/>
<source>Alt+A</source>
<translation>Alt+A</translation>
</message>
@@ -1789,16 +2371,45 @@ Dirección: %4
</message>
<message>
<location line="+7"/>
- <source>Remove this recipient</source>
- <translation>Eliminar este receptor</translation>
+ <location line="+524"/>
+ <location line="+536"/>
+ <source>Remove this entry</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="-1008"/>
+ <source>Message:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+958"/>
+ <source>This is a verified payment request.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-991"/>
<source>Enter a label for this address to add it to the list of used addresses</source>
<translation>Introduce unha etiqueta para esta dirección para engadila á listaxe de direccións empregadas</translation>
</message>
<message>
- <location line="+465"/>
+ <location line="+459"/>
+ <source>This is an unverified payment request.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+18"/>
+ <location line="+532"/>
+ <source>Pay To:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-498"/>
+ <location line="+536"/>
<source>Memo:</source>
<translation>Memo:</translation>
</message>
@@ -1809,6 +2420,19 @@ Dirección: %4
</message>
</context>
<context>
+ <name>ShutdownWindow</name>
+ <message>
+ <location filename="../utilitydialog.cpp" line="+48"/>
+ <source>Bitcoin Core is shutting down...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Do not shut down the computer until this window disappears.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>SignVerifyMessageDialog</name>
<message>
<location filename="../forms/signverifymessagedialog.ui" line="+14"/>
@@ -1816,7 +2440,7 @@ Dirección: %4
<translation>Sinaturas - Asinar / Verificar unha Mensaxe</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+10"/>
<source>&amp;Sign Message</source>
<translation>&amp;Asinar Mensaxe</translation>
</message>
@@ -1919,7 +2543,7 @@ Dirección: %4
<translation>Restaurar todos os campos de verificación de mensaxe</translation>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+27"/>
+ <location filename="../signverifymessagedialog.cpp" line="+29"/>
<location line="+3"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>Introduza unha dirección Bitcoin (exemplo: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
@@ -1935,7 +2559,7 @@ Dirección: %4
<translation>Introduce sinatura Bitcoin</translation>
</message>
<message>
- <location line="+85"/>
+ <location line="+84"/>
<location line="+81"/>
<source>The entered address is invalid.</source>
<translation>A dirección introducida é inválida.</translation>
@@ -2004,9 +2628,14 @@ Dirección: %4
<context>
<name>SplashScreen</name>
<message>
- <location filename="../splashscreen.cpp" line="+23"/>
- <source>The Bitcoin developers</source>
- <translation>Os desenvolvedores de Bitcoin.</translation>
+ <location filename="../splashscreen.cpp" line="+28"/>
+ <source>Bitcoin Core</source>
+ <translation>Core de Bitcoin</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>The Bitcoin Core developers</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
@@ -2017,7 +2646,7 @@ Dirección: %4
<context>
<name>TrafficGraphWidget</name>
<message>
- <location filename="../trafficgraphwidget.cpp" line="+75"/>
+ <location filename="../trafficgraphwidget.cpp" line="+79"/>
<source>KB/s</source>
<translation>KB/s</translation>
</message>
@@ -2025,7 +2654,7 @@ Dirección: %4
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="+22"/>
+ <location filename="../transactiondesc.cpp" line="+28"/>
<source>Open until %1</source>
<translation>Aberto ata %1</translation>
</message>
@@ -2098,12 +2727,12 @@ Dirección: %4
<location line="+12"/>
<location line="+45"/>
<location line="+17"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Credit</source>
<translation>Crédito</translation>
</message>
<message numerus="yes">
- <location line="-120"/>
+ <location line="-125"/>
<source>matures in %n more block(s)</source>
<translation><numerusform>madura nun bloque máis</numerusform><numerusform>madura en %n bloques máis</numerusform></translation>
</message>
@@ -2116,12 +2745,12 @@ Dirección: %4
<location line="+44"/>
<location line="+8"/>
<location line="+15"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Debit</source>
<translation>Débito</translation>
</message>
<message>
- <location line="-57"/>
+ <location line="-62"/>
<source>Transaction fee</source>
<translation>Tarifa de transacción</translation>
</message>
@@ -2132,11 +2761,12 @@ Dirección: %4
</message>
<message>
<location line="+6"/>
+ <location line="+9"/>
<source>Message</source>
<translation>Mensaxe</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="-7"/>
<source>Comment</source>
<translation>Comentario</translation>
</message>
@@ -2146,7 +2776,7 @@ Dirección: %4
<translation>ID de Transacción</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+18"/>
<source>Merchant</source>
<translation>Comerciante</translation>
</message>
@@ -2186,7 +2816,7 @@ Dirección: %4
<translation>falso</translation>
</message>
<message>
- <location line="-227"/>
+ <location line="-232"/>
<source>, has not been successfully broadcast yet</source>
<translation>, non foi propagado con éxito todavía</translation>
</message>
@@ -2217,7 +2847,7 @@ Dirección: %4
<context>
<name>TransactionTableModel</name>
<message>
- <location filename="../transactiontablemodel.cpp" line="+227"/>
+ <location filename="../transactiontablemodel.cpp" line="+234"/>
<source>Date</source>
<translation>Data</translation>
</message>
@@ -2236,8 +2866,13 @@ Dirección: %4
<source>Amount</source>
<translation>Cantidade</translation>
</message>
+ <message>
+ <location line="+59"/>
+ <source>Immature (%1 confirmations, will be available after %2)</source>
+ <translation type="unfinished"/>
+ </message>
<message numerus="yes">
- <location line="+57"/>
+ <location line="+16"/>
<source>Open for %n more block(s)</source>
<translation><numerusform>Abrir para %n bloque máis</numerusform><numerusform>Abrir para %n bloques máis</numerusform></translation>
</message>
@@ -2257,17 +2892,13 @@ Dirección: %4
<translation>Sen confirmar (%1 de %2 confirmacións)</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="-22"/>
+ <location line="+25"/>
<source>Confirmed (%1 confirmations)</source>
<translation>Confirmado (%1 confirmacións)</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>O balance minado estará dispoñible cando madure nun bloque máis</numerusform><numerusform>O balance minado estará dispoñible cando madure en %n bloques máis</numerusform></translation>
- </message>
<message>
- <location line="+5"/>
+ <location line="-22"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation>Este bloque non foi recibido por ningún outro nodo e probablemente non será aceptado!</translation>
</message>
@@ -2277,7 +2908,7 @@ Dirección: %4
<translation>Xerado pero non aceptado</translation>
</message>
<message>
- <location line="+43"/>
+ <location line="+62"/>
<source>Received with</source>
<translation>Recibido con</translation>
</message>
@@ -2335,7 +2966,7 @@ Dirección: %4
<context>
<name>TransactionView</name>
<message>
- <location filename="../transactionview.cpp" line="+52"/>
+ <location filename="../transactionview.cpp" line="+57"/>
<location line="+16"/>
<source>All</source>
<translation>Todo</translation>
@@ -2396,12 +3027,12 @@ Dirección: %4
<translation>Outro</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+6"/>
<source>Enter address or label to search</source>
<translation>Introduce dirección ou etiqueta para buscar</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+6"/>
<source>Min amount</source>
<translation>Cantidade mínima</translation>
</message>
@@ -2436,17 +3067,37 @@ Dirección: %4
<translation>Amosar detalles da transacción</translation>
</message>
<message>
- <location line="+143"/>
- <source>Export Transaction Data</source>
- <translation>Exportar Datos de Transacción</translation>
+ <location line="+142"/>
+ <source>Export Transaction History</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="+19"/>
+ <source>Exporting Failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>There was an error trying to save the transaction history to %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Exporting Successful</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The transaction history was successfully saved to %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-22"/>
<source>Comma separated file (*.csv)</source>
<translation>Arquivo separado por comas (*.csv)</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+9"/>
<source>Confirmed</source>
<translation>Confirmado</translation>
</message>
@@ -2481,17 +3132,7 @@ Dirección: %4
<translation>ID</translation>
</message>
<message>
- <location line="+4"/>
- <source>Error exporting</source>
- <translation>Error na exportación</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation>Non se pudo escribir ao arquivo %1.</translation>
- </message>
- <message>
- <location line="+100"/>
+ <location line="+107"/>
<source>Range:</source>
<translation>Periodo:</translation>
</message>
@@ -2502,9 +3143,17 @@ Dirección: %4
</message>
</context>
<context>
+ <name>WalletFrame</name>
+ <message>
+ <location filename="../walletframe.cpp" line="+26"/>
+ <source>No wallet has been loaded.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>WalletModel</name>
<message>
- <location filename="../walletmodel.cpp" line="+218"/>
+ <location filename="../walletmodel.cpp" line="+245"/>
<source>Send Coins</source>
<translation>Moedas Enviadas</translation>
</message>
@@ -2512,7 +3161,7 @@ Dirección: %4
<context>
<name>WalletView</name>
<message>
- <location filename="../walletview.cpp" line="+46"/>
+ <location filename="../walletview.cpp" line="+43"/>
<source>&amp;Export</source>
<translation>&amp;Exportar</translation>
</message>
@@ -2522,65 +3171,60 @@ Dirección: %4
<translation>Exportar os datos da pestaña actual a un arquivo.</translation>
</message>
<message>
- <location line="+183"/>
+ <location line="+181"/>
<source>Backup Wallet</source>
<translation>Copia de Seguridade de Moedeiro</translation>
</message>
<message>
- <location line="+0"/>
+ <location line="+1"/>
<source>Wallet Data (*.dat)</source>
<translation>Datos de Moedeiro (*.dat)</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="+6"/>
<source>Backup Failed</source>
<translation>Copia de Seguridade Fallida</translation>
</message>
<message>
<location line="+0"/>
- <source>There was an error trying to save the wallet data to the new location.</source>
- <translation>Houbo un erro ao tentar gardar os datos do moedeiro á nova localización.</translation>
+ <source>There was an error trying to save the wallet data to %1.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+4"/>
- <source>Backup Successful</source>
- <translation>Copia de Seguridade Correcta</translation>
+ <source>The wallet data was successfully saved to %1.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+0"/>
- <source>The wallet data was successfully saved to the new location.</source>
- <translation>Os datos do moedeiro foron gardados con éxito na nova localización.</translation>
+ <source>Backup Successful</source>
+ <translation>Copia de Seguridade Correcta</translation>
</message>
</context>
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+102"/>
- <source>Bitcoin version</source>
- <translation>Versión de Bitcoin</translation>
- </message>
- <message>
- <location line="+107"/>
+ <location filename="../bitcoinstrings.cpp" line="+221"/>
<source>Usage:</source>
<translation>Emprego:</translation>
</message>
<message>
- <location line="-55"/>
+ <location line="-54"/>
<source>List commands</source>
<translation>Listar comandos</translation>
</message>
<message>
- <location line="-13"/>
+ <location line="-14"/>
<source>Get help for a command</source>
<translation>Obter axuda para un comando</translation>
</message>
<message>
- <location line="+25"/>
+ <location line="+26"/>
<source>Options:</source>
<translation>Opcións:</translation>
</message>
<message>
- <location line="+24"/>
+ <location line="+22"/>
<source>Specify configuration file (default: bitcoin.conf)</source>
<translation>Especificar arquivo de configuración (por defecto: bitcoin.conf)</translation>
</message>
@@ -2600,7 +3244,7 @@ Dirección: %4
<translation>Fixar tamaño da caché da base de datos en megabytes (por defecto: 25)</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-26"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
<translation>Escoitar conexións no &lt;porto&gt; (por defecto: 8333 ou testnet: 18333)</translation>
</message>
@@ -2610,7 +3254,7 @@ Dirección: %4
<translation>Manter como moito &lt;n&gt; conexións con pares (por defecto: 125)</translation>
</message>
<message>
- <location line="-49"/>
+ <location line="-51"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation>Conectar a nodo para recuperar direccións de pares, e desconectar</translation>
</message>
@@ -2620,37 +3264,37 @@ Dirección: %4
<translation>Especificar a túa propia dirección pública</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation>Umbral para desconectar pares con mal comportamento (por defecto: 100)</translation>
</message>
<message>
- <location line="-142"/>
+ <location line="-148"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation>Número de segundos para manter sen reconectar aos pares con mal comportamento (por defecto: 86400)</translation>
</message>
<message>
- <location line="-33"/>
+ <location line="-36"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
<translation>Ocorreu un erro mentres se establecía o porto RPC %u para escoitar sobre IPv4: %s</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation>Escoitar conexións JSON-RPC no &lt;porto&gt; (por defecto: 8332 ou testnet: 18332)</translation>
</message>
<message>
- <location line="+40"/>
+ <location line="+45"/>
<source>Accept command line and JSON-RPC commands</source>
<translation>Aceptar liña de comandos e comandos JSON-RPC</translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>Executar no fondo como un demo e aceptar comandos</translation>
</message>
<message>
- <location line="+40"/>
+ <location line="+39"/>
<source>Use the test network</source>
<translation>Empregar a rede de proba</translation>
</message>
@@ -2660,7 +3304,7 @@ Dirección: %4
<translation>Aceptar conexións de fóra (por defecto: 1 se non -proxy ou -connect)</translation>
</message>
<message>
- <location line="-87"/>
+ <location line="-95"/>
<source>%s, you must set a rpcpassword in the configuration file:
%s
It is recommended you use the following random password:
@@ -2711,6 +3355,11 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+4"/>
+ <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</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>Erro: A transacción foi rexeitada! Esto podería suceder se unha das moedas do teu moedeiro xa foi gastada, como se usas unha copia de wallet.dat e hai moedas que se gastaron na copia pero non foron marcadas como gastadas aquí.</translation>
</message>
@@ -2725,17 +3374,17 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Executar comando cando unha transacción do moedeiro cambia (%s no comando é substituído por TxID)</translation>
</message>
<message>
- <location line="+11"/>
- <source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source>
- <translation>Fixar tamaño máximo das transaccións de alta-prioridade/baixa-tarifa en bytes (por defecto: 27000)</translation>
- </message>
- <message>
- <location line="+6"/>
+ <location line="+18"/>
<source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
<translation>Esta é unha build de test pre-lanzamento - emprégaa baixo o teu propio risco - non empregar para minado ou aplicacións de comerciantes</translation>
</message>
<message>
<location line="+5"/>
+ <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
<source>Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source>
<translation>Precaución: -paytxfee está posto moi algo! Esta é a tarifa de transacción que ti pagarás se envías unha transacción.</translation>
</message>
@@ -2765,17 +3414,27 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Precaución: wallet.dat corrupto, datos salvagardados! O wallet.dat orixinal foi gardado como wallet.{timestamp}.bak en %s; se o teu balance ou transaccións son incorrectas deberías restauralas dende unha copia de seguridade.</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="+9"/>
+ <source>&lt;category&gt; can be:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
<source>Attempt to recover private keys from a corrupt wallet.dat</source>
<translation>Tentar recuperar claves privadas dende un wallet.dat corrupto</translation>
</message>
<message>
<location line="+1"/>
+ <source>Bitcoin Core Daemon</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Bitcoin RPC client version</source>
<translation>Versión de cliente RPC de Bitcoin</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
<source>Block creation options:</source>
<translation>Opcións de creación de bloque:</translation>
</message>
@@ -2785,7 +3444,12 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Conectar so ao(s) nodo(s) especificado(s)</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
+ <source>Connect through SOCKS proxy</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect to JSON-RPC on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation>Conectar a JSON-RPC no &lt;porto&gt; (por defecto: 8332 ou testnet: 18332)</translation>
</message>
@@ -2801,6 +3465,11 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+1"/>
+ <source>Do not load the wallet and disable wallet RPC calls</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Do you want to rebuild the block database now?</source>
<translation>Queres reconstruír a base de datos de bloques agora?</translation>
</message>
@@ -2895,7 +3564,12 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Fallou a escritura dos datos para desfacer</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
+ <source>Fee per kB to add to transactions you send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Find peers using DNS lookup (default: 1 unless -connect)</source>
<translation>Atopar pares usando lookup DNS (por defecto: 1 agás -connect)</translation>
</message>
@@ -2915,6 +3589,11 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Como de exhaustiva é a verificación de bloques (0-4, pro defecto: 3)</translation>
</message>
<message>
+ <location line="+1"/>
+ <source>If &lt;category&gt; is not supplied, output all debugging information.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+2"/>
<source>Incorrect or no genesis block found. Wrong datadir for network?</source>
<translation>Bloque genesis incorrecto o no existente. Datadir erróneo para a rede?</translation>
@@ -2930,17 +3609,37 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Non hai suficientes descritores de arquivo dispoñibles.</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+5"/>
+ <source>Prepend debug output with timestamp (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>RPC client options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Rebuild block chain index from current blk000??.dat files</source>
<translation>Reconstruír índice de cadea de bloque dende os ficheiros actuais blk000??.dat</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+5"/>
+ <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Send command to Bitcoin server</source>
<translation>Enviar comando a servidor Bitcoin</translation>
</message>
<message>
- <location line="+10"/>
+ <location line="+7"/>
+ <source>Set maximum block size in bytes (default: %d)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Set the number of threads to service RPC calls (default: 4)</source>
<translation>Fixar o número de fíos para as chamadas aos servicios RPC (por defecto: 4)</translation>
</message>
@@ -2955,12 +3654,17 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Comezar servidor Bitcoin</translation>
</message>
<message>
- <location line="+12"/>
+ <location line="+3"/>
+ <source>This is intended for regression testing tools and app development.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Usage (deprecated, use bitcoin-cli):</source>
<translation>Emprego (desaconsellado, usar bitcoin-cli)</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+7"/>
<source>Verifying blocks...</source>
<translation>Verificando bloques...</translation>
</message>
@@ -2971,31 +3675,56 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+1"/>
+ <source>Wait for RPC server to start</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Wallet %s resides outside data directory %s</source>
<translation>O moedeiro %s reside fóra do directorio de datos %s</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+2"/>
+ <source>Wallet options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>You need to rebuild the database using -reindex to change -txindex</source>
<translation>Precisas reconstruír a base de datos empregando -reindex para cambiar -txindex</translation>
</message>
<message>
- <location line="-78"/>
+ <location line="-79"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation>Importa bloques dende arquivos blk000??.dat externos</translation>
</message>
<message>
- <location line="-98"/>
+ <location line="-105"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation>Executar comando cando se recibe unha alerta relevante ou vemos un fork realmente longo (%s no cmd é substituído pola mensaxe)</translation>
</message>
<message>
- <location line="+17"/>
+ <location line="+14"/>
+ <source>Output debugging information (default: 0, supplying &lt;category&gt; is optional)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
<translation>Fixar o número de fíos para sripts de verificación (ata 16, 0 = auto, &lt;0 = deixa tantos cores libres, por defecto: 0)</translation>
</message>
<message>
- <location line="+83"/>
+ <location line="+89"/>
<source>Information</source>
<translation>Información</translation>
</message>
@@ -3035,47 +3764,17 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Conectar so a nodos na rede &lt;net&gt; (IPv4, IPv6 ou Tor)</translation>
</message>
<message>
- <location line="+2"/>
- <source>Output extra debugging information. Implies all other -debug* options</source>
- <translation>Emitir información extra de depuración. Implica todas as demáis opcións -debug*.</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Output extra network debugging information</source>
- <translation>Emitir información extra de depuración de rede</translation>
- </message>
- <message>
- <location line="+2"/>
- <source>Prepend debug output with timestamp</source>
- <translation>Prefixar saída de depuración coa marca de tempo</translation>
- </message>
- <message>
- <location line="+5"/>
+ <location line="+9"/>
<source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
<translation>Opcións SSL: (ver ńa Wiki Bitcoin as instrucción de configuración de SSL)</translation>
</message>
<message>
- <location line="+1"/>
- <source>Select the version of socks proxy to use (4-5, default: 5)</source>
- <translation>Seleccionar a versión do proxy socks que usar (4-5, por defecto: 5)</translation>
- </message>
- <message>
- <location line="+3"/>
+ <location line="+4"/>
<source>Send trace/debug info to console instead of debug.log file</source>
<translation>Enviar traza/información de depuración á consola en lugar de ao arquivo debug.log</translation>
</message>
<message>
- <location line="+1"/>
- <source>Send trace/debug info to debugger</source>
- <translation>Enviar traza/información de depuración ao depurador</translation>
- </message>
- <message>
- <location line="+5"/>
- <source>Set maximum block size in bytes (default: 250000)</source>
- <translation>Fixar tamaño máximo de bloque en bytes (por defecto: 250000)</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+6"/>
<source>Set minimum block size in bytes (default: 0)</source>
<translation>Fixar tamaño mínimo de bloque en bytes (por defecto: 0)</translation>
</message>
@@ -3100,7 +3799,7 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Erro do sistema:</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Transaction amount too small</source>
<translation>A cantidade da transacción é demasiado pequena</translation>
</message>
@@ -3125,32 +3824,32 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Usar UPnP para mapear o porto de escoita (por defecto: 1 se á escoita)</translation>
</message>
<message>
- <location line="+1"/>
- <source>Use proxy to reach tor hidden services (default: same as -proxy)</source>
- <translation>Empregar proxy para chegar os servicios ocultos de tor (por defecto: mesmo que -proxy)</translation>
- </message>
- <message>
<location line="+2"/>
<source>Username for JSON-RPC connections</source>
<translation>Nome de usuario para conexións JSON-RPC</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+7"/>
<source>Warning</source>
<translation>Precaución</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Warning: This version is obsolete, upgrade required!</source>
<translation>Precaución: Esta versión é obsoleta, precísase unha actualización!</translation>
</message>
<message>
<location line="+2"/>
+ <source>version</source>
+ <translation>versión</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>wallet.dat corrupt, salvage failed</source>
<translation>wallet.dat corrupto, fallou o gardado</translation>
</message>
<message>
- <location line="-54"/>
+ <location line="-58"/>
<source>Password for JSON-RPC connections</source>
<translation>Contrasinal para conexións JSON-RPC</translation>
</message>
@@ -3160,27 +3859,27 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Permitir conexións JSON-RPC dende direccións IP especificadas</translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation>Enviar comandos a nodo executando na &lt;ip&gt; (por defecto: 127.0.0.1)</translation>
</message>
<message>
- <location line="-126"/>
+ <location line="-132"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation>Executar comando cando o mellor bloque cambie (%s no comando é sustituído polo hash do bloque)</translation>
</message>
<message>
- <location line="+155"/>
+ <location line="+161"/>
<source>Upgrade wallet to latest format</source>
<translation>Actualizar moedeiro ao formato máis recente</translation>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation>Fixar tamaño do pool de claves a &lt;n&gt; (por defecto: 100)</translation>
</message>
<message>
- <location line="-12"/>
+ <location line="-11"/>
<source>Rescan the block chain for missing wallet transactions</source>
<translation>Rescanear transaccións ausentes na cadea de bloques</translation>
</message>
@@ -3190,7 +3889,7 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Empregar OpenSSL (https) para conexións JSON-RPC</translation>
</message>
<message>
- <location line="-29"/>
+ <location line="-30"/>
<source>Server certificate file (default: server.cert)</source>
<translation>Arquivo de certificado do servidor (por defecto: server.cert)</translation>
</message>
@@ -3205,27 +3904,22 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Esta mensaxe de axuda</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Unable to bind to %s on this computer (bind returned error %d, %s)</source>
<translation>Imposible enlazar con %s neste ordenador (enlace devolveu erro %d, %s)</translation>
</message>
<message>
- <location line="-95"/>
- <source>Connect through socks proxy</source>
- <translation>Conectar a través de proxy de socks</translation>
- </message>
- <message>
- <location line="-11"/>
+ <location line="-107"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation>Permitir lookup de DNS para -addnote, -seednote e -connect</translation>
</message>
<message>
- <location line="+58"/>
+ <location line="+60"/>
<source>Loading addresses...</source>
<translation>Cargando direccións...</translation>
</message>
<message>
- <location line="-36"/>
+ <location line="-37"/>
<source>Error loading wallet.dat: Wallet corrupted</source>
<translation>Erro cargando wallet.dat: Moedeiro corrupto</translation>
</message>
@@ -3245,12 +3939,12 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Erro cargando wallet.dat</translation>
</message>
<message>
- <location line="+30"/>
+ <location line="+31"/>
<source>Invalid -proxy address: &apos;%s&apos;</source>
<translation>Dirección -proxy inválida: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+57"/>
+ <location line="+56"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation>Rede descoñecida especificada en -onlynet: &apos;%s&apos;</translation>
</message>
@@ -3260,7 +3954,7 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Versión solicitada de proxy -socks descoñecida: %i</translation>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation>Non se pode resolver a dirección -bind: &apos;%s&apos;</translation>
</message>
@@ -3270,7 +3964,7 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Non se pode resolver dirección -externalip: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+46"/>
+ <location line="+48"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation>Cantidade inválida para -paytxfee=&lt;cantidade&gt;: &apos;%s&apos;</translation>
</message>
@@ -3290,27 +3984,22 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Cargando índice de bloques...</translation>
</message>
<message>
- <location line="-60"/>
+ <location line="-62"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation>Engadir un nodo ao que conectarse e tentar manter a conexión aberta</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-32"/>
<source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source>
<translation>Imposible enlazar a %s neste ordenador. Bitcoin probablemente xa se estea executando.</translation>
</message>
<message>
- <location line="+69"/>
- <source>Fee per KB to add to transactions you send</source>
- <translation>Tarifa por KB para engadir ás transaccións que vostede envía</translation>
- </message>
- <message>
- <location line="+20"/>
+ <location line="+95"/>
<source>Loading wallet...</source>
<translation>Cargando moedeiro...</translation>
</message>
<message>
- <location line="-54"/>
+ <location line="-56"/>
<source>Cannot downgrade wallet</source>
<translation>Non se pode desactualizar o moedeiro</translation>
</message>
@@ -3320,7 +4009,7 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Non se pode escribir a dirección por defecto</translation>
</message>
<message>
- <location line="+66"/>
+ <location line="+67"/>
<source>Rescanning...</source>
<translation>Rescaneando...</translation>
</message>
@@ -3340,7 +4029,7 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Erro</translation>
</message>
<message>
- <location line="-33"/>
+ <location line="-35"/>
<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 986609918e..c261c07dbb 100644
--- a/src/qt/locale/bitcoin_gu_IN.ts
+++ b/src/qt/locale/bitcoin_gu_IN.ts
@@ -3,12 +3,12 @@
<name>AboutDialog</name>
<message>
<location filename="../forms/aboutdialog.ui" line="+14"/>
- <source>About Bitcoin</source>
- <translation>બીટકોઈન વિષે</translation>
+ <source>About Bitcoin Core</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+39"/>
- <source>&lt;b&gt;Bitcoin&lt;/b&gt; version</source>
+ <source>&lt;b&gt;Bitcoin Core&lt;/b&gt; version</source>
<translation type="unfinished"/>
</message>
<message>
@@ -22,13 +22,13 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location filename="../aboutdialog.cpp" line="+14"/>
+ <location filename="../utilitydialog.cpp" line="+29"/>
<source>Copyright</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+0"/>
- <source>The Bitcoin developers</source>
+ <source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
</context>
@@ -65,7 +65,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location filename="../addressbookpage.cpp" line="+72"/>
+ <location filename="../addressbookpage.cpp" line="+74"/>
<source>&amp;Copy Address</source>
<translation type="unfinished"/>
</message>
@@ -135,7 +135,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+197"/>
+ <location line="+194"/>
<source>Export Address List</source>
<translation type="unfinished"/>
</message>
@@ -146,19 +146,19 @@ This product includes software developed by the OpenSSL Project for use in the O
</message>
<message>
<location line="+13"/>
- <source>Error exporting</source>
+ <source>Exporting Failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
+ <location line="+1"/>
+ <source>There was an error trying to save the address list to %1.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>AddressTableModel</name>
<message>
- <location filename="../addresstablemodel.cpp" line="+164"/>
+ <location filename="../addresstablemodel.cpp" line="+168"/>
<source>Label</source>
<translation type="unfinished"/>
</message>
@@ -196,7 +196,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="+34"/>
+ <location filename="../askpassphrasedialog.cpp" line="+40"/>
<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>
@@ -317,22 +317,27 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+250"/>
+ <location filename="../bitcoingui.cpp" line="+295"/>
<source>Sign &amp;message...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+254"/>
+ <location line="+335"/>
<source>Synchronizing with network...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-324"/>
+ <location line="-407"/>
<source>&amp;Overview</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="-137"/>
+ <source>Node</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+138"/>
<source>Show general overview of wallet</source>
<translation type="unfinished"/>
</message>
@@ -347,7 +352,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>E&amp;xit</source>
<translation type="unfinished"/>
</message>
@@ -393,7 +398,22 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+259"/>
+ <location line="+10"/>
+ <source>&amp;Sending addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Receiving addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open &amp;URI...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+325"/>
<source>Importing blocks from disk...</source>
<translation type="unfinished"/>
</message>
@@ -403,12 +423,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="-322"/>
+ <location line="-405"/>
<source>Send coins to a Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+47"/>
+ <location line="+49"/>
<source>Modify configuration options for Bitcoin</source>
<translation type="unfinished"/>
</message>
@@ -438,20 +458,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="-180"/>
- <location line="+6"/>
- <location line="+513"/>
+ <location line="+430"/>
<source>Bitcoin</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-519"/>
- <location line="+6"/>
+ <location line="-643"/>
<source>Wallet</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+109"/>
+ <location line="+146"/>
<source>&amp;Send</source>
<translation type="unfinished"/>
</message>
@@ -461,13 +478,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+28"/>
- <location line="+2"/>
- <source>&amp;About Bitcoin</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+14"/>
+ <location line="+46"/>
<location line="+2"/>
<source>&amp;Show / Hide</source>
<translation type="unfinished"/>
@@ -493,64 +504,80 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+35"/>
+ <location line="+48"/>
<source>&amp;File</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
+ <location line="+14"/>
<source>&amp;Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>&amp;Help</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+9"/>
+ <location line="+15"/>
<source>Tabs toolbar</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-235"/>
- <location line="+294"/>
+ <location line="-284"/>
+ <location line="+376"/>
<source>[testnet]</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-177"/>
+ <location line="-401"/>
+ <source>Bitcoin Core</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+163"/>
<source>Request payments (generates QR codes and bitcoin: URIs)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+63"/>
- <source>&amp;Used sending addresses...</source>
+ <location line="+29"/>
+ <location line="+2"/>
+ <source>&amp;About Bitcoin Core</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="+35"/>
<source>Show the list of used sending addresses and labels</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Used &amp;receiving addresses...</source>
+ <location line="+2"/>
+ <source>Show the list of used receiving addresses and labels</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open a bitcoin: URI or payment request</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Command-line options</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
- <source>Show the list of used receiving addresses and labels</source>
+ <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+106"/>
+ <location line="+159"/>
<location line="+5"/>
<source>Bitcoin client</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+120"/>
+ <location line="+142"/>
<source>%n active connection(s) to Bitcoin network</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -570,7 +597,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+20"/>
+ <location line="+23"/>
<source>%n hour(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -590,7 +617,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
+ <location line="+21"/>
<source>Last received block was generated %1 ago.</source>
<translation type="unfinished"/>
</message>
@@ -615,27 +642,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+77"/>
- <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="-152"/>
+ <location line="-85"/>
<source>Up to date</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Catching up...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+124"/>
- <source>Confirm transaction fee</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+130"/>
<source>Sent transaction</source>
<translation type="unfinished"/>
</message>
@@ -654,17 +671,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+34"/>
- <source>URI handling</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+0"/>
- <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="+45"/>
+ <location line="+69"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation type="unfinished"/>
</message>
@@ -674,7 +681,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+110"/>
+ <location filename="../bitcoin.cpp" line="+438"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation type="unfinished"/>
</message>
@@ -682,12 +689,304 @@ Address: %4
<context>
<name>ClientModel</name>
<message>
- <location filename="../clientmodel.cpp" line="+115"/>
+ <location filename="../clientmodel.cpp" line="+119"/>
<source>Network Alert</source>
<translation type="unfinished"/>
</message>
</context>
<context>
+ <name>CoinControlDialog</name>
+ <message>
+ <location filename="../forms/coincontroldialog.ui" line="+14"/>
+ <source>Coin Control Address Selection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>Quantity:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Bytes:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>Amount:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Priority:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Low Output:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>After Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Change:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+63"/>
+ <source>(un)select all</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Tree mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>List mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>Amount</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Date</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Confirmations</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Confirmed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../coincontroldialog.cpp" line="+42"/>
+ <source>Copy address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy label</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+26"/>
+ <source>Copy amount</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-25"/>
+ <source>Copy transaction ID</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Lock unspent</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Unlock unspent</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+22"/>
+ <source>Copy quantity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Copy fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy after fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy bytes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy low output</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy change</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+323"/>
+ <source>highest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>higher</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>high</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>medium-high</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>medium</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>low-medium</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>low</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>lower</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>lowest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>(%1 locked)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+140"/>
+ <source>Dust</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>yes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>no</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>This label turns red, if the transaction size is greater than 1000 bytes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+5"/>
+ <source>This means a fee of at least %1 per kB is required.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-4"/>
+ <source>Can vary +/- 1 byte per input.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Transactions with higher priority are more likely to get included into a block.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>This label turns red, if the priority is smaller than &quot;medium&quot;.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>This label turns red, if any recipient receives an amount smaller than %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+4"/>
+ <source>This means a fee of at least %1 is required.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-3"/>
+ <source>Amounts below 0.546 times the minimum relay fee are shown as dust.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>This label turns red, if the change is smaller than %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
+ <location line="+66"/>
+ <source>(no label)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-9"/>
+ <source>change from %1 (%2)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>(change)</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>EditAddressDialog</name>
<message>
<location filename="../forms/editaddressdialog.ui" line="+14"/>
@@ -715,7 +1014,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+21"/>
+ <location filename="../editaddressdialog.cpp" line="+28"/>
<source>New receiving address</source>
<translation type="unfinished"/>
</message>
@@ -758,7 +1057,7 @@ Address: %4
<context>
<name>FreespaceChecker</name>
<message>
- <location filename="../intro.cpp" line="+61"/>
+ <location filename="../intro.cpp" line="+65"/>
<source>A new data directory will be created.</source>
<translation type="unfinished"/>
</message>
@@ -784,15 +1083,19 @@ Address: %4
</message>
</context>
<context>
- <name>GUIUtil::HelpMessageBox</name>
+ <name>HelpMessageDialog</name>
<message>
- <location filename="../guiutil.cpp" line="+558"/>
- <location line="+13"/>
- <source>Bitcoin-Qt</source>
+ <location filename="../forms/helpmessagedialog.ui" line="+19"/>
+ <source>Bitcoin Core - Command-line options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-13"/>
+ <location filename="../utilitydialog.cpp" line="+38"/>
+ <source>Bitcoin Core</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
<source>version</source>
<translation type="unfinished"/>
</message>
@@ -841,17 +1144,17 @@ Address: %4
</message>
<message>
<location line="+9"/>
- <source>Welcome to Bitcoin-Qt.</source>
+ <source>Welcome to Bitcoin Core.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+26"/>
- <source>As this is the first time the program is launched, you can choose where Bitcoin-Qt will store its data.</source>
+ <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+10"/>
- <source>Bitcoin-Qt will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
+ <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -865,7 +1168,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../intro.cpp" line="+105"/>
+ <location filename="../intro.cpp" line="+85"/>
+ <source>Bitcoin</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error: Specified data directory &quot;%1&quot; can not be created.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+19"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
@@ -881,6 +1194,34 @@ Address: %4
</message>
</context>
<context>
+ <name>OpenURIDialog</name>
+ <message>
+ <location filename="../forms/openuridialog.ui" line="+14"/>
+ <source>Open URI</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Open payment request from URI or file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>URI:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Select payment request file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../openuridialog.cpp" line="+47"/>
+ <source>Select payment request file to open</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OptionsDialog</name>
<message>
<location filename="../forms/optionsdialog.ui" line="+14"/>
@@ -888,7 +1229,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+13"/>
<source>&amp;Main</source>
<translation type="unfinished"/>
</message>
@@ -913,57 +1254,87 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+35"/>
- <source>Reset all client options to default.</source>
+ <location line="+9"/>
+ <source>Size of &amp;database cache</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>&amp;Reset Options</source>
+ <location line="+13"/>
+ <source>Set database cache size in megabytes (default: 25)</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+13"/>
- <source>&amp;Network</source>
+ <source>MB</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>
+ <location line="+27"/>
+ <source>Number of script &amp;verification threads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Connect to the Bitcoin network through a SOCKS proxy.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
- <source>Map port using &amp;UPnP</source>
+ <source>&amp;Connect through SOCKS proxy (default proxy):</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>
+ <location line="+34"/>
+ <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+224"/>
+ <source>Active command-line options that override above options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
+ <source>Reset all client options to default.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
- <source>&amp;Connect through SOCKS proxy:</source>
+ <source>&amp;Reset Options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+9"/>
- <source>Proxy &amp;IP:</source>
+ <location line="-323"/>
+ <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="+19"/>
- <source>IP address of the proxy (e.g. 127.0.0.1)</source>
+ <source>Proxy &amp;IP:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="+32"/>
<source>&amp;Port:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+19"/>
+ <location line="+25"/>
<source>Port of the proxy (e.g. 9050)</source>
<translation type="unfinished"/>
</message>
@@ -1038,7 +1409,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+71"/>
+ <location line="+7"/>
+ <source>Whether to show coin control features or not.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Display coin &amp;control features (experts only)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+136"/>
<source>&amp;OK</source>
<translation type="unfinished"/>
</message>
@@ -1048,44 +1429,38 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>&amp;Apply</source>
+ <location filename="../optionsdialog.cpp" line="+67"/>
+ <source>default</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+58"/>
- <source>default</source>
+ <location line="+57"/>
+ <source>none</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+130"/>
+ <location line="+75"/>
<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>
+ <location line="+29"/>
+ <source>Client restart required to activate changes.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
- <location line="+9"/>
- <source>Warning</source>
+ <location line="-29"/>
+ <source>Client will be shutdown, do you want to proceed?</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-9"/>
- <location line="+9"/>
- <source>This setting will take effect after restarting Bitcoin.</source>
+ <location line="+33"/>
+ <source>This change would require a client restart.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+29"/>
+ <location line="+34"/>
<source>The supplied proxy address is invalid.</source>
<translation type="unfinished"/>
</message>
@@ -1099,22 +1474,22 @@ Address: %4
</message>
<message>
<location line="+50"/>
- <location line="+202"/>
+ <location line="+231"/>
<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="-131"/>
+ <location line="-155"/>
<source>Unconfirmed:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-78"/>
+ <location line="-83"/>
<source>Wallet</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+49"/>
+ <location line="+51"/>
<source>Confirmed:</source>
<translation type="unfinished"/>
</message>
@@ -1124,12 +1499,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+29"/>
+ <location line="+32"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+16"/>
<source>Immature:</source>
<translation type="unfinished"/>
</message>
@@ -1139,7 +1514,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+16"/>
<source>Total:</source>
<translation type="unfinished"/>
</message>
@@ -1149,12 +1524,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+53"/>
+ <location line="+71"/>
<source>&lt;b&gt;Recent transactions&lt;/b&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../overviewpage.cpp" line="+116"/>
+ <location filename="../overviewpage.cpp" line="+120"/>
<location line="+1"/>
<source>out of sync</source>
<translation type="unfinished"/>
@@ -1163,7 +1538,8 @@ Address: %4
<context>
<name>PaymentServer</name>
<message>
- <location filename="../paymentserver.cpp" line="+392"/>
+ <location filename="../paymentserver.cpp" line="+403"/>
+ <location line="+13"/>
<source>URI handling</source>
<translation type="unfinished"/>
</message>
@@ -1173,45 +1549,82 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+69"/>
+ <location line="+96"/>
<source>Requested payment amount of %1 is too small (considered dust).</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
- <location line="+37"/>
+ <location line="-221"/>
+ <location line="+212"/>
+ <location line="+13"/>
+ <location line="+95"/>
+ <location line="+18"/>
+ <location line="+16"/>
<source>Payment request error</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="-353"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Net manager warning</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+1"/>
- <source>Insecure requests to custom payment scripts unsupported</source>
+ <source>Your active proxy doesn&apos;t support SOCKS5, which is required for payment requests via proxy.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+38"/>
+ <location line="+52"/>
+ <source>Payment request fetch URL is invalid: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Payment request file handling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Payment request file can not be read or processed! This can be caused by an invalid payment request file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+73"/>
+ <source>Unverified payment requests to custom payment scripts are unsupported.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+59"/>
<source>Refund from %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
+ <location line="+43"/>
<source>Error communicating with %1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+24"/>
+ <source>Payment request can not be parsed or processed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
<source>Bad response from server %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+32"/>
+ <location line="+33"/>
<source>Payment acknowledged</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-58"/>
- <location line="+30"/>
- <location line="+17"/>
+ <location line="-11"/>
<source>Network request error</source>
<translation type="unfinished"/>
</message>
@@ -1219,32 +1632,26 @@ Address: %4
<context>
<name>QObject</name>
<message>
- <location filename="../bitcoin.cpp" line="+114"/>
- <location line="+5"/>
- <location filename="../intro.cpp" line="-32"/>
+ <location filename="../bitcoin.cpp" line="+71"/>
+ <location line="+11"/>
<source>Bitcoin</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-4"/>
+ <location line="+1"/>
<source>Error: Specified data directory &quot;%1&quot; does not exist.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="-12"/>
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../intro.cpp" line="+1"/>
- <source>Error: Specified data directory &quot;%1&quot; can not be created.</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>QRImageWidget</name>
<message>
- <location filename="../receiverequestdialog.cpp" line="+32"/>
+ <location filename="../receiverequestdialog.cpp" line="+36"/>
<source>&amp;Save Image...</source>
<translation type="unfinished"/>
</message>
@@ -1260,7 +1667,7 @@ Address: %4
</message>
<message>
<location line="+0"/>
- <source>PNG Images (*.png)</source>
+ <source>PNG Image (*.png)</source>
<translation type="unfinished"/>
</message>
</context>
@@ -1278,15 +1685,16 @@ Address: %4
<location line="+23"/>
<location line="+23"/>
<location line="+36"/>
- <location line="+53"/>
+ <location line="+23"/>
+ <location line="+36"/>
<location line="+23"/>
<location line="+23"/>
- <location filename="../rpcconsole.cpp" line="+352"/>
+ <location filename="../rpcconsole.cpp" line="+359"/>
<source>N/A</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-217"/>
+ <location line="-223"/>
<source>Client version</source>
<translation type="unfinished"/>
</message>
@@ -1296,7 +1704,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+68"/>
+ <location line="-10"/>
+ <source>Debug window</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+25"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+53"/>
<source>Using OpenSSL version</source>
<translation type="unfinished"/>
</message>
@@ -1312,16 +1730,16 @@ Address: %4
</message>
<message>
<location line="+7"/>
- <source>Number of connections</source>
+ <source>Name</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+23"/>
- <source>On testnet</source>
+ <source>Number of connections</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+23"/>
+ <location line="+29"/>
<source>Block chain</source>
<translation type="unfinished"/>
</message>
@@ -1346,21 +1764,6 @@ Address: %4
<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"/>
@@ -1391,22 +1794,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-541"/>
+ <location line="-521"/>
<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"/>
+ <location line="+206"/>
<source>Debug log file</source>
<translation type="unfinished"/>
</message>
@@ -1416,7 +1809,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+102"/>
+ <location line="+76"/>
<source>Clear console</source>
<translation type="unfinished"/>
</message>
@@ -1436,7 +1829,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+128"/>
+ <location line="+122"/>
<source>%1 B</source>
<translation type="unfinished"/>
</message>
@@ -1474,48 +1867,48 @@ Address: %4
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+22"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
<source>&amp;Amount:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
- <source>The amount to request</source>
+ <location line="-13"/>
+ <source>&amp;Label:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>&amp;Label:</source>
+ <location line="-34"/>
+ <source>&amp;Message:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>The label to associate with the receiving address</source>
+ <location line="-17"/>
+ <source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>&amp;Message:</source>
+ <location line="+3"/>
+ <source>R&amp;euse an existing receiving address (not recommended)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>The message to attach to payment request</source>
+ <location line="+27"/>
+ <source>An optional label to associate with the new receiving address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
- <source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
+ <location line="+7"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>R&amp;euse an existing receiving address (not recommended)</source>
+ <location line="+7"/>
+ <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>Use this form to request payments. All fields are optional.</source>
+ <location line="+39"/>
+ <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1533,6 +1926,31 @@ Address: %4
<source>&amp;Request payment</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+47"/>
+ <source>Requested payments</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Show the selected request (does the same as double clicking an entry)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Show</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Remove the selected entries from the list</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Remove</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
@@ -1553,16 +1971,11 @@ Address: %4
</message>
<message>
<location line="+7"/>
- <source>&amp;Copy Image</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+7"/>
<source>&amp;Save Image...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../receiverequestdialog.cpp" line="+58"/>
+ <location filename="../receiverequestdialog.cpp" line="+56"/>
<source>Request payment to %1</source>
<translation type="unfinished"/>
</message>
@@ -1608,16 +2021,119 @@ Address: %4
</message>
</context>
<context>
+ <name>RecentRequestsTableModel</name>
+ <message>
+ <location filename="../recentrequeststablemodel.cpp" line="+24"/>
+ <source>Date</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Label</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Amount</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+38"/>
+ <source>(no label)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>(no message)</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+140"/>
- <location line="+213"/>
+ <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location line="+80"/>
<source>Send Coins</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+50"/>
+ <location line="+76"/>
+ <source>Coin Control Features</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Inputs...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>automatically selected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Insufficient funds!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+89"/>
+ <source>Quantity:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+35"/>
+ <source>Bytes:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Amount:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Priority:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Low Output:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>After Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Change:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+44"/>
+ <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Custom change address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+115"/>
<source>Send to multiple recipients at once</source>
<translation type="unfinished"/>
</message>
@@ -1642,12 +2158,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>123.456 BTC</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+31"/>
+ <location line="+41"/>
<source>Confirm the send action</source>
<translation type="unfinished"/>
</message>
@@ -1657,69 +2168,135 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-154"/>
+ <location filename="../sendcoinsdialog.cpp" line="-228"/>
<source>Confirm send coins</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-90"/>
+ <location line="-74"/>
<location line="+5"/>
<location line="+5"/>
+ <location line="+4"/>
<source>%1 to %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+26"/>
+ <location line="-136"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Copy quantity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy after fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy bytes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy low output</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy change</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+170"/>
+ <source>Total Amount %1 (= %2)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>or</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+202"/>
<source>The recipient address is not valid, please recheck.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The amount to pay must be larger than 0.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The amount exceeds your balance.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The total exceeds your balance when the %1 transaction fee is included.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+3"/>
<source>Duplicate address found, can only send to each address once per send operation.</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="+3"/>
+ <source>Transaction creation failed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+4"/>
- <source>Error: Transaction creation failed!</source>
+ <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+15"/>
- <source>Are you sure you want to send?</source>
+ <location line="+112"/>
+ <source>Warning: Invalid Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+9"/>
- <source>added as transaction fee</source>
+ <location line="+21"/>
+ <source>(no label)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
- <source>Total Amount %1</source>
+ <location line="-11"/>
+ <source>Warning: Unknown change address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+20"/>
- <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>
+ <location line="-366"/>
+ <source>Are you sure you want to send?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>added as transaction fee</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+144"/>
+ <location line="+170"/>
<source>Payment request expired</source>
<translation type="unfinished"/>
</message>
@@ -1732,39 +2309,44 @@ Address: %4
<context>
<name>SendCoinsEntry</name>
<message>
- <location filename="../forms/sendcoinsentry.ui" line="+33"/>
- <location line="+585"/>
+ <location filename="../forms/sendcoinsentry.ui" line="+131"/>
+ <location line="+521"/>
+ <location line="+536"/>
<source>A&amp;mount:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-572"/>
- <location line="+585"/>
+ <location line="-1152"/>
<source>Pay &amp;To:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-551"/>
+ <location line="+18"/>
<source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../sendcoinsentry.cpp" line="+28"/>
+ <location filename="../sendcoinsentry.cpp" line="+30"/>
<source>Enter a label for this address to add it to your address book</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../forms/sendcoinsentry.ui" line="-18"/>
+ <location filename="../forms/sendcoinsentry.ui" line="+57"/>
<source>&amp;Label:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+28"/>
+ <location line="-50"/>
<source>Choose previously used address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
+ <location line="-40"/>
+ <source>This is a normal payment.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+50"/>
<source>Alt+A</source>
<translation type="unfinished"/>
</message>
@@ -1780,16 +2362,45 @@ Address: %4
</message>
<message>
<location line="+7"/>
- <source>Remove this recipient</source>
+ <location line="+524"/>
+ <location line="+536"/>
+ <source>Remove this entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="-1008"/>
+ <source>Message:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+958"/>
+ <source>This is a verified payment request.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-991"/>
<source>Enter a label for this address to add it to the list of used addresses</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+465"/>
+ <location line="+459"/>
+ <source>This is an unverified payment request.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+18"/>
+ <location line="+532"/>
+ <source>Pay To:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-498"/>
+ <location line="+536"/>
<source>Memo:</source>
<translation type="unfinished"/>
</message>
@@ -1800,6 +2411,19 @@ Address: %4
</message>
</context>
<context>
+ <name>ShutdownWindow</name>
+ <message>
+ <location filename="../utilitydialog.cpp" line="+48"/>
+ <source>Bitcoin Core is shutting down...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Do not shut down the computer until this window disappears.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>SignVerifyMessageDialog</name>
<message>
<location filename="../forms/signverifymessagedialog.ui" line="+14"/>
@@ -1807,7 +2431,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+10"/>
<source>&amp;Sign Message</source>
<translation type="unfinished"/>
</message>
@@ -1910,7 +2534,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+27"/>
+ <location filename="../signverifymessagedialog.cpp" line="+29"/>
<location line="+3"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation type="unfinished"/>
@@ -1926,7 +2550,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+85"/>
+ <location line="+84"/>
<location line="+81"/>
<source>The entered address is invalid.</source>
<translation type="unfinished"/>
@@ -1995,8 +2619,13 @@ Address: %4
<context>
<name>SplashScreen</name>
<message>
- <location filename="../splashscreen.cpp" line="+23"/>
- <source>The Bitcoin developers</source>
+ <location filename="../splashscreen.cpp" line="+28"/>
+ <source>Bitcoin Core</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
<message>
@@ -2008,7 +2637,7 @@ Address: %4
<context>
<name>TrafficGraphWidget</name>
<message>
- <location filename="../trafficgraphwidget.cpp" line="+75"/>
+ <location filename="../trafficgraphwidget.cpp" line="+79"/>
<source>KB/s</source>
<translation type="unfinished"/>
</message>
@@ -2016,7 +2645,7 @@ Address: %4
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="+22"/>
+ <location filename="../transactiondesc.cpp" line="+28"/>
<source>Open until %1</source>
<translation type="unfinished"/>
</message>
@@ -2089,12 +2718,12 @@ Address: %4
<location line="+12"/>
<location line="+45"/>
<location line="+17"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Credit</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="-120"/>
+ <location line="-125"/>
<source>matures in %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -2107,12 +2736,12 @@ Address: %4
<location line="+44"/>
<location line="+8"/>
<location line="+15"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Debit</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-57"/>
+ <location line="-62"/>
<source>Transaction fee</source>
<translation type="unfinished"/>
</message>
@@ -2123,11 +2752,12 @@ Address: %4
</message>
<message>
<location line="+6"/>
+ <location line="+9"/>
<source>Message</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="-7"/>
<source>Comment</source>
<translation type="unfinished"/>
</message>
@@ -2137,7 +2767,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+18"/>
<source>Merchant</source>
<translation type="unfinished"/>
</message>
@@ -2177,7 +2807,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-227"/>
+ <location line="-232"/>
<source>, has not been successfully broadcast yet</source>
<translation type="unfinished"/>
</message>
@@ -2208,7 +2838,7 @@ Address: %4
<context>
<name>TransactionTableModel</name>
<message>
- <location filename="../transactiontablemodel.cpp" line="+227"/>
+ <location filename="../transactiontablemodel.cpp" line="+234"/>
<source>Date</source>
<translation type="unfinished"/>
</message>
@@ -2227,8 +2857,13 @@ Address: %4
<source>Amount</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+59"/>
+ <source>Immature (%1 confirmations, will be available after %2)</source>
+ <translation type="unfinished"/>
+ </message>
<message numerus="yes">
- <location line="+57"/>
+ <location line="+16"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -2248,17 +2883,13 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
+ <location line="-22"/>
+ <location line="+25"/>
<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"/>
+ <location line="-22"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation type="unfinished"/>
</message>
@@ -2268,7 +2899,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+43"/>
+ <location line="+62"/>
<source>Received with</source>
<translation type="unfinished"/>
</message>
@@ -2326,7 +2957,7 @@ Address: %4
<context>
<name>TransactionView</name>
<message>
- <location filename="../transactionview.cpp" line="+52"/>
+ <location filename="../transactionview.cpp" line="+57"/>
<location line="+16"/>
<source>All</source>
<translation type="unfinished"/>
@@ -2387,12 +3018,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="+6"/>
<source>Enter address or label to search</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="+6"/>
<source>Min amount</source>
<translation type="unfinished"/>
</message>
@@ -2427,17 +3058,37 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+143"/>
- <source>Export Transaction Data</source>
+ <location line="+142"/>
+ <source>Export Transaction History</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="+19"/>
+ <source>Exporting Failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>There was an error trying to save the transaction history to %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Exporting Successful</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The transaction history was successfully saved to %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-22"/>
<source>Comma separated file (*.csv)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+8"/>
+ <location line="+9"/>
<source>Confirmed</source>
<translation type="unfinished"/>
</message>
@@ -2472,17 +3123,7 @@ Address: %4
<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"/>
+ <location line="+107"/>
<source>Range:</source>
<translation type="unfinished"/>
</message>
@@ -2493,9 +3134,17 @@ Address: %4
</message>
</context>
<context>
+ <name>WalletFrame</name>
+ <message>
+ <location filename="../walletframe.cpp" line="+26"/>
+ <source>No wallet has been loaded.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>WalletModel</name>
<message>
- <location filename="../walletmodel.cpp" line="+218"/>
+ <location filename="../walletmodel.cpp" line="+245"/>
<source>Send Coins</source>
<translation type="unfinished"/>
</message>
@@ -2503,7 +3152,7 @@ Address: %4
<context>
<name>WalletView</name>
<message>
- <location filename="../walletview.cpp" line="+46"/>
+ <location filename="../walletview.cpp" line="+43"/>
<source>&amp;Export</source>
<translation type="unfinished"/>
</message>
@@ -2513,65 +3162,60 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+183"/>
+ <location line="+181"/>
<source>Backup Wallet</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
+ <location line="+1"/>
<source>Wallet Data (*.dat)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
+ <location line="+6"/>
<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>
+ <source>There was an error trying to save the wallet data to %1.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+4"/>
- <source>Backup Successful</source>
+ <source>The wallet data was successfully saved to %1.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+0"/>
- <source>The wallet data was successfully saved to the new location.</source>
+ <source>Backup Successful</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+102"/>
- <source>Bitcoin version</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+107"/>
+ <location filename="../bitcoinstrings.cpp" line="+221"/>
<source>Usage:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-55"/>
+ <location line="-54"/>
<source>List commands</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-13"/>
+ <location line="-14"/>
<source>Get help for a command</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+25"/>
+ <location line="+26"/>
<source>Options:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+24"/>
+ <location line="+22"/>
<source>Specify configuration file (default: bitcoin.conf)</source>
<translation type="unfinished"/>
</message>
@@ -2591,7 +3235,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-28"/>
+ <location line="-26"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
<translation type="unfinished"/>
</message>
@@ -2601,7 +3245,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-49"/>
+ <location line="-51"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation type="unfinished"/>
</message>
@@ -2611,37 +3255,37 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-142"/>
+ <location line="-148"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-33"/>
+ <location line="-36"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+40"/>
+ <location line="+45"/>
<source>Accept command line and JSON-RPC commands</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<source>Run in the background as a daemon and accept commands</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+40"/>
+ <location line="+39"/>
<source>Use the test network</source>
<translation type="unfinished"/>
</message>
@@ -2651,7 +3295,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-87"/>
+ <location line="-95"/>
<source>%s, you must set a rpcpassword in the configuration file:
%s
It is recommended you use the following random password:
@@ -2692,6 +3336,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+4"/>
+ <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</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>
@@ -2706,17 +3355,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+11"/>
- <source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source>
+ <location line="+18"/>
+ <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="+6"/>
- <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
+ <location line="+5"/>
+ <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+3"/>
<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>
@@ -2746,17 +3395,27 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
+ <location line="+9"/>
+ <source>&lt;category&gt; can be:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
<source>Attempt to recover private keys from a corrupt wallet.dat</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
+ <source>Bitcoin Core Daemon</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Bitcoin RPC client version</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
<source>Block creation options:</source>
<translation type="unfinished"/>
</message>
@@ -2766,7 +3425,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
+ <source>Connect through SOCKS proxy</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect to JSON-RPC on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation type="unfinished"/>
</message>
@@ -2782,6 +3446,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+1"/>
+ <source>Do not load the wallet and disable wallet RPC calls</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Do you want to rebuild the block database now?</source>
<translation type="unfinished"/>
</message>
@@ -2876,7 +3545,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
+ <source>Fee per kB to add to transactions you send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Find peers using DNS lookup (default: 1 unless -connect)</source>
<translation type="unfinished"/>
</message>
@@ -2896,6 +3570,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
+ <location line="+1"/>
+ <source>If &lt;category&gt; is not supplied, output all debugging information.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+2"/>
<source>Incorrect or no genesis block found. Wrong datadir for network?</source>
<translation type="unfinished"/>
@@ -2911,17 +3590,37 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+8"/>
+ <location line="+5"/>
+ <source>Prepend debug output with timestamp (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>RPC client options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Rebuild block chain index from current blk000??.dat files</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+5"/>
+ <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Send command to Bitcoin server</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
+ <location line="+7"/>
+ <source>Set maximum block size in bytes (default: %d)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Set the number of threads to service RPC calls (default: 4)</source>
<translation type="unfinished"/>
</message>
@@ -2936,12 +3635,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+12"/>
+ <location line="+3"/>
+ <source>This is intended for regression testing tools and app development.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Usage (deprecated, use bitcoin-cli):</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+8"/>
+ <location line="+7"/>
<source>Verifying blocks...</source>
<translation type="unfinished"/>
</message>
@@ -2952,31 +3656,56 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+1"/>
+ <source>Wait for RPC server to start</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Wallet %s resides outside data directory %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+2"/>
+ <source>Wallet options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>You need to rebuild the database using -reindex to change -txindex</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-78"/>
+ <location line="-79"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-98"/>
+ <location line="-105"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+17"/>
+ <location line="+14"/>
+ <source>Output debugging information (default: 0, supplying &lt;category&gt; is optional)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+83"/>
+ <location line="+89"/>
<source>Information</source>
<translation type="unfinished"/>
</message>
@@ -3016,47 +3745,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<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"/>
+ <location line="+9"/>
<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"/>
+ <location line="+4"/>
<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"/>
+ <location line="+6"/>
<source>Set minimum block size in bytes (default: 0)</source>
<translation type="unfinished"/>
</message>
@@ -3081,7 +3780,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Transaction amount too small</source>
<translation type="unfinished"/>
</message>
@@ -3106,32 +3805,32 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<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="+5"/>
+ <location line="+7"/>
<source>Warning</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Warning: This version is obsolete, upgrade required!</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+2"/>
+ <source>version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>wallet.dat corrupt, salvage failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-54"/>
+ <location line="-58"/>
<source>Password for JSON-RPC connections</source>
<translation type="unfinished"/>
</message>
@@ -3141,27 +3840,27 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-126"/>
+ <location line="-132"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+155"/>
+ <location line="+161"/>
<source>Upgrade wallet to latest format</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-12"/>
+ <location line="-11"/>
<source>Rescan the block chain for missing wallet transactions</source>
<translation type="unfinished"/>
</message>
@@ -3171,7 +3870,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-29"/>
+ <location line="-30"/>
<source>Server certificate file (default: server.cert)</source>
<translation type="unfinished"/>
</message>
@@ -3186,27 +3885,22 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Unable to bind to %s on this computer (bind returned error %d, %s)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-95"/>
- <source>Connect through socks proxy</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="-11"/>
+ <location line="-107"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+58"/>
+ <location line="+60"/>
<source>Loading addresses...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-36"/>
+ <location line="-37"/>
<source>Error loading wallet.dat: Wallet corrupted</source>
<translation type="unfinished"/>
</message>
@@ -3226,12 +3920,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+30"/>
+ <location line="+31"/>
<source>Invalid -proxy address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+57"/>
+ <location line="+56"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3241,7 +3935,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3251,7 +3945,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+46"/>
+ <location line="+48"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3271,27 +3965,22 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-60"/>
+ <location line="-62"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-28"/>
+ <location line="-32"/>
<source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+69"/>
- <source>Fee per KB to add to transactions you send</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+20"/>
+ <location line="+95"/>
<source>Loading wallet...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-54"/>
+ <location line="-56"/>
<source>Cannot downgrade wallet</source>
<translation type="unfinished"/>
</message>
@@ -3301,7 +3990,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+66"/>
+ <location line="+67"/>
<source>Rescanning...</source>
<translation type="unfinished"/>
</message>
@@ -3321,7 +4010,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-33"/>
+ <location line="-35"/>
<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 0adaef4e25..3a13801dae 100644
--- a/src/qt/locale/bitcoin_he.ts
+++ b/src/qt/locale/bitcoin_he.ts
@@ -27,14 +27,14 @@ 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="+19"/>
+ <location filename="../utilitydialog.cpp" line="+29"/>
<source>Copyright</source>
<translation>זכויות יוצרי×</translation>
</message>
<message>
<location line="+0"/>
- <source>The Bitcoin developers</source>
- <translation>מפתחי ביטקוין</translation>
+ <source>The Bitcoin Core developers</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -102,7 +102,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+1"/>
<source>Choose the address to receive coins with</source>
- <translation type="unfinished"/>
+ <translation>בחר ×ת הכתובת ×יתה תרצה לקבל ×ת המטבעות</translation>
</message>
<message>
<location line="+5"/>
@@ -127,7 +127,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+4"/>
<source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
- <translation type="unfinished"/>
+ <translation>×לה כתובות הביטקוין שלך עבור קבלת תשלומי×. מומלץ להשתמש בכתובת חדשה לכל פעולה.</translation>
</message>
<message>
<location line="+7"/>
@@ -142,7 +142,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+194"/>
<source>Export Address List</source>
- <translation type="unfinished"/>
+ <translation>×™×™×¦×•× ×¨×©×™×ž×ª כתובות</translation>
</message>
<message>
<location line="+1"/>
@@ -151,13 +151,13 @@ This product includes software developed by the OpenSSL Project for use in the O
</message>
<message>
<location line="+13"/>
- <source>Error exporting</source>
- <translation>שגי××” ביצו×</translation>
+ <source>Exporting Failed</source>
+ <translation>×”×™×™×¦×•× × ×›×©×œ</translation>
</message>
<message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation>×œ× ×ž×¡×•×’×œ לכתוב לקובץ %1.</translation>
+ <location line="+1"/>
+ <source>There was an error trying to save the address list to %1.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -188,7 +188,7 @@ 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"/>
@@ -322,22 +322,27 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+260"/>
+ <location filename="../bitcoingui.cpp" line="+295"/>
<source>Sign &amp;message...</source>
<translation>×—×ª×•× ×¢×œ הודעה</translation>
</message>
<message>
- <location line="+290"/>
+ <location line="+335"/>
<source>Synchronizing with network...</source>
<translation>מסתנכרן ×¢× ×”×¨×©×ª...</translation>
</message>
<message>
- <location line="-360"/>
+ <location line="-407"/>
<source>&amp;Overview</source>
<translation>&amp;סקירה</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="-137"/>
+ <source>Node</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+138"/>
<source>Show general overview of wallet</source>
<translation>הצג סקירה כללית של ×”×רנק</translation>
</message>
@@ -352,7 +357,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>דפדף בהיסטוריית הפעולות</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>E&amp;xit</source>
<translation>×™&amp;צי××”</translation>
</message>
@@ -398,7 +403,22 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>שנה סיסמ×</translation>
</message>
<message>
- <location line="+295"/>
+ <location line="+10"/>
+ <source>&amp;Sending addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Receiving addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open &amp;URI...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+325"/>
<source>Importing blocks from disk...</source>
<translation>×ž×™×™×‘× ×‘×œ×•×§×™× ×ž×”×“×™×¡×§...</translation>
</message>
@@ -408,12 +428,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>מחדש ×ת ×ינדקס ×”×‘×œ×•×§×™× ×‘×“×™×¡×§...</translation>
</message>
<message>
- <location line="-358"/>
+ <location line="-405"/>
<source>Send coins to a Bitcoin address</source>
<translation>שלח מטבעות לכתובת ביטקוין</translation>
</message>
<message>
- <location line="+47"/>
+ <location line="+49"/>
<source>Modify configuration options for Bitcoin</source>
<translation>שנה ×פשרויות תצורה עבור ביטקוין</translation>
</message>
@@ -443,18 +463,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>×מת הודעה...</translation>
</message>
<message>
- <location line="+375"/>
+ <location line="+430"/>
<source>Bitcoin</source>
<translation>ביטקוין</translation>
</message>
<message>
- <location line="-563"/>
- <location line="+10"/>
+ <location line="-643"/>
<source>Wallet</source>
<translation>×רנק</translation>
</message>
<message>
- <location line="+113"/>
+ <location line="+146"/>
<source>&amp;Send</source>
<translation>&amp;שלח</translation>
</message>
@@ -464,7 +483,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>וקבל</translation>
</message>
<message>
- <location line="+44"/>
+ <location line="+46"/>
<location line="+2"/>
<source>&amp;Show / Hide</source>
<translation>הצג / הסתר</translation>
@@ -490,86 +509,80 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>×מת הודעות כדי להבטיח שהן נחתמו ×¢× ×›×ª×•×‘×ª ביטקוין מסוימות</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+48"/>
<source>&amp;File</source>
<translation>&amp;קובץ</translation>
</message>
<message>
- <location line="+11"/>
+ <location line="+14"/>
<source>&amp;Settings</source>
<translation>ה&amp;גדרות</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>&amp;Help</source>
<translation>&amp;עזרה</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+15"/>
<source>Tabs toolbar</source>
<translation>סרגל ×›×œ×™× ×˜×בי×</translation>
</message>
<message>
- <location line="-244"/>
- <location line="+321"/>
+ <location line="-284"/>
+ <location line="+376"/>
<source>[testnet]</source>
<translation>[רשת-בדיקה]</translation>
</message>
<message>
- <location line="-331"/>
- <location line="+10"/>
+ <location line="-401"/>
<source>Bitcoin Core</source>
<translation>ליבת ביטקוין</translation>
</message>
<message>
- <location line="+121"/>
+ <location line="+163"/>
<source>Request payments (generates QR codes and bitcoin: URIs)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+27"/>
+ <location line="+29"/>
<location line="+2"/>
<source>&amp;About Bitcoin Core</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+34"/>
- <source>&amp;Used sending addresses...</source>
- <translation>כתובת לשליחה שהיו &amp;בשימוש...</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+35"/>
<source>Show the list of used sending addresses and labels</source>
<translation>הצג ×ת רשימת הכתובות לשליחה שהיו בשימוש לרבות התוויות</translation>
</message>
<message>
- <location line="+1"/>
- <source>Used &amp;receiving addresses...</source>
- <translation type="unfinished"/>
+ <location line="+2"/>
+ <source>Show the list of used receiving addresses and labels</source>
+ <translation>הצג ×ת רשימת הכתובות והתויות המשומשות</translation>
</message>
<message>
- <location line="+1"/>
- <source>Show the list of used receiving addresses and labels</source>
+ <location line="+3"/>
+ <source>Open a bitcoin: URI or payment request</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+2"/>
- <source>Open URI...</source>
+ <source>&amp;Command-line options</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
- <source>Open a bitcoin: URI or payment request</source>
+ <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+126"/>
+ <location line="+159"/>
<location line="+5"/>
<source>Bitcoin client</source>
<translation>תוכנת ביטקוין</translation>
</message>
<message numerus="yes">
- <location line="+133"/>
+ <location line="+142"/>
<source>%n active connection(s) to Bitcoin network</source>
<translation><numerusform>חיבור פעיל ×חד לרשת הביטקוין</numerusform><numerusform>%n ×—×™×‘×•×¨×™× ×¤×¢×™×œ×™× ×œ×¨×©×ª הביטקוין</numerusform></translation>
</message>
@@ -589,7 +602,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>×”×•×©×œ× ×¢×™×‘×•×“ של %1 ×‘×œ×•×§×™× ×©×œ היסטוריית פעולות.</translation>
</message>
<message numerus="yes">
- <location line="+20"/>
+ <location line="+23"/>
<source>%n hour(s)</source>
<translation><numerusform>%n שעה</numerusform><numerusform>%n שעות</numerusform></translation>
</message>
@@ -609,7 +622,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>1% מ×חור</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="+21"/>
<source>Last received block was generated %1 ago.</source>
<translation>הבלוק ×”×חרון שהתקבל נוצר לפני %1</translation>
</message>
@@ -634,27 +647,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>מידע</translation>
</message>
<message>
- <location line="+77"/>
- <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="-152"/>
+ <location line="-85"/>
<source>Up to date</source>
<translation>עדכני</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Catching up...</source>
<translation>מתעדכן...</translation>
</message>
<message>
- <location line="+124"/>
- <source>Confirm transaction fee</source>
- <translation>×שר עמלת פעולה</translation>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+130"/>
<source>Sent transaction</source>
<translation>פעולה שנשלחה</translation>
</message>
@@ -676,7 +679,7 @@ Address: %4
כתובת: %4</translation>
</message>
<message>
- <location line="+67"/>
+ <location line="+69"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation>×”×רנק &lt;b&gt;מוצפן&lt;/b&gt; וכרגע &lt;b&gt;פתוח&lt;/b&gt;</translation>
</message>
@@ -686,7 +689,7 @@ Address: %4
<translation>×”×רנק &lt;b&gt;מוצפן&lt;/b&gt; וכרגע &lt;b&gt;נעול&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+116"/>
+ <location filename="../bitcoin.cpp" line="+438"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation>שגי××” סופנית ×ירעה. ביטקוין ×ינו יכול להמשיך לפעול בבטחה ולכן ייסגר.</translation>
</message>
@@ -714,7 +717,7 @@ Address: %4
<message>
<location line="+29"/>
<source>Bytes:</source>
- <translation type="unfinished"/>
+ <translation>בייטי×:</translation>
</message>
<message>
<location line="+45"/>
@@ -739,7 +742,7 @@ Address: %4
<message>
<location line="+48"/>
<source>After Fee:</source>
- <translation type="unfinished"/>
+ <translation>ל×חר עמלה:</translation>
</message>
<message>
<location line="+32"/>
@@ -908,11 +911,16 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+171"/>
- <source>Dust</source>
+ <location line="+31"/>
+ <source>none</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="+140"/>
+ <source>Dust</source>
+ <translation>×בק</translation>
+ </message>
+ <message>
<location line="+0"/>
<source>yes</source>
<translation>כן</translation>
@@ -925,13 +933,13 @@ Address: %4
<message>
<location line="+10"/>
<source>This label turns red, if the transaction size is greater than 1000 bytes.</source>
- <translation type="unfinished"/>
+ <translation>תווית זו מ×דימה במידה וגודל הפעולה עולה על 1000 בייט</translation>
</message>
<message>
<location line="+1"/>
<location line="+5"/>
<source>This means a fee of at least %1 per kB is required.</source>
- <translation type="unfinished"/>
+ <translation>×–×ת ×ומרת שנחוצה עמלה של ×œ× ×¤×—×•×ª מ־%1 לכל קילו בייט.</translation>
</message>
<message>
<location line="-4"/>
@@ -945,7 +953,7 @@ Address: %4
</message>
<message>
<location line="+1"/>
- <source>This label turns red, if the priority is smaller than &quot;medium&quot;</source>
+ <source>This label turns red, if the priority is smaller than &quot;medium&quot;.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -978,12 +986,12 @@ Address: %4
<message>
<location line="-9"/>
<source>change from %1 (%2)</source>
- <translation type="unfinished"/>
+ <translation>עודף מ־%1 (%2)</translation>
</message>
<message>
<location line="+1"/>
<source>(change)</source>
- <translation type="unfinished"/>
+ <translation>(עודף)</translation>
</message>
</context>
<context>
@@ -1001,7 +1009,7 @@ Address: %4
<message>
<location line="+10"/>
<source>The label associated with this address list entry</source>
- <translation type="unfinished"/>
+ <translation>התוית המשויכת לרשומה הזו ברשימת הכתובות</translation>
</message>
<message>
<location line="+17"/>
@@ -1014,7 +1022,7 @@ Address: %4
<translation>&amp;כתובת</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+25"/>
+ <location filename="../editaddressdialog.cpp" line="+28"/>
<source>New receiving address</source>
<translation>כתובת חדשה לקבלה</translation>
</message>
@@ -1083,20 +1091,24 @@ Address: %4
</message>
</context>
<context>
- <name>GUIUtil::HelpMessageBox</name>
+ <name>HelpMessageDialog</name>
<message>
- <location filename="../guiutil.cpp" line="+597"/>
- <source>version</source>
- <translation>גרסה</translation>
+ <location filename="../forms/helpmessagedialog.ui" line="+19"/>
+ <source>Bitcoin Core - Command-line options</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <location line="+13"/>
+ <location filename="../utilitydialog.cpp" line="+38"/>
<source>Bitcoin Core</source>
<translation>ליבת ביטקוין</translation>
</message>
<message>
- <location line="-11"/>
+ <location line="+0"/>
+ <source>version</source>
+ <translation>גרסה</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Usage:</source>
<translation>שימוש:</translation>
</message>
@@ -1209,12 +1221,12 @@ Address: %4
<message>
<location line="+11"/>
<source>Select payment request file</source>
- <translation type="unfinished"/>
+ <translation>בחירת קובץ בקשת תשלו×</translation>
</message>
<message>
<location filename="../openuridialog.cpp" line="+47"/>
<source>Select payment request file to open</source>
- <translation type="unfinished"/>
+ <translation>בחירת קובץ בקשת ×ª×©×œ×•× ×œ×¤×ª×™×—×”</translation>
</message>
</context>
<context>
@@ -1225,7 +1237,7 @@ Address: %4
<translation>×פשרויות</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+13"/>
<source>&amp;Main</source>
<translation>ר×שי</translation>
</message>
@@ -1250,7 +1262,52 @@ Address: %4
<translation>התחל ×ת ביטקוין בעת התחברות למערכת</translation>
</message>
<message>
- <location line="+35"/>
+ <location line="+9"/>
+ <source>Size of &amp;database cache</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set database cache size in megabytes (default: 25)</source>
+ <translation>קבע ×ת גודל המטמון של מסד ×”× ×ª×•× ×™× ×‘×ž×’×”×‘×™×™×˜ (ברירת מחדל: 25)</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>MB</source>
+ <translation>מגה בייט</translation>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Number of script &amp;verification threads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
+ <translation>קבע ×ת מספר תהליכוני ×ימות ×”×¡×§×¨×™×¤×˜×™× (1-16, 0 = ×וטומטי, ברירת מחדל: 0)</translation>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Connect to the Bitcoin network through a SOCKS proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Connect through SOCKS proxy (default proxy):</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+224"/>
+ <source>Active command-line options that override above options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
<source>Reset all client options to default.</source>
<translation>×פס כל ×פשרויות התוכנה לברירת המחדל.</translation>
</message>
@@ -1260,7 +1317,7 @@ Address: %4
<translation>×יפוס ×פשרויות</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="-323"/>
<source>&amp;Network</source>
<translation>רשת</translation>
</message>
@@ -1275,32 +1332,17 @@ Address: %4
<translation>מיפוי פורט ב×מצעות 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>התחבר לרשת הביטקוין דרך פרוקסי SOCKS (למשל בעת התחברות דרך Tor).</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>&amp;Connect through SOCKS proxy:</source>
- <translation>התחבר דרך פרוקסי SOCKS</translation>
- </message>
- <message>
- <location line="+9"/>
+ <location line="+19"/>
<source>Proxy &amp;IP:</source>
<translation>כתובת IP של פרוקסי:</translation>
</message>
<message>
- <location line="+19"/>
- <source>IP address of the proxy (e.g. 127.0.0.1)</source>
- <translation>כתובת ×”×ינטרנט של הפרוקסי (למשל 127.0.0.1)</translation>
- </message>
- <message>
- <location line="+7"/>
+ <location line="+32"/>
<source>&amp;Port:</source>
<translation>פורט:</translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+25"/>
<source>Port of the proxy (e.g. 9050)</source>
<translation>הפורט של הפרוקסי (למשל 9050)</translation>
</message>
@@ -1385,7 +1427,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+71"/>
+ <location line="+136"/>
<source>&amp;OK</source>
<translation>×ישור</translation>
</message>
@@ -1395,44 +1437,38 @@ Address: %4
<translation>ביטול</translation>
</message>
<message>
- <location line="+10"/>
- <source>&amp;Apply</source>
- <translation>יישו×</translation>
- </message>
- <message>
- <location filename="../optionsdialog.cpp" line="+63"/>
+ <location filename="../optionsdialog.cpp" line="+67"/>
<source>default</source>
<translation>ברירת מחדל</translation>
</message>
<message>
- <location line="+131"/>
+ <location line="+57"/>
+ <source>none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+75"/>
<source>Confirm options reset</source>
<translation>×שר ×ת ×יפוס ×”×פשרויות</translation>
</message>
<message>
<location line="+1"/>
- <source>Some settings may require a client restart to take effect.</source>
- <translation>כמה מההגדרות עשויות לדרוש ×תחול התוכנה כדי להיכנס לפועל.</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Do you want to proceed?</source>
- <translation>×”×× ×‘×¨×¦×•× ×š להמשיך?</translation>
+ <location line="+29"/>
+ <source>Client restart required to activate changes.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
- <location line="+9"/>
- <source>Warning</source>
- <translation>×זהרה</translation>
+ <location line="-29"/>
+ <source>Client will be shutdown, do you want to proceed?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="-9"/>
- <location line="+9"/>
- <source>This setting will take effect after restarting Bitcoin.</source>
- <translation>הגדרה זו תחול ל×חר הפעלה מחדש של ביטקוין.</translation>
+ <location line="+33"/>
+ <source>This change would require a client restart.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+29"/>
+ <location line="+34"/>
<source>The supplied proxy address is invalid.</source>
<translation>כתובת הפרוקסי שסופקה ××™× ×” תקינה.</translation>
</message>
@@ -1446,34 +1482,34 @@ Address: %4
</message>
<message>
<location line="+50"/>
- <location line="+214"/>
+ <location line="+231"/>
<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="-140"/>
+ <location line="-155"/>
<source>Unconfirmed:</source>
<translation>ממתין ל×ישור:</translation>
</message>
<message>
- <location line="-81"/>
+ <location line="-83"/>
<source>Wallet</source>
<translation>×רנק</translation>
</message>
<message>
- <location line="+49"/>
+ <location line="+51"/>
<source>Confirmed:</source>
<translation>מ×ושר:</translation>
</message>
<message>
<location line="+16"/>
<source>Your current spendable balance</source>
- <translation type="unfinished"/>
+ <translation>היתרה הזמינה הנוכחית</translation>
</message>
<message>
<location line="+32"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
- <translation type="unfinished"/>
+ <translation>×”×¡×›×•× ×”×›×•×œ×œ של פעולות ×©×˜×¨× ×ושרו, ועוד ×ינן נספרות בחישוב היתרה הזמינה</translation>
</message>
<message>
<location line="+16"/>
@@ -1496,7 +1532,7 @@ Address: %4
<translation>סך כל היתרה הנוכחית שלך</translation>
</message>
<message>
- <location line="+56"/>
+ <location line="+71"/>
<source>&lt;b&gt;Recent transactions&lt;/b&gt;</source>
<translation>&lt;b&gt;פעולות ×חרונות&lt;/b&gt;</translation>
</message>
@@ -1510,7 +1546,8 @@ Address: %4
<context>
<name>PaymentServer</name>
<message>
- <location filename="../paymentserver.cpp" line="+397"/>
+ <location filename="../paymentserver.cpp" line="+403"/>
+ <location line="+13"/>
<source>URI handling</source>
<translation>תפעול URI</translation>
</message>
@@ -1520,51 +1557,82 @@ Address: %4
<translation>×œ× × ×™×ª×Ÿ לנתח URI! ×–×” יכול ×œ×”×™×’×¨× ×›×ª×•×¦××” מכתובת ביטקוין ×œ× ×ª×§×™× ×” ×ו פרמטרי URI חסרי צורה תקינה.</translation>
</message>
<message>
- <location line="+91"/>
+ <location line="+96"/>
<source>Requested payment amount of %1 is too small (considered dust).</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-204"/>
- <location line="+195"/>
+ <location line="-221"/>
+ <location line="+212"/>
<location line="+13"/>
+ <location line="+95"/>
+ <location line="+18"/>
+ <location line="+16"/>
<source>Payment request error</source>
<translation>שגי××” בבקשת תשלו×</translation>
</message>
<message>
- <location line="-207"/>
+ <location line="-353"/>
<source>Cannot start bitcoin: click-to-pay handler</source>
<translation>×œ× × ×™×ª×Ÿ להתחיל ×ת ביטקוין: מפעיל לחץ-×œ×ª×©×œ×•× </translation>
</message>
<message>
- <location line="+195"/>
+ <location line="+58"/>
+ <source>Net manager warning</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Your active proxy doesn&apos;t support SOCKS5, which is required for payment requests via proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>Payment request fetch URL is invalid: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Payment request file handling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Payment request file can not be read or processed! This can be caused by an invalid payment request file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+73"/>
<source>Unverified payment requests to custom payment scripts are unsupported.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+59"/>
<source>Refund from %1</source>
- <translation type="unfinished"/>
+ <translation>החזר מ־%1</translation>
</message>
<message>
- <location line="+42"/>
+ <location line="+43"/>
<source>Error communicating with %1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+28"/>
+ <location line="+24"/>
+ <source>Payment request can not be parsed or processed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
<source>Bad response from server %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+32"/>
+ <location line="+33"/>
<source>Payment acknowledged</source>
<translation>×”×ª×©×œ×•× ×”×ª×§×‘×œ</translation>
</message>
<message>
- <location line="-55"/>
- <location line="+27"/>
- <location line="+17"/>
+ <location line="-11"/>
<source>Network request error</source>
<translation>שגי×ת בקשת שרת</translation>
</message>
@@ -1572,18 +1640,18 @@ Address: %4
<context>
<name>QObject</name>
<message>
- <location filename="../bitcoin.cpp" line="+119"/>
- <location line="+5"/>
+ <location filename="../bitcoin.cpp" line="+71"/>
+ <location line="+11"/>
<source>Bitcoin</source>
<translation>ביטקוין</translation>
</message>
<message>
- <location line="-4"/>
+ <location line="+1"/>
<source>Error: Specified data directory &quot;%1&quot; does not exist.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="-12"/>
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation type="unfinished"/>
</message>
@@ -1608,7 +1676,7 @@ Address: %4
<message>
<location line="+0"/>
<source>PNG Image (*.png)</source>
- <translation type="unfinished"/>
+ <translation>תמונת PNG (*.png)</translation>
</message>
</context>
<context>
@@ -1625,15 +1693,16 @@ Address: %4
<location line="+23"/>
<location line="+23"/>
<location line="+36"/>
- <location line="+53"/>
+ <location line="+23"/>
+ <location line="+36"/>
<location line="+23"/>
<location line="+23"/>
- <location filename="../rpcconsole.cpp" line="+360"/>
+ <location filename="../rpcconsole.cpp" line="+359"/>
<source>N/A</source>
<translation>N/A</translation>
</message>
<message>
- <location line="-217"/>
+ <location line="-223"/>
<source>Client version</source>
<translation>גרסת ממשק</translation>
</message>
@@ -1648,7 +1717,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+78"/>
+ <location line="+25"/>
+ <source>General</source>
+ <translation>כללי</translation>
+ </message>
+ <message>
+ <location line="+53"/>
<source>Using OpenSSL version</source>
<translation>משתמש ב-OpenSSL גרסה</translation>
</message>
@@ -1664,16 +1738,16 @@ Address: %4
</message>
<message>
<location line="+7"/>
- <source>Number of connections</source>
- <translation>מספר חיבורי×</translation>
+ <source>Name</source>
+ <translation>ש×</translation>
</message>
<message>
<location line="+23"/>
- <source>On testnet</source>
- <translation>ברשת הבדיקה</translation>
+ <source>Number of connections</source>
+ <translation>מספר חיבורי×</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+29"/>
<source>Block chain</source>
<translation>שרשרת הבלוקי×</translation>
</message>
@@ -1698,16 +1772,6 @@ Address: %4
<translation>פתח</translation>
</message>
<message>
- <location line="+16"/>
- <source>Command-line options</source>
- <translation>×פשרויות שורת פקודה</translation>
- </message>
- <message>
- <location line="+10"/>
- <source>&amp;Show</source>
- <translation>הצג</translation>
- </message>
- <message>
<location line="+24"/>
<source>&amp;Console</source>
<translation>לוח בקרה</translation>
@@ -1725,30 +1789,25 @@ Address: %4
<message>
<location line="+13"/>
<source>Totals</source>
- <translation type="unfinished"/>
+ <translation>סכומי×</translation>
</message>
<message>
<location line="+64"/>
<source>In:</source>
- <translation type="unfinished"/>
+ <translation>נכנס:</translation>
</message>
<message>
<location line="+80"/>
<source>Out:</source>
- <translation type="unfinished"/>
+ <translation>יוצ×:</translation>
</message>
<message>
- <location line="-541"/>
+ <location line="-521"/>
<source>Build date</source>
<translation>ת×ריך בניה</translation>
</message>
<message>
- <location line="-79"/>
- <source>Bitcoin Core</source>
- <translation>ליבת ביטקוין</translation>
- </message>
- <message>
- <location line="+279"/>
+ <location line="+206"/>
<source>Debug log file</source>
<translation>קובץ יומן ניפוי</translation>
</message>
@@ -1758,11 +1817,6 @@ Address: %4
<translation>פתח ×ת קובץ יומן הניפוי מתיקיית ×”× ×ª×•× ×™× ×”× ×•×›×—×™×ª. ×–×” עשוי לקחת מספר שניות עבור קובצי יומן גדולי×.</translation>
</message>
<message>
- <location line="+26"/>
- <source>Show the Bitcoin-Core help message to get a list with possible Bitcoin command-line options.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location line="+76"/>
<source>Clear console</source>
<translation>נקה לוח בקרה</translation>
@@ -1783,24 +1837,24 @@ Address: %4
<translation>הקלד &lt;b&gt;help&lt;/b&gt; בשביל סקירה של הפקודות הזמינות.</translation>
</message>
<message>
- <location line="+128"/>
+ <location line="+122"/>
<source>%1 B</source>
- <translation type="unfinished"/>
+ <translation>%1 בייט</translation>
</message>
<message>
<location line="+2"/>
<source>%1 KB</source>
- <translation type="unfinished"/>
+ <translation>%1 קילו בייט</translation>
</message>
<message>
<location line="+2"/>
<source>%1 MB</source>
- <translation type="unfinished"/>
+ <translation>%1 מגה בייט</translation>
</message>
<message>
<location line="+2"/>
<source>%1 GB</source>
- <translation type="unfinished"/>
+ <translation>%1 ג&apos;יגה בייט</translation>
</message>
<message>
<location line="+7"/>
@@ -1815,7 +1869,7 @@ Address: %4
<message>
<location line="+2"/>
<source>%1 h %2 m</source>
- <translation type="unfinished"/>
+ <translation>%1 שעות %2 דקות</translation>
</message>
</context>
<context>
@@ -1826,12 +1880,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+19"/>
- <source>The amount to request</source>
- <translation>כמות הבקשה</translation>
- </message>
- <message>
- <location line="-32"/>
+ <location line="-13"/>
<source>&amp;Label:</source>
<translation>ת&amp;וית:</translation>
</message>
@@ -1841,12 +1890,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+20"/>
- <source>The message to attach to payment request</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="-37"/>
+ <location line="-17"/>
<source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
@@ -1857,16 +1901,26 @@ Address: %4
</message>
<message>
<location line="+27"/>
- <source>The label to associate with the new receiving address</source>
+ <source>An optional label to associate with the new receiving address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
- <source>Use this form to request payments. All fields are optional.</source>
+ <location line="+7"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+56"/>
+ <location line="+7"/>
+ <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+39"/>
+ <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+17"/>
<source>Clear all fields of the form.</source>
<translation>נקה ×ת כל השדות</translation>
</message>
@@ -1882,11 +1936,11 @@ Address: %4
</message>
<message>
<location line="+47"/>
- <source>Previously requested payments</source>
- <translation>בקשות ×ª×©×œ×•× ×™×©× ×•×ª</translation>
+ <source>Requested payments</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+12"/>
+ <location line="+16"/>
<source>Show the selected request (does the same as double clicking an entry)</source>
<translation type="unfinished"/>
</message>
@@ -1977,7 +2031,7 @@ Address: %4
<context>
<name>RecentRequestsTableModel</name>
<message>
- <location filename="../recentrequeststablemodel.cpp" line="+14"/>
+ <location filename="../recentrequeststablemodel.cpp" line="+24"/>
<source>Date</source>
<translation>ת×ריך</translation>
</message>
@@ -1997,7 +2051,7 @@ Address: %4
<translation>כמות</translation>
</message>
<message>
- <location line="+36"/>
+ <location line="+38"/>
<source>(no label)</source>
<translation>(×œ×œ× ×ª×•×™×ª)</translation>
</message>
@@ -2012,7 +2066,7 @@ Address: %4
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
<location filename="../sendcoinsdialog.cpp" line="+381"/>
- <location line="+81"/>
+ <location line="+80"/>
<source>Send Coins</source>
<translation>שלח מטבעות</translation>
</message>
@@ -2034,7 +2088,7 @@ Address: %4
<message>
<location line="+19"/>
<source>Insufficient funds!</source>
- <translation type="unfinished"/>
+ <translation>×ין מספיק כספי×!</translation>
</message>
<message>
<location line="+89"/>
@@ -2044,7 +2098,7 @@ Address: %4
<message>
<location line="+35"/>
<source>Bytes:</source>
- <translation type="unfinished"/>
+ <translation>בייטי×:</translation>
</message>
<message>
<location line="+48"/>
@@ -2069,7 +2123,7 @@ Address: %4
<message>
<location line="+48"/>
<source>After Fee:</source>
- <translation type="unfinished"/>
+ <translation>ל×חר עמלה:</translation>
</message>
<message>
<location line="+32"/>
@@ -2084,7 +2138,7 @@ Address: %4
<message>
<location line="+3"/>
<source>Custom change address</source>
- <translation type="unfinished"/>
+ <translation>כתובת לעודף מות×מת ×ישית</translation>
</message>
<message>
<location line="+115"/>
@@ -2122,7 +2176,7 @@ Address: %4
<translation>שלח</translation>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-229"/>
+ <location filename="../sendcoinsdialog.cpp" line="-228"/>
<source>Confirm send coins</source>
<translation>×שר שליחת מטבעות</translation>
</message>
@@ -2187,7 +2241,7 @@ Address: %4
<message>
<location line="+2"/>
<source>or</source>
- <translation type="unfinished"/>
+ <translation>×ו</translation>
</message>
<message>
<location line="+202"/>
@@ -2217,7 +2271,7 @@ Address: %4
<message>
<location line="+3"/>
<source>Transaction creation failed!</source>
- <translation type="unfinished"/>
+ <translation>יצירת הפעולה נכשלה!</translation>
</message>
<message>
<location line="+4"/>
@@ -2225,22 +2279,22 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+113"/>
+ <location line="+112"/>
<source>Warning: Invalid Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+21"/>
<source>(no label)</source>
<translation>(×œ×œ× ×ª×•×™×ª)</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="-11"/>
<source>Warning: Unknown change address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-378"/>
+ <location line="-366"/>
<source>Are you sure you want to send?</source>
<translation>×”×× ×כן לשלוח?</translation>
</message>
@@ -2252,7 +2306,7 @@ Address: %4
<message>
<location line="+170"/>
<source>Payment request expired</source>
- <translation type="unfinished"/>
+ <translation>תוקף בקשת ×ª×©×œ×•× ×¤×’</translation>
</message>
<message>
<location line="+8"/>
@@ -2264,13 +2318,13 @@ Address: %4
<name>SendCoinsEntry</name>
<message>
<location filename="../forms/sendcoinsentry.ui" line="+131"/>
- <location line="+501"/>
+ <location line="+521"/>
<location line="+536"/>
<source>A&amp;mount:</source>
<translation>כ&amp;מות:</translation>
</message>
<message>
- <location line="-1132"/>
+ <location line="-1152"/>
<source>Pay &amp;To:</source>
<translation>×©×œ× &amp;ל:</translation>
</message>
@@ -2297,7 +2351,7 @@ Address: %4
<message>
<location line="-40"/>
<source>This is a normal payment.</source>
- <translation type="unfinished"/>
+ <translation>זהו ×ª×©×œ×•× ×¨×’×™×œ.</translation>
</message>
<message>
<location line="+50"/>
@@ -2316,25 +2370,35 @@ Address: %4
</message>
<message>
<location line="+7"/>
- <location line="+504"/>
+ <location line="+524"/>
<location line="+536"/>
<source>Remove this entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-40"/>
- <source>This is a verified payment request.</source>
+ <location line="-1008"/>
+ <source>Message:</source>
+ <translation>הודעה:</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-971"/>
+ <location line="+958"/>
+ <source>This is a verified payment request.</source>
+ <translation>זוהי בקשה מ×ומתת לתשלו×.</translation>
+ </message>
+ <message>
+ <location line="-991"/>
<source>Enter a label for this address to add it to the list of used addresses</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+439"/>
+ <location line="+459"/>
<source>This is an unverified payment request.</source>
- <translation type="unfinished"/>
+ <translation>זוהי בקשת ×ª×©×œ×•× ×‘×œ×ª×™Ö¾×ž×ומתת.</translation>
</message>
<message>
<location line="+18"/>
@@ -2355,6 +2419,19 @@ Address: %4
</message>
</context>
<context>
+ <name>ShutdownWindow</name>
+ <message>
+ <location filename="../utilitydialog.cpp" line="+48"/>
+ <source>Bitcoin Core is shutting down...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Do not shut down the computer until this window disappears.</source>
+ <translation>×ין לכבות ×ת המחשב עד שחלון ×–×” נעל×.</translation>
+ </message>
+</context>
+<context>
<name>SignVerifyMessageDialog</name>
<message>
<location filename="../forms/signverifymessagedialog.ui" line="+14"/>
@@ -2362,7 +2439,7 @@ Address: %4
<translation>חתימות - ×—×ª×•× ×ו ×מת הודעה</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+10"/>
<source>&amp;Sign Message</source>
<translation>×—×ª×•× ×¢×œ הו&amp;דעה</translation>
</message>
@@ -2550,7 +2627,7 @@ Address: %4
<context>
<name>SplashScreen</name>
<message>
- <location filename="../splashscreen.cpp" line="+26"/>
+ <location filename="../splashscreen.cpp" line="+28"/>
<source>Bitcoin Core</source>
<translation>ליבת ביטקוין</translation>
</message>
@@ -2570,7 +2647,7 @@ Address: %4
<message>
<location filename="../trafficgraphwidget.cpp" line="+79"/>
<source>KB/s</source>
- <translation type="unfinished"/>
+ <translation>קילו בייט לשניה</translation>
</message>
</context>
<context>
@@ -2649,12 +2726,12 @@ Address: %4
<location line="+12"/>
<location line="+45"/>
<location line="+17"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Credit</source>
<translation>זיכוי</translation>
</message>
<message numerus="yes">
- <location line="-120"/>
+ <location line="-125"/>
<source>matures in %n more block(s)</source>
<translation><numerusform>מבשיל בעוד בלוק ×חד</numerusform><numerusform>מבשיל בעוד %n בלוקי×</numerusform></translation>
</message>
@@ -2667,12 +2744,12 @@ Address: %4
<location line="+44"/>
<location line="+8"/>
<location line="+15"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Debit</source>
<translation>חיוב</translation>
</message>
<message>
- <location line="-57"/>
+ <location line="-62"/>
<source>Transaction fee</source>
<translation>עמלת פעולה</translation>
</message>
@@ -2683,11 +2760,12 @@ Address: %4
</message>
<message>
<location line="+6"/>
+ <location line="+9"/>
<source>Message</source>
<translation>הודעה</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="-7"/>
<source>Comment</source>
<translation>הערה</translation>
</message>
@@ -2697,7 +2775,7 @@ Address: %4
<translation>זיהוי פעולה</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+18"/>
<source>Merchant</source>
<translation type="unfinished"/>
</message>
@@ -2737,7 +2815,7 @@ Address: %4
<translation>שקר</translation>
</message>
<message>
- <location line="-227"/>
+ <location line="-232"/>
<source>, has not been successfully broadcast yet</source>
<translation>, ×˜×¨× ×©×•×“×¨ בהצלחה</translation>
</message>
@@ -2787,8 +2865,13 @@ Address: %4
<source>Amount</source>
<translation>כמות</translation>
</message>
+ <message>
+ <location line="+59"/>
+ <source>Immature (%1 confirmations, will be available after %2)</source>
+ <translation type="unfinished"/>
+ </message>
<message numerus="yes">
- <location line="+57"/>
+ <location line="+16"/>
<source>Open for %n more block(s)</source>
<translation><numerusform>פתח למשך בלוק %n יותר</numerusform><numerusform>פתח למשך %n ×‘×œ×•×§×™× × ×•×¡×¤×™×</numerusform></translation>
</message>
@@ -2808,17 +2891,13 @@ Address: %4
<translation>ממתין ל×ישור (%1 מתוך %2 ×ישורי×)</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="-22"/>
+ <location line="+25"/>
<source>Confirmed (%1 confirmations)</source>
<translation>מ×ושר (%1 ×ישורי×)</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>המ×זן שנכרה ×™×”×™×” זמין ×›×©×”×•× ×ž×‘×©×™×œ בעוד בלוק ×חד</numerusform><numerusform>המ×זן שנכרה ×™×”×™×” זמין ×›×©×”×•× ×ž×‘×©×™×œ בעוד %n בלוקי×</numerusform></translation>
- </message>
<message>
- <location line="+5"/>
+ <location line="-22"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation>הבלוק ×”×–×” ×œ× × ×§×œ×˜ על ידי ××£ צומת ×חר, וכנר××” ×œ× ×™×ª×§×‘×œ!</translation>
</message>
@@ -2828,7 +2907,7 @@ Address: %4
<translation>נוצר ×ך ×œ× ×”×ª×§×‘×œ</translation>
</message>
<message>
- <location line="+43"/>
+ <location line="+62"/>
<source>Received with</source>
<translation>התקבל ×¢×</translation>
</message>
@@ -2989,12 +3068,12 @@ Address: %4
<message>
<location line="+142"/>
<source>Export Transaction History</source>
- <translation type="unfinished"/>
+ <translation>×™×¦×•× ×”×™×¡×˜×•×¨×™×™×ª פעולות</translation>
</message>
<message>
<location line="+19"/>
<source>Exporting Failed</source>
- <translation type="unfinished"/>
+ <translation>×”×™×™×¦×•× × ×›×©×œ</translation>
</message>
<message>
<location line="+0"/>
@@ -3004,12 +3083,12 @@ Address: %4
<message>
<location line="+4"/>
<source>Exporting Successful</source>
- <translation type="unfinished"/>
+ <translation>×”×™×™×¦×•× ×‘×•×¦×¢ בהצלחה</translation>
</message>
<message>
<location line="+0"/>
<source>The transaction history was successfully saved to %1.</source>
- <translation type="unfinished"/>
+ <translation>היסטוריית הפעולות נשמרה ל־%1 בהצלחה.</translation>
</message>
<message>
<location line="-22"/>
@@ -3124,7 +3203,7 @@ Address: %4
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+217"/>
+ <location filename="../bitcoinstrings.cpp" line="+221"/>
<source>Usage:</source>
<translation>שימוש:</translation>
</message>
@@ -3144,7 +3223,7 @@ Address: %4
<translation>×פשרויות:</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+22"/>
<source>Specify configuration file (default: bitcoin.conf)</source>
<translation>ציין קובץ הגדרות (ברירת מחדל: bitcoin.conf)</translation>
</message>
@@ -3164,7 +3243,7 @@ Address: %4
<translation>קבע ×ת גודל המטמון של מסד ×”× ×ª×•× ×™× ×‘×ž×’×”×‘×™×™×˜ (ברירת מחדל: 25)</translation>
</message>
<message>
- <location line="-27"/>
+ <location line="-26"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
<translation>×”×זן ×œ×—×™×‘×•×¨×™× ×‘&lt;פורט&gt; (ברירת מחדל: 8333 ×ו ברשת הבדיקה: 18333)</translation>
</message>
@@ -3174,7 +3253,7 @@ Address: %4
<translation>החזק לכל היותר &lt;n&gt; ×—×™×‘×•×¨×™× ×œ×¢×ž×™×ª×™× (ברירת מחדל: 125)</translation>
</message>
<message>
- <location line="-50"/>
+ <location line="-51"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation>התחבר לצומת כדי לדלות כתובות עמיתי×, ו××– התנתק</translation>
</message>
@@ -3184,22 +3263,22 @@ Address: %4
<translation>ציין ×ת הכתובת הפומבית שלך</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation>סף להתנתקות ×ž×¢×ž×™×ª×™× ×”× ×•×”×’×™× ×©×œ× ×›×”×œ×›×” (ברירת מחדל: 100)</translation>
</message>
<message>
- <location line="-147"/>
+ <location line="-148"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation>מספר שניות למנוע ×ž×¢×ž×™×ª×™× ×”× ×•×”×’×™× ×©×œ× ×›×”×œ×›×” מלהתחבר מחדש (ברירת מחדל: 86400)</translation>
</message>
<message>
- <location line="-33"/>
+ <location line="-36"/>
<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="+31"/>
+ <location line="+34"/>
<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>
@@ -3209,7 +3288,7 @@ Address: %4
<translation>קבל פקודות משורת הפקודה ו- JSON-RPC</translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>רוץ ברקע כדימון וקבל פקודות</translation>
</message>
@@ -3219,12 +3298,12 @@ Address: %4
<translation>השתמש ברשת הבדיקה</translation>
</message>
<message>
- <location line="-117"/>
+ <location line="-118"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation>קבל ×—×™×‘×•×¨×™× ×ž×‘×—×•×¥ (ברירת מחדל: 1 ×œ×œ× -proxy ×ו -connect)</translation>
</message>
<message>
- <location line="-92"/>
+ <location line="-95"/>
<source>%s, you must set a rpcpassword in the configuration file:
%s
It is recommended you use the following random password:
@@ -3275,6 +3354,11 @@ rpcpassword=%s
</message>
<message>
<location line="+4"/>
+ <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
<source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
<translation>שגי××”: הפעולה נדחתה! ×–×” עלול לקרות ×× ×›×ž×” מהמטבעות ב×רנק שלך כבר נוצלו, למשל ×× ×”×©×ª×ž×©×ª בעותק של wallet.dat ומטבעות נשלחו בעותק ×ך ×œ× ×¡×•×ž× ×• כמנוצלות ×›×ן.</translation>
</message>
@@ -3380,6 +3464,11 @@ rpcpassword=%s
</message>
<message>
<location line="+1"/>
+ <source>Do not load the wallet and disable wallet RPC calls</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Do you want to rebuild the block database now?</source>
<translation>×”×× ×ª×¨×¦×” כעט לבנות מחדש ×ת מסד נתוני הבלוקי×?</translation>
</message>
@@ -3544,7 +3633,7 @@ rpcpassword=%s
<translation>שליחת פקודה לשרת הביטקוין</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+7"/>
<source>Set maximum block size in bytes (default: %d)</source>
<translation type="unfinished"/>
</message>
@@ -3564,7 +3653,12 @@ rpcpassword=%s
<translation>הפעל ביטקוין סרוור</translation>
</message>
<message>
- <location line="+12"/>
+ <location line="+3"/>
+ <source>This is intended for regression testing tools and app development.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Usage (deprecated, use bitcoin-cli):</source>
<translation type="unfinished"/>
</message>
@@ -3589,22 +3683,27 @@ rpcpassword=%s
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
+ <location line="+2"/>
+ <source>Wallet options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+2"/>
<source>You need to rebuild the database using -reindex to change -txindex</source>
- <translation type="unfinished"/>
+ <translation>עליך לבנות מחדש ×ת מסד ×”× ×ª×•× ×™× ×ª×•×š שימוש ב- -reindex על מנת לשנות ×ת -txindex</translation>
</message>
<message>
- <location line="-78"/>
+ <location line="-79"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation>×ž×™×™×‘× ×‘×œ×•×§×™× ×ž×§×•×‘×¦×™ blk000??.dat חיצוניי×</translation>
</message>
<message>
- <location line="-104"/>
+ <location line="-105"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
@@ -3624,7 +3723,7 @@ rpcpassword=%s
<translation>קבע ×ת מספר תהליכוני ×ימות ×”×¡×§×¨×™×¤×˜×™× (1-16, 0 = ×וטומטי, ברירת מחדל: 0)</translation>
</message>
<message>
- <location line="+88"/>
+ <location line="+89"/>
<source>Information</source>
<translation>מידע</translation>
</message>
@@ -3674,11 +3773,6 @@ rpcpassword=%s
<translation>שלח מידע דיב××’ ועקבה לקונסולה ×‘×ž×§×•× ×œ×§×•×‘×¥ debug.log</translation>
</message>
<message>
- <location line="+1"/>
- <source>Send trace/debug info to debugger</source>
- <translation>שלח מידע דיב××’ ועקבה לכלי דיב××’</translation>
- </message>
- <message>
<location line="+6"/>
<source>Set minimum block size in bytes (default: 0)</source>
<translation>קבע ×ת גודל הבלוק המינימלי ×‘×‘×ª×™× (ברירת מחדל: 0)</translation>
@@ -3704,7 +3798,7 @@ rpcpassword=%s
<translation>שגי×ת מערכת:</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Transaction amount too small</source>
<translation>×¡×›×•× ×”×¢×‘×¨×” קטן מדי</translation>
</message>
@@ -3734,7 +3828,7 @@ rpcpassword=%s
<translation>×©× ×ž×©×ª×ž×© לחיבורי JSON-RPC</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Warning</source>
<translation>×זהרה</translation>
</message>
@@ -3754,37 +3848,37 @@ rpcpassword=%s
<translation>קובץ wallet.dat מושחת, החילוץ נכשל</translation>
</message>
<message>
- <location line="-57"/>
+ <location line="-58"/>
<source>Password for JSON-RPC connections</source>
<translation>סיסמה לחיבורי JSON-RPC</translation>
</message>
<message>
- <location line="-69"/>
+ <location line="-70"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation>×פשר חיבורי JSON-RPC מכתובת ×”×ינטרנט המצוינת</translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<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="-131"/>
+ <location line="-132"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation>בצע פקודה זו כשהבלוק הטוב ביותר משתנה (%s בפקודה יוחלף בגיבוב הבלוק)</translation>
</message>
<message>
- <location line="+160"/>
+ <location line="+161"/>
<source>Upgrade wallet to latest format</source>
<translation>שדרג ×ת ×”×רנק לפורמט העדכני</translation>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation>קבע ×ת גודל המ×גר ל -&lt;n&gt; (ברירת מחדל: 100)</translation>
</message>
<message>
- <location line="-12"/>
+ <location line="-11"/>
<source>Rescan the block chain for missing wallet transactions</source>
<translation>סרוק מחדש ×ת שרשרת ×”×‘×œ×•×§×™× ×œ×ž×¦×™×ת פעולות חסרות ב×רנק</translation>
</message>
@@ -3794,7 +3888,7 @@ rpcpassword=%s
<translation>השתמש ב-OpenSSL (https( עבור חיבורי JSON-RPC</translation>
</message>
<message>
- <location line="-29"/>
+ <location line="-30"/>
<source>Server certificate file (default: server.cert)</source>
<translation>קובץ תעודת שרת (ברירת מחדל: server.cert)</translation>
</message>
@@ -3809,17 +3903,17 @@ rpcpassword=%s
<translation>הודעת העזרה הזו</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Unable to bind to %s on this computer (bind returned error %d, %s)</source>
<translation>×œ× ×ž×¡×•×’×œ לקשור ל-%s במחשב ×–×” (הקשירה החזירה שגי××” %d, %s)</translation>
</message>
<message>
- <location line="-106"/>
+ <location line="-107"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation>×פשר בדיקת DNS עבור -addnode, -seednode ו- -connect</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+60"/>
<source>Loading addresses...</source>
<translation>טוען כתובות...</translation>
</message>
@@ -3859,7 +3953,7 @@ rpcpassword=%s
<translation>התבקשה גרסת פרוקסי -socks ×œ× ×™×“×•×¢×”: %i</translation>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation>×œ× ×ž×¡×•×’×œ לפתור כתובת -bind: &apos;%s&apos;</translation>
</message>
@@ -3869,7 +3963,7 @@ rpcpassword=%s
<translation>×œ× ×ž×¡×•×’×œ לפתור כתובת -externalip: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+47"/>
+ <location line="+48"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation>כמות ×œ× ×ª×§×™× ×” עבור -paytxfee=&lt;amount&gt;: &apos;%s&apos;</translation>
</message>
@@ -3889,7 +3983,7 @@ rpcpassword=%s
<translation>טוען ×ת ×ינדקס הבלוקי×...</translation>
</message>
<message>
- <location line="-61"/>
+ <location line="-62"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation>הוסף צומת להתחברות ונסה לשמור ×ת החיבור פתוח</translation>
</message>
@@ -3899,12 +3993,12 @@ rpcpassword=%s
<translation>×œ× × ×™×ª×Ÿ לקשור ל-%s במחשב ×–×”. ביטקוין כנר××” עדיין רץ.</translation>
</message>
<message>
- <location line="+94"/>
+ <location line="+95"/>
<source>Loading wallet...</source>
<translation>טוען ×רנק...</translation>
</message>
<message>
- <location line="-55"/>
+ <location line="-56"/>
<source>Cannot downgrade wallet</source>
<translation>×œ× ×™×›×•×œ להוריד דרגת ×”×רנק</translation>
</message>
@@ -3914,7 +4008,7 @@ rpcpassword=%s
<translation>×œ× ×™×›×•×œ לכתוב ×ת כתובת ברירת המחדל</translation>
</message>
<message>
- <location line="+66"/>
+ <location line="+67"/>
<source>Rescanning...</source>
<translation>סורק מחדש...</translation>
</message>
@@ -3934,7 +4028,7 @@ rpcpassword=%s
<translation>שגי××”</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-35"/>
<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 a89f4dc98d..ba10250526 100644
--- a/src/qt/locale/bitcoin_hi_IN.ts
+++ b/src/qt/locale/bitcoin_hi_IN.ts
@@ -3,13 +3,13 @@
<name>AboutDialog</name>
<message>
<location filename="../forms/aboutdialog.ui" line="+14"/>
- <source>About Bitcoin</source>
- <translation>बिटकोइन के संबंध में</translation>
+ <source>About Bitcoin Core</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+39"/>
- <source>&lt;b&gt;Bitcoin&lt;/b&gt; version</source>
- <translation>बिटकोइन वरà¥à¤¸à¤¨</translation>
+ <source>&lt;b&gt;Bitcoin Core&lt;/b&gt; version</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+57"/>
@@ -22,13 +22,13 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location filename="../aboutdialog.cpp" line="+14"/>
+ <location filename="../utilitydialog.cpp" line="+29"/>
<source>Copyright</source>
<translation>कापीराइट</translation>
</message>
<message>
<location line="+0"/>
- <source>The Bitcoin developers</source>
+ <source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
</context>
@@ -65,7 +65,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location filename="../addressbookpage.cpp" line="+72"/>
+ <location filename="../addressbookpage.cpp" line="+74"/>
<source>&amp;Copy Address</source>
<translation>&amp;पता कॉपी करे</translation>
</message>
@@ -135,7 +135,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>&amp;à¤à¤¡à¤¿à¤Ÿ</translation>
</message>
<message>
- <location line="+197"/>
+ <location line="+194"/>
<source>Export Address List</source>
<translation type="unfinished"/>
</message>
@@ -146,19 +146,19 @@ This product includes software developed by the OpenSSL Project for use in the O
</message>
<message>
<location line="+13"/>
- <source>Error exporting</source>
- <translation>ग़लतियाठà¤à¤•à¥à¤¸à¤ªà¥‹à¤°à¥à¤Ÿ (निरà¥à¤¯à¤¾à¤¤) करे!</translation>
+ <source>Exporting Failed</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation>फाइल में लिख नही सके %1.</translation>
+ <location line="+1"/>
+ <source>There was an error trying to save the address list to %1.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<name>AddressTableModel</name>
<message>
- <location filename="../addresstablemodel.cpp" line="+164"/>
+ <location filename="../addresstablemodel.cpp" line="+168"/>
<source>Label</source>
<translation>लेबल</translation>
</message>
@@ -196,7 +196,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>दोबारा नया पहचान शबà¥à¤¦/अकà¥à¤·à¤° डालिठ!</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="+34"/>
+ <location filename="../askpassphrasedialog.cpp" line="+40"/>
<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;br&gt; 10 से ज़à¥à¤¯à¤¾à¤¦à¤¾ अकà¥à¤·à¥‰à¤°à¥‹à¤‚ का इसà¥à¤¤à¥‡à¤®à¤¾à¤² करे &lt;/b&gt;,या &lt;b&gt;आठ या उससे से ज़à¥à¤¯à¤¾à¤¦à¤¾ शबà¥à¤¦à¥‹ का इसà¥à¤¤à¥‡à¤®à¤¾à¤² करे&lt;/b&gt; !</translation>
</message>
@@ -317,22 +317,27 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+250"/>
+ <location filename="../bitcoingui.cpp" line="+295"/>
<source>Sign &amp;message...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+254"/>
+ <location line="+335"/>
<source>Synchronizing with network...</source>
<translation>नेटवरà¥à¤• से समकालिक (मिल) रहा है ...</translation>
</message>
<message>
- <location line="-324"/>
+ <location line="-407"/>
<source>&amp;Overview</source>
<translation>&amp;विवरण</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="-137"/>
+ <source>Node</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+138"/>
<source>Show general overview of wallet</source>
<translation>वॉलेट का सामानया विवरण दिखाठ!</translation>
</message>
@@ -348,7 +353,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>देखिठपà¥à¤°à¤¾à¤¨à¥‡ लेन-देन के विवरण !</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>E&amp;xit</source>
<translation>बाहर जायें</translation>
</message>
@@ -394,7 +399,22 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+259"/>
+ <location line="+10"/>
+ <source>&amp;Sending addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Receiving addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open &amp;URI...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+325"/>
<source>Importing blocks from disk...</source>
<translation type="unfinished"/>
</message>
@@ -404,12 +424,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="-322"/>
+ <location line="-405"/>
<source>Send coins to a Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+47"/>
+ <location line="+49"/>
<source>Modify configuration options for Bitcoin</source>
<translation type="unfinished"/>
</message>
@@ -439,20 +459,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="-180"/>
- <location line="+6"/>
- <location line="+513"/>
+ <location line="+430"/>
<source>Bitcoin</source>
<translation>बीटकोइन</translation>
</message>
<message>
- <location line="-519"/>
- <location line="+6"/>
+ <location line="-643"/>
<source>Wallet</source>
<translation>वॉलेट</translation>
</message>
<message>
- <location line="+109"/>
+ <location line="+146"/>
<source>&amp;Send</source>
<translation type="unfinished"/>
</message>
@@ -462,13 +479,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+28"/>
- <location line="+2"/>
- <source>&amp;About Bitcoin</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+14"/>
+ <location line="+46"/>
<location line="+2"/>
<source>&amp;Show / Hide</source>
<translation type="unfinished"/>
@@ -494,64 +505,80 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+35"/>
+ <location line="+48"/>
<source>&amp;File</source>
<translation>&amp;फाइल</translation>
</message>
<message>
- <location line="+10"/>
+ <location line="+14"/>
<source>&amp;Settings</source>
<translation>&amp;सेटà¥à¤Ÿà¤¿à¤‚गà¥à¤¸</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>&amp;Help</source>
<translation>&amp;मदद</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+15"/>
<source>Tabs toolbar</source>
<translation>टैबस टूलबार</translation>
</message>
<message>
- <location line="-235"/>
- <location line="+294"/>
+ <location line="-284"/>
+ <location line="+376"/>
<source>[testnet]</source>
<translation>[टेसà¥à¤Ÿà¤¨à¥‡à¤Ÿ]</translation>
</message>
<message>
- <location line="-177"/>
+ <location line="-401"/>
+ <source>Bitcoin Core</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+163"/>
<source>Request payments (generates QR codes and bitcoin: URIs)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+63"/>
- <source>&amp;Used sending addresses...</source>
+ <location line="+29"/>
+ <location line="+2"/>
+ <source>&amp;About Bitcoin Core</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="+35"/>
<source>Show the list of used sending addresses and labels</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Used &amp;receiving addresses...</source>
+ <location line="+2"/>
+ <source>Show the list of used receiving addresses and labels</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open a bitcoin: URI or payment request</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Command-line options</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
- <source>Show the list of used receiving addresses and labels</source>
+ <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+106"/>
+ <location line="+159"/>
<location line="+5"/>
<source>Bitcoin client</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+120"/>
+ <location line="+142"/>
<source>%n active connection(s) to Bitcoin network</source>
<translation><numerusform>%n सकà¥à¤°à¤¿à¤¯à¤¾ संपरà¥à¤• बीटकोइन नेटवरà¥à¤• से</numerusform><numerusform>%n सकà¥à¤°à¤¿à¤¯à¤¾ संपरà¥à¤• बीटकोइन नेटवरà¥à¤• से</numerusform></translation>
</message>
@@ -571,7 +598,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+20"/>
+ <location line="+23"/>
<source>%n hour(s)</source>
<translation><numerusform>%n घंटा</numerusform><numerusform>%n घंटे</numerusform></translation>
</message>
@@ -591,7 +618,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>%1 पीछे</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="+21"/>
<source>Last received block was generated %1 ago.</source>
<translation type="unfinished"/>
</message>
@@ -616,27 +643,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>जानकारी</translation>
</message>
<message>
- <location line="+77"/>
- <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="-152"/>
+ <location line="-85"/>
<source>Up to date</source>
<translation>नवीनतम</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Catching up...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+124"/>
- <source>Confirm transaction fee</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+130"/>
<source>Sent transaction</source>
<translation>भेजी टà¥à¤°à¤¾à¤‚जकà¥à¤¶à¤¨</translation>
</message>
@@ -658,17 +675,7 @@ Address: %4
पता:%4\n</translation>
</message>
<message>
- <location line="+34"/>
- <source>URI handling</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+0"/>
- <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="+45"/>
+ <location line="+69"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation>वॉलेट à¤à¤¨à¥à¤•à¥à¤°à¤¿à¤ªà¥à¤Ÿà¥‡à¤¡ है तथा अभी लॉकà¥à¤¡ नहीं है</translation>
</message>
@@ -678,7 +685,7 @@ Address: %4
<translation>वॉलेट à¤à¤¨à¥à¤•à¥à¤°à¤¿à¤ªà¥à¤Ÿà¥‡à¤¡ है तथा अभी लॉकà¥à¤¡ है</translation>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+110"/>
+ <location filename="../bitcoin.cpp" line="+438"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation type="unfinished"/>
</message>
@@ -686,12 +693,304 @@ Address: %4
<context>
<name>ClientModel</name>
<message>
- <location filename="../clientmodel.cpp" line="+115"/>
+ <location filename="../clientmodel.cpp" line="+119"/>
<source>Network Alert</source>
<translation type="unfinished"/>
</message>
</context>
<context>
+ <name>CoinControlDialog</name>
+ <message>
+ <location filename="../forms/coincontroldialog.ui" line="+14"/>
+ <source>Coin Control Address Selection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>Quantity:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Bytes:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>Amount:</source>
+ <translation>राशि :</translation>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Priority:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Low Output:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>After Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Change:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+63"/>
+ <source>(un)select all</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Tree mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>List mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>Amount</source>
+ <translation>राशि</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Address</source>
+ <translation>पता</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Date</source>
+ <translation>taareek</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Confirmations</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Confirmed</source>
+ <translation>पकà¥à¤•à¤¾</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../coincontroldialog.cpp" line="+42"/>
+ <source>Copy address</source>
+ <translation>पता कॉपी करे</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy label</source>
+ <translation>लेबल कॉपी करे </translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+26"/>
+ <source>Copy amount</source>
+ <translation>कॉपी राशि</translation>
+ </message>
+ <message>
+ <location line="-25"/>
+ <source>Copy transaction ID</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Lock unspent</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Unlock unspent</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+22"/>
+ <source>Copy quantity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Copy fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy after fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy bytes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy low output</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy change</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+323"/>
+ <source>highest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>higher</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>high</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>medium-high</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>medium</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>low-medium</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>low</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>lower</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>lowest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>(%1 locked)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+140"/>
+ <source>Dust</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>yes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>no</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>This label turns red, if the transaction size is greater than 1000 bytes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+5"/>
+ <source>This means a fee of at least %1 per kB is required.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-4"/>
+ <source>Can vary +/- 1 byte per input.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Transactions with higher priority are more likely to get included into a block.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>This label turns red, if the priority is smaller than &quot;medium&quot;.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>This label turns red, if any recipient receives an amount smaller than %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+4"/>
+ <source>This means a fee of at least %1 is required.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-3"/>
+ <source>Amounts below 0.546 times the minimum relay fee are shown as dust.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>This label turns red, if the change is smaller than %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
+ <location line="+66"/>
+ <source>(no label)</source>
+ <translation>(कोई लेबल नही !)</translation>
+ </message>
+ <message>
+ <location line="-9"/>
+ <source>change from %1 (%2)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>(change)</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>EditAddressDialog</name>
<message>
<location filename="../forms/editaddressdialog.ui" line="+14"/>
@@ -719,7 +1018,7 @@ Address: %4
<translation>&amp;पता</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+21"/>
+ <location filename="../editaddressdialog.cpp" line="+28"/>
<source>New receiving address</source>
<translation>नया सà¥à¤µà¥€à¤•à¤¾à¤°à¥à¤¯ पता</translation>
</message>
@@ -762,7 +1061,7 @@ Address: %4
<context>
<name>FreespaceChecker</name>
<message>
- <location filename="../intro.cpp" line="+61"/>
+ <location filename="../intro.cpp" line="+65"/>
<source>A new data directory will be created.</source>
<translation type="unfinished"/>
</message>
@@ -788,15 +1087,19 @@ Address: %4
</message>
</context>
<context>
- <name>GUIUtil::HelpMessageBox</name>
+ <name>HelpMessageDialog</name>
<message>
- <location filename="../guiutil.cpp" line="+558"/>
- <location line="+13"/>
- <source>Bitcoin-Qt</source>
- <translation>बीटकोइन-Qt</translation>
+ <location filename="../forms/helpmessagedialog.ui" line="+19"/>
+ <source>Bitcoin Core - Command-line options</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="-13"/>
+ <location filename="../utilitydialog.cpp" line="+38"/>
+ <source>Bitcoin Core</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
<source>version</source>
<translation>संसà¥à¤•à¤°à¤£</translation>
</message>
@@ -845,17 +1148,17 @@ Address: %4
</message>
<message>
<location line="+9"/>
- <source>Welcome to Bitcoin-Qt.</source>
+ <source>Welcome to Bitcoin Core.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+26"/>
- <source>As this is the first time the program is launched, you can choose where Bitcoin-Qt will store its data.</source>
+ <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+10"/>
- <source>Bitcoin-Qt will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
+ <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -869,7 +1172,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../intro.cpp" line="+105"/>
+ <location filename="../intro.cpp" line="+85"/>
+ <source>Bitcoin</source>
+ <translation>बीटकोइन</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error: Specified data directory &quot;%1&quot; can not be created.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+19"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
@@ -885,6 +1198,34 @@ Address: %4
</message>
</context>
<context>
+ <name>OpenURIDialog</name>
+ <message>
+ <location filename="../forms/openuridialog.ui" line="+14"/>
+ <source>Open URI</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Open payment request from URI or file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>URI:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Select payment request file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../openuridialog.cpp" line="+47"/>
+ <source>Select payment request file to open</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OptionsDialog</name>
<message>
<location filename="../forms/optionsdialog.ui" line="+14"/>
@@ -892,7 +1233,7 @@ Address: %4
<translation>विकलà¥à¤ª</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+13"/>
<source>&amp;Main</source>
<translation type="unfinished"/>
</message>
@@ -917,57 +1258,87 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+35"/>
- <source>Reset all client options to default.</source>
+ <location line="+9"/>
+ <source>Size of &amp;database cache</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>&amp;Reset Options</source>
+ <location line="+13"/>
+ <source>Set database cache size in megabytes (default: 25)</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+13"/>
- <source>&amp;Network</source>
+ <source>MB</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>
+ <location line="+27"/>
+ <source>Number of script &amp;verification threads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Connect to the Bitcoin network through a SOCKS proxy.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
- <source>Map port using &amp;UPnP</source>
+ <source>&amp;Connect through SOCKS proxy (default proxy):</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>
+ <location line="+34"/>
+ <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+224"/>
+ <source>Active command-line options that override above options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
+ <source>Reset all client options to default.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
- <source>&amp;Connect through SOCKS proxy:</source>
+ <source>&amp;Reset Options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+9"/>
- <source>Proxy &amp;IP:</source>
+ <location line="-323"/>
+ <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="+19"/>
- <source>IP address of the proxy (e.g. 127.0.0.1)</source>
+ <source>Proxy &amp;IP:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="+32"/>
<source>&amp;Port:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+19"/>
+ <location line="+25"/>
<source>Port of the proxy (e.g. 9050)</source>
<translation type="unfinished"/>
</message>
@@ -1042,7 +1413,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+71"/>
+ <location line="+7"/>
+ <source>Whether to show coin control features or not.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Display coin &amp;control features (experts only)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+136"/>
<source>&amp;OK</source>
<translation>&amp;ओके</translation>
</message>
@@ -1052,44 +1433,38 @@ Address: %4
<translation>&amp;कैनà¥à¤¸à¤²</translation>
</message>
<message>
- <location line="+10"/>
- <source>&amp;Apply</source>
+ <location filename="../optionsdialog.cpp" line="+67"/>
+ <source>default</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+58"/>
- <source>default</source>
+ <location line="+57"/>
+ <source>none</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+130"/>
+ <location line="+75"/>
<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>
+ <location line="+29"/>
+ <source>Client restart required to activate changes.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>Do you want to proceed?</source>
+ <location line="-29"/>
+ <source>Client will be shutdown, do you want to proceed?</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
- <location line="+9"/>
- <source>Warning</source>
- <translation>चेतावनी</translation>
- </message>
- <message>
- <location line="-9"/>
- <location line="+9"/>
- <source>This setting will take effect after restarting Bitcoin.</source>
+ <location line="+33"/>
+ <source>This change would require a client restart.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+29"/>
+ <location line="+34"/>
<source>The supplied proxy address is invalid.</source>
<translation type="unfinished"/>
</message>
@@ -1103,22 +1478,22 @@ Address: %4
</message>
<message>
<location line="+50"/>
- <location line="+202"/>
+ <location line="+231"/>
<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="-131"/>
+ <location line="-155"/>
<source>Unconfirmed:</source>
<translation>अपà¥à¤·à¥à¤Ÿ :</translation>
</message>
<message>
- <location line="-78"/>
+ <location line="-83"/>
<source>Wallet</source>
<translation>वॉलेट</translation>
</message>
<message>
- <location line="+49"/>
+ <location line="+51"/>
<source>Confirmed:</source>
<translation type="unfinished"/>
</message>
@@ -1128,12 +1503,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+29"/>
+ <location line="+32"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+16"/>
<source>Immature:</source>
<translation type="unfinished"/>
</message>
@@ -1143,7 +1518,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+16"/>
<source>Total:</source>
<translation type="unfinished"/>
</message>
@@ -1153,12 +1528,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+53"/>
+ <location line="+71"/>
<source>&lt;b&gt;Recent transactions&lt;/b&gt;</source>
<translation>&lt;b&gt;हाल का लेन-देन&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../overviewpage.cpp" line="+116"/>
+ <location filename="../overviewpage.cpp" line="+120"/>
<location line="+1"/>
<source>out of sync</source>
<translation type="unfinished"/>
@@ -1167,7 +1542,8 @@ Address: %4
<context>
<name>PaymentServer</name>
<message>
- <location filename="../paymentserver.cpp" line="+392"/>
+ <location filename="../paymentserver.cpp" line="+403"/>
+ <location line="+13"/>
<source>URI handling</source>
<translation type="unfinished"/>
</message>
@@ -1177,45 +1553,82 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+69"/>
+ <location line="+96"/>
<source>Requested payment amount of %1 is too small (considered dust).</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
- <location line="+37"/>
+ <location line="-221"/>
+ <location line="+212"/>
+ <location line="+13"/>
+ <location line="+95"/>
+ <location line="+18"/>
+ <location line="+16"/>
<source>Payment request error</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="-353"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Net manager warning</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+1"/>
- <source>Insecure requests to custom payment scripts unsupported</source>
+ <source>Your active proxy doesn&apos;t support SOCKS5, which is required for payment requests via proxy.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+38"/>
+ <location line="+52"/>
+ <source>Payment request fetch URL is invalid: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Payment request file handling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Payment request file can not be read or processed! This can be caused by an invalid payment request file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+73"/>
+ <source>Unverified payment requests to custom payment scripts are unsupported.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+59"/>
<source>Refund from %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
+ <location line="+43"/>
<source>Error communicating with %1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+24"/>
+ <source>Payment request can not be parsed or processed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
<source>Bad response from server %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+32"/>
+ <location line="+33"/>
<source>Payment acknowledged</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-58"/>
- <location line="+30"/>
- <location line="+17"/>
+ <location line="-11"/>
<source>Network request error</source>
<translation type="unfinished"/>
</message>
@@ -1223,32 +1636,26 @@ Address: %4
<context>
<name>QObject</name>
<message>
- <location filename="../bitcoin.cpp" line="+114"/>
- <location line="+5"/>
- <location filename="../intro.cpp" line="-32"/>
+ <location filename="../bitcoin.cpp" line="+71"/>
+ <location line="+11"/>
<source>Bitcoin</source>
- <translation type="unfinished"/>
+ <translation>बीटकोइन</translation>
</message>
<message>
- <location line="-4"/>
+ <location line="+1"/>
<source>Error: Specified data directory &quot;%1&quot; does not exist.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="-12"/>
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../intro.cpp" line="+1"/>
- <source>Error: Specified data directory &quot;%1&quot; can not be created.</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>QRImageWidget</name>
<message>
- <location filename="../receiverequestdialog.cpp" line="+32"/>
+ <location filename="../receiverequestdialog.cpp" line="+36"/>
<source>&amp;Save Image...</source>
<translation type="unfinished"/>
</message>
@@ -1264,7 +1671,7 @@ Address: %4
</message>
<message>
<location line="+0"/>
- <source>PNG Images (*.png)</source>
+ <source>PNG Image (*.png)</source>
<translation type="unfinished"/>
</message>
</context>
@@ -1282,16 +1689,17 @@ Address: %4
<location line="+23"/>
<location line="+23"/>
<location line="+36"/>
- <location line="+53"/>
<location line="+23"/>
+ <location line="+36"/>
<location line="+23"/>
- <location filename="../rpcconsole.cpp" line="+352"/>
+ <location line="+23"/>
+ <location filename="../rpcconsole.cpp" line="+359"/>
<source>N/A</source>
<translation>लागू नही
</translation>
</message>
<message>
- <location line="-217"/>
+ <location line="-223"/>
<source>Client version</source>
<translation type="unfinished"/>
</message>
@@ -1301,7 +1709,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+68"/>
+ <location line="-10"/>
+ <source>Debug window</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+25"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+53"/>
<source>Using OpenSSL version</source>
<translation type="unfinished"/>
</message>
@@ -1317,16 +1735,16 @@ Address: %4
</message>
<message>
<location line="+7"/>
- <source>Number of connections</source>
+ <source>Name</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+23"/>
- <source>On testnet</source>
+ <source>Number of connections</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+23"/>
+ <location line="+29"/>
<source>Block chain</source>
<translation type="unfinished"/>
</message>
@@ -1351,21 +1769,6 @@ Address: %4
<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"/>
@@ -1396,22 +1799,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-541"/>
+ <location line="-521"/>
<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"/>
+ <location line="+206"/>
<source>Debug log file</source>
<translation type="unfinished"/>
</message>
@@ -1421,7 +1814,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+102"/>
+ <location line="+76"/>
<source>Clear console</source>
<translation type="unfinished"/>
</message>
@@ -1441,7 +1834,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+128"/>
+ <location line="+122"/>
<source>%1 B</source>
<translation type="unfinished"/>
</message>
@@ -1479,48 +1872,48 @@ Address: %4
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+22"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
<source>&amp;Amount:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
- <source>The amount to request</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+7"/>
+ <location line="-13"/>
<source>&amp;Label:</source>
<translation>लेबल:</translation>
</message>
<message>
- <location line="+10"/>
- <source>The label to associate with the receiving address</source>
+ <location line="-34"/>
+ <source>&amp;Message:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>&amp;Message:</source>
+ <location line="-17"/>
+ <source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>The message to attach to payment request</source>
+ <location line="+3"/>
+ <source>R&amp;euse an existing receiving address (not recommended)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
- <source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
+ <location line="+27"/>
+ <source>An optional label to associate with the new receiving address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>R&amp;euse an existing receiving address (not recommended)</source>
+ <location line="+7"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+7"/>
- <source>Use this form to request payments. All fields are optional.</source>
+ <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+39"/>
+ <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1538,6 +1931,31 @@ Address: %4
<source>&amp;Request payment</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+47"/>
+ <source>Requested payments</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Show the selected request (does the same as double clicking an entry)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Show</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Remove the selected entries from the list</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Remove</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
@@ -1558,16 +1976,11 @@ Address: %4
</message>
<message>
<location line="+7"/>
- <source>&amp;Copy Image</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+7"/>
<source>&amp;Save Image...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../receiverequestdialog.cpp" line="+58"/>
+ <location filename="../receiverequestdialog.cpp" line="+56"/>
<source>Request payment to %1</source>
<translation type="unfinished"/>
</message>
@@ -1613,16 +2026,119 @@ Address: %4
</message>
</context>
<context>
+ <name>RecentRequestsTableModel</name>
+ <message>
+ <location filename="../recentrequeststablemodel.cpp" line="+24"/>
+ <source>Date</source>
+ <translation>taareek</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Label</source>
+ <translation>लेबल</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Amount</source>
+ <translation>राशि</translation>
+ </message>
+ <message>
+ <location line="+38"/>
+ <source>(no label)</source>
+ <translation>(कोई लेबल नही !)</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>(no message)</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+140"/>
- <location line="+213"/>
+ <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location line="+80"/>
<source>Send Coins</source>
<translation>सिकà¥à¤•à¥‡ भेजें|</translation>
</message>
<message>
- <location line="+50"/>
+ <location line="+76"/>
+ <source>Coin Control Features</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Inputs...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>automatically selected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Insufficient funds!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+89"/>
+ <source>Quantity:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+35"/>
+ <source>Bytes:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Amount:</source>
+ <translation>राशि :</translation>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Priority:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Low Output:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>After Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Change:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+44"/>
+ <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Custom change address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+115"/>
<source>Send to multiple recipients at once</source>
<translation>à¤à¤• साथ कई पà¥à¤°à¤¾à¤ªà¥à¤¤à¤•à¤°à¥à¤¤à¤¾à¤“ं को भेजें</translation>
</message>
@@ -1647,12 +2163,7 @@ Address: %4
<translation>बाकी रकम :</translation>
</message>
<message>
- <location line="+10"/>
- <source>123.456 BTC</source>
- <translation>123.456 BTC</translation>
- </message>
- <message>
- <location line="+31"/>
+ <location line="+41"/>
<source>Confirm the send action</source>
<translation>भेजने की पà¥à¤·à¥à¤Ÿà¤¿ करें</translation>
</message>
@@ -1662,69 +2173,135 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-154"/>
+ <location filename="../sendcoinsdialog.cpp" line="-228"/>
<source>Confirm send coins</source>
<translation>सिकà¥à¤•à¥‡ भेजने की पà¥à¤·à¥à¤Ÿà¤¿ करें</translation>
</message>
<message>
- <location line="-90"/>
+ <location line="-74"/>
<location line="+5"/>
<location line="+5"/>
+ <location line="+4"/>
<source>%1 to %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+26"/>
+ <location line="-136"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation>Bitcoin à¤à¤¡à¥à¤°à¥‡à¤¸ लिखें (उदाहरण: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Copy quantity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation>कॉपी राशि</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy after fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy bytes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy low output</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy change</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+170"/>
+ <source>Total Amount %1 (= %2)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>or</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+202"/>
<source>The recipient address is not valid, please recheck.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The amount to pay must be larger than 0.</source>
<translation>भेजा गया अमाउंट शà¥à¤¨à¥à¤¯ से अधिक होना चाहिà¤|</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The amount exceeds your balance.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The total exceeds your balance when the %1 transaction fee is included.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+3"/>
<source>Duplicate address found, can only send to each address once per send operation.</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="+3"/>
+ <source>Transaction creation failed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+4"/>
- <source>Error: Transaction creation failed!</source>
+ <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+15"/>
- <source>Are you sure you want to send?</source>
+ <location line="+112"/>
+ <source>Warning: Invalid Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+9"/>
- <source>added as transaction fee</source>
+ <location line="+21"/>
+ <source>(no label)</source>
+ <translation>(कोई लेबल नही !)</translation>
+ </message>
+ <message>
+ <location line="-11"/>
+ <source>Warning: Unknown change address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
- <source>Total Amount %1</source>
+ <location line="-366"/>
+ <source>Are you sure you want to send?</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+20"/>
- <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>
+ <location line="+9"/>
+ <source>added as transaction fee</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+144"/>
+ <location line="+170"/>
<source>Payment request expired</source>
<translation type="unfinished"/>
</message>
@@ -1737,39 +2314,44 @@ Address: %4
<context>
<name>SendCoinsEntry</name>
<message>
- <location filename="../forms/sendcoinsentry.ui" line="+33"/>
- <location line="+585"/>
+ <location filename="../forms/sendcoinsentry.ui" line="+131"/>
+ <location line="+521"/>
+ <location line="+536"/>
<source>A&amp;mount:</source>
<translation>अमाउंट:</translation>
</message>
<message>
- <location line="-572"/>
- <location line="+585"/>
+ <location line="-1152"/>
<source>Pay &amp;To:</source>
<translation>पà¥à¤°à¤¾à¤ªà¥à¤¤à¤•à¤°à¥à¤¤à¤¾:</translation>
</message>
<message>
- <location line="-551"/>
+ <location line="+18"/>
<source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../sendcoinsentry.cpp" line="+28"/>
+ <location filename="../sendcoinsentry.cpp" line="+30"/>
<source>Enter a label for this address to add it to your address book</source>
<translation>आपकी à¤à¤¡à¥à¤°à¥‡à¤¸ बà¥à¤• में इस à¤à¤¡à¥à¤°à¥‡à¤¸ के लिठà¤à¤• लेबल लिखें</translation>
</message>
<message>
- <location filename="../forms/sendcoinsentry.ui" line="-18"/>
+ <location filename="../forms/sendcoinsentry.ui" line="+57"/>
<source>&amp;Label:</source>
<translation>लेबल:</translation>
</message>
<message>
- <location line="+28"/>
+ <location line="-50"/>
<source>Choose previously used address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
+ <location line="-40"/>
+ <source>This is a normal payment.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+50"/>
<source>Alt+A</source>
<translation>Alt-A</translation>
</message>
@@ -1785,16 +2367,45 @@ Address: %4
</message>
<message>
<location line="+7"/>
- <source>Remove this recipient</source>
- <translation>पà¥à¤°à¤¾à¤ªà¥à¤¤à¤•à¤°à¥à¤¤à¤¾ हटायें</translation>
+ <location line="+524"/>
+ <location line="+536"/>
+ <source>Remove this entry</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="-1008"/>
+ <source>Message:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+958"/>
+ <source>This is a verified payment request.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-991"/>
<source>Enter a label for this address to add it to the list of used addresses</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+465"/>
+ <location line="+459"/>
+ <source>This is an unverified payment request.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+18"/>
+ <location line="+532"/>
+ <source>Pay To:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-498"/>
+ <location line="+536"/>
<source>Memo:</source>
<translation type="unfinished"/>
</message>
@@ -1805,6 +2416,19 @@ Address: %4
</message>
</context>
<context>
+ <name>ShutdownWindow</name>
+ <message>
+ <location filename="../utilitydialog.cpp" line="+48"/>
+ <source>Bitcoin Core is shutting down...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Do not shut down the computer until this window disappears.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>SignVerifyMessageDialog</name>
<message>
<location filename="../forms/signverifymessagedialog.ui" line="+14"/>
@@ -1812,7 +2436,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+10"/>
<source>&amp;Sign Message</source>
<translation type="unfinished"/>
</message>
@@ -1915,7 +2539,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+27"/>
+ <location filename="../signverifymessagedialog.cpp" line="+29"/>
<location line="+3"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>Bitcoin à¤à¤¡à¥à¤°à¥‡à¤¸ लिखें (उदाहरण: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
@@ -1931,7 +2555,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+85"/>
+ <location line="+84"/>
<location line="+81"/>
<source>The entered address is invalid.</source>
<translation type="unfinished"/>
@@ -2000,8 +2624,13 @@ Address: %4
<context>
<name>SplashScreen</name>
<message>
- <location filename="../splashscreen.cpp" line="+23"/>
- <source>The Bitcoin developers</source>
+ <location filename="../splashscreen.cpp" line="+28"/>
+ <source>Bitcoin Core</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
<message>
@@ -2013,7 +2642,7 @@ Address: %4
<context>
<name>TrafficGraphWidget</name>
<message>
- <location filename="../trafficgraphwidget.cpp" line="+75"/>
+ <location filename="../trafficgraphwidget.cpp" line="+79"/>
<source>KB/s</source>
<translation type="unfinished"/>
</message>
@@ -2021,7 +2650,7 @@ Address: %4
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="+22"/>
+ <location filename="../transactiondesc.cpp" line="+28"/>
<source>Open until %1</source>
<translation>खà¥à¤²à¤¾ है जबतक %1</translation>
</message>
@@ -2094,12 +2723,12 @@ Address: %4
<location line="+12"/>
<location line="+45"/>
<location line="+17"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Credit</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="-120"/>
+ <location line="-125"/>
<source>matures in %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -2112,12 +2741,12 @@ Address: %4
<location line="+44"/>
<location line="+8"/>
<location line="+15"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Debit</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-57"/>
+ <location line="-62"/>
<source>Transaction fee</source>
<translation type="unfinished"/>
</message>
@@ -2128,11 +2757,12 @@ Address: %4
</message>
<message>
<location line="+6"/>
+ <location line="+9"/>
<source>Message</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="-7"/>
<source>Comment</source>
<translation type="unfinished"/>
</message>
@@ -2142,7 +2772,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+18"/>
<source>Merchant</source>
<translation type="unfinished"/>
</message>
@@ -2182,7 +2812,7 @@ Address: %4
<translation>ग़लत</translation>
</message>
<message>
- <location line="-227"/>
+ <location line="-232"/>
<source>, has not been successfully broadcast yet</source>
<translation>, अभी तक सफलतापूरà¥à¤µà¤• पà¥à¤°à¤¸à¤¾à¤°à¤¿à¤¤ नहीं किया गया है</translation>
</message>
@@ -2213,7 +2843,7 @@ Address: %4
<context>
<name>TransactionTableModel</name>
<message>
- <location filename="../transactiontablemodel.cpp" line="+227"/>
+ <location filename="../transactiontablemodel.cpp" line="+234"/>
<source>Date</source>
<translation>taareek</translation>
</message>
@@ -2232,8 +2862,13 @@ Address: %4
<source>Amount</source>
<translation>राशि</translation>
</message>
+ <message>
+ <location line="+59"/>
+ <source>Immature (%1 confirmations, will be available after %2)</source>
+ <translation type="unfinished"/>
+ </message>
<message numerus="yes">
- <location line="+57"/>
+ <location line="+16"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -2253,17 +2888,13 @@ Address: %4
<translation>अपà¥à¤·à¥à¤Ÿ ( %1 मे %2 पकà¥à¤•à¥‡ )</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="-22"/>
+ <location line="+25"/>
<source>Confirmed (%1 confirmations)</source>
<translation>पकà¥à¤•à¥‡ ( %1 पकà¥à¤•à¤¾ करना)</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></translation>
- </message>
<message>
- <location line="+5"/>
+ <location line="-22"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation>यह बà¥à¤²à¥‰à¤• किसी भी और नोड को मिला नही है ! शायद यह बà¥à¤²à¥‰à¤• कोई भी नोड सà¥à¤µà¥€à¤•à¤¾à¤°à¥‡ गा नही !</translation>
</message>
@@ -2273,7 +2904,7 @@ Address: %4
<translation>जेनरेट किया गया किंतॠसà¥à¤µà¥€à¤•à¤¾à¤°à¤¾ नही गया !</translation>
</message>
<message>
- <location line="+43"/>
+ <location line="+62"/>
<source>Received with</source>
<translation>सà¥à¤µà¥€à¤•à¤¾à¤°à¤¾ गया</translation>
</message>
@@ -2331,7 +2962,7 @@ Address: %4
<context>
<name>TransactionView</name>
<message>
- <location filename="../transactionview.cpp" line="+52"/>
+ <location filename="../transactionview.cpp" line="+57"/>
<location line="+16"/>
<source>All</source>
<translation>सभी</translation>
@@ -2392,12 +3023,12 @@ Address: %4
<translation>अनà¥à¤¯</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+6"/>
<source>Enter address or label to search</source>
<translation>ढूà¤à¤¦à¤¨à¥‡ के लिठकृपा करके पता या लेबल टाइप करे !</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+6"/>
<source>Min amount</source>
<translation>लघà¥à¤¤à¥à¤¤à¤® राशि</translation>
</message>
@@ -2432,17 +3063,37 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+143"/>
- <source>Export Transaction Data</source>
- <translation>लेन-देन का डेटा निरà¥à¤¯à¤¾à¤¤ करे !</translation>
+ <location line="+142"/>
+ <source>Export Transaction History</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="+19"/>
+ <source>Exporting Failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>There was an error trying to save the transaction history to %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Exporting Successful</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The transaction history was successfully saved to %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-22"/>
<source>Comma separated file (*.csv)</source>
<translation>Comma separated file (*.csv)</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+9"/>
<source>Confirmed</source>
<translation>पकà¥à¤•à¤¾</translation>
</message>
@@ -2477,17 +3128,7 @@ Address: %4
<translation>ID</translation>
</message>
<message>
- <location line="+4"/>
- <source>Error exporting</source>
- <translation>ग़लतियाठà¤à¤•à¥à¤¸à¤ªà¥‹à¤°à¥à¤Ÿ (निरà¥à¤¯à¤¾à¤¤) करे!</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation>फाइल में लिख नही सके %1.</translation>
- </message>
- <message>
- <location line="+100"/>
+ <location line="+107"/>
<source>Range:</source>
<translation>विसà¥à¤¤à¤¾à¤°:</translation>
</message>
@@ -2498,9 +3139,17 @@ Address: %4
</message>
</context>
<context>
+ <name>WalletFrame</name>
+ <message>
+ <location filename="../walletframe.cpp" line="+26"/>
+ <source>No wallet has been loaded.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>WalletModel</name>
<message>
- <location filename="../walletmodel.cpp" line="+218"/>
+ <location filename="../walletmodel.cpp" line="+245"/>
<source>Send Coins</source>
<translation type="unfinished"/>
</message>
@@ -2508,7 +3157,7 @@ Address: %4
<context>
<name>WalletView</name>
<message>
- <location filename="../walletview.cpp" line="+46"/>
+ <location filename="../walletview.cpp" line="+43"/>
<source>&amp;Export</source>
<translation type="unfinished"/>
</message>
@@ -2518,65 +3167,60 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+183"/>
+ <location line="+181"/>
<source>Backup Wallet</source>
<translation>बैकप वॉलेट</translation>
</message>
<message>
- <location line="+0"/>
+ <location line="+1"/>
<source>Wallet Data (*.dat)</source>
<translation>वॉलेट डेटा (*.dat)</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="+6"/>
<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>
+ <source>There was an error trying to save the wallet data to %1.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+4"/>
- <source>Backup Successful</source>
- <translation>बैकप सफल</translation>
+ <source>The wallet data was successfully saved to %1.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+0"/>
- <source>The wallet data was successfully saved to the new location.</source>
- <translation type="unfinished"/>
+ <source>Backup Successful</source>
+ <translation>बैकप सफल</translation>
</message>
</context>
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+102"/>
- <source>Bitcoin version</source>
- <translation>बीटकोइन संसà¥à¤•à¤°à¤£</translation>
- </message>
- <message>
- <location line="+107"/>
+ <location filename="../bitcoinstrings.cpp" line="+221"/>
<source>Usage:</source>
<translation>खपत :</translation>
</message>
<message>
- <location line="-55"/>
+ <location line="-54"/>
<source>List commands</source>
<translation>commands की लिसà¥à¤Ÿ बनाà¤à¤‚</translation>
</message>
<message>
- <location line="-13"/>
+ <location line="-14"/>
<source>Get help for a command</source>
<translation>किसी command के लिठमदद लें</translation>
</message>
<message>
- <location line="+25"/>
+ <location line="+26"/>
<source>Options:</source>
<translation>विकलà¥à¤ª:</translation>
</message>
<message>
- <location line="+24"/>
+ <location line="+22"/>
<source>Specify configuration file (default: bitcoin.conf)</source>
<translation>configuraion की फाइल का विवरण दें (default: bitcoin.conf)</translation>
</message>
@@ -2588,7 +3232,7 @@ Address: %4
<message>
<location line="-1"/>
<source>Specify data directory</source>
- <translation type="unfinished"/>
+ <translation>डेटा डायरेकà¥à¤Ÿà¤°à¥€ बताà¤à¤‚ </translation>
</message>
<message>
<location line="-9"/>
@@ -2596,7 +3240,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-28"/>
+ <location line="-26"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
<translation type="unfinished"/>
</message>
@@ -2606,7 +3250,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-49"/>
+ <location line="-51"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation type="unfinished"/>
</message>
@@ -2616,39 +3260,39 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-142"/>
+ <location line="-148"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-33"/>
+ <location line="-36"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+40"/>
+ <location line="+45"/>
<source>Accept command line and JSON-RPC commands</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<source>Run in the background as a daemon and accept commands</source>
- <translation type="unfinished"/>
+ <translation>बैकगà¥à¤°à¤¾à¤‰à¤‚ड में डेमॉन बन कर रन करे तथा कमांडà¥à¤¸ सà¥à¤µà¥€à¤•à¤¾à¤° करें </translation>
</message>
<message>
- <location line="+40"/>
+ <location line="+39"/>
<source>Use the test network</source>
- <translation type="unfinished"/>
+ <translation>टेसà¥à¤Ÿ नेटवरà¥à¤• का इसà¥à¤¤à¥‡à¤®à¤¾à¤² करे </translation>
</message>
<message>
<location line="-118"/>
@@ -2656,7 +3300,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-87"/>
+ <location line="-95"/>
<source>%s, you must set a rpcpassword in the configuration file:
%s
It is recommended you use the following random password:
@@ -2697,6 +3341,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+4"/>
+ <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</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>
@@ -2711,17 +3360,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+11"/>
- <source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source>
+ <location line="+18"/>
+ <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="+6"/>
- <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
+ <location line="+5"/>
+ <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+3"/>
<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>
@@ -2751,17 +3400,27 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
+ <location line="+9"/>
+ <source>&lt;category&gt; can be:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
<source>Attempt to recover private keys from a corrupt wallet.dat</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
+ <source>Bitcoin Core Daemon</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Bitcoin RPC client version</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
<source>Block creation options:</source>
<translation type="unfinished"/>
</message>
@@ -2771,7 +3430,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
+ <source>Connect through SOCKS proxy</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect to JSON-RPC on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation type="unfinished"/>
</message>
@@ -2787,6 +3451,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+1"/>
+ <source>Do not load the wallet and disable wallet RPC calls</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Do you want to rebuild the block database now?</source>
<translation type="unfinished"/>
</message>
@@ -2881,7 +3550,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
+ <source>Fee per kB to add to transactions you send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Find peers using DNS lookup (default: 1 unless -connect)</source>
<translation type="unfinished"/>
</message>
@@ -2901,6 +3575,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
+ <location line="+1"/>
+ <source>If &lt;category&gt; is not supplied, output all debugging information.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+2"/>
<source>Incorrect or no genesis block found. Wrong datadir for network?</source>
<translation type="unfinished"/>
@@ -2916,17 +3595,37 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+8"/>
+ <location line="+5"/>
+ <source>Prepend debug output with timestamp (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>RPC client options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Rebuild block chain index from current blk000??.dat files</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+5"/>
+ <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Send command to Bitcoin server</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
+ <location line="+7"/>
+ <source>Set maximum block size in bytes (default: %d)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Set the number of threads to service RPC calls (default: 4)</source>
<translation type="unfinished"/>
</message>
@@ -2941,12 +3640,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+12"/>
+ <location line="+3"/>
+ <source>This is intended for regression testing tools and app development.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Usage (deprecated, use bitcoin-cli):</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+8"/>
+ <location line="+7"/>
<source>Verifying blocks...</source>
<translation>बà¥à¤²à¥‰à¤•à¥à¤¸ जाà¤à¤šà¥‡ जा रहा है...</translation>
</message>
@@ -2957,31 +3661,56 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+1"/>
+ <source>Wait for RPC server to start</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Wallet %s resides outside data directory %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+2"/>
+ <source>Wallet options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>You need to rebuild the database using -reindex to change -txindex</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-78"/>
+ <location line="-79"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-98"/>
+ <location line="-105"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+17"/>
+ <location line="+14"/>
+ <source>Output debugging information (default: 0, supplying &lt;category&gt; is optional)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+83"/>
+ <location line="+89"/>
<source>Information</source>
<translation>जानकारी</translation>
</message>
@@ -3021,47 +3750,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<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"/>
+ <location line="+9"/>
<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"/>
+ <location line="+4"/>
<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"/>
+ <location line="+6"/>
<source>Set minimum block size in bytes (default: 0)</source>
<translation type="unfinished"/>
</message>
@@ -3086,7 +3785,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Transaction amount too small</source>
<translation type="unfinished"/>
</message>
@@ -3111,32 +3810,32 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<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="+5"/>
+ <location line="+7"/>
<source>Warning</source>
<translation>चेतावनी</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Warning: This version is obsolete, upgrade required!</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+2"/>
+ <source>version</source>
+ <translation>संसà¥à¤•à¤°à¤£</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>wallet.dat corrupt, salvage failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-54"/>
+ <location line="-58"/>
<source>Password for JSON-RPC connections</source>
<translation type="unfinished"/>
</message>
@@ -3146,27 +3845,27 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-126"/>
+ <location line="-132"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+155"/>
+ <location line="+161"/>
<source>Upgrade wallet to latest format</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-12"/>
+ <location line="-11"/>
<source>Rescan the block chain for missing wallet transactions</source>
<translation type="unfinished"/>
</message>
@@ -3176,7 +3875,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-29"/>
+ <location line="-30"/>
<source>Server certificate file (default: server.cert)</source>
<translation type="unfinished"/>
</message>
@@ -3191,27 +3890,22 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Unable to bind to %s on this computer (bind returned error %d, %s)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-95"/>
- <source>Connect through socks proxy</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="-11"/>
+ <location line="-107"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+58"/>
+ <location line="+60"/>
<source>Loading addresses...</source>
<translation>पता पà¥à¤¸à¥à¤¤à¤• आ रही है...</translation>
</message>
<message>
- <location line="-36"/>
+ <location line="-37"/>
<source>Error loading wallet.dat: Wallet corrupted</source>
<translation type="unfinished"/>
</message>
@@ -3231,12 +3925,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+30"/>
+ <location line="+31"/>
<source>Invalid -proxy address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+57"/>
+ <location line="+56"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3246,7 +3940,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3256,7 +3950,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+46"/>
+ <location line="+48"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3276,27 +3970,22 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>बà¥à¤²à¥‰à¤• इंडेकà¥à¤¸ आ रहा है...</translation>
</message>
<message>
- <location line="-60"/>
+ <location line="-62"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-28"/>
+ <location line="-32"/>
<source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+69"/>
- <source>Fee per KB to add to transactions you send</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+20"/>
+ <location line="+95"/>
<source>Loading wallet...</source>
<translation>वॉलेट आ रहा है...</translation>
</message>
<message>
- <location line="-54"/>
+ <location line="-56"/>
<source>Cannot downgrade wallet</source>
<translation type="unfinished"/>
</message>
@@ -3306,7 +3995,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+66"/>
+ <location line="+67"/>
<source>Rescanning...</source>
<translation>रि-सà¥à¤•à¥‡à¤¨à¥€-इंग...</translation>
</message>
@@ -3326,7 +4015,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>भूल</translation>
</message>
<message>
- <location line="-33"/>
+ <location line="-35"/>
<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 e216da932f..e3143e9964 100644
--- a/src/qt/locale/bitcoin_hr.ts
+++ b/src/qt/locale/bitcoin_hr.ts
@@ -22,13 +22,13 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location filename="../aboutdialog.cpp" line="+19"/>
+ <location filename="../utilitydialog.cpp" line="+29"/>
<source>Copyright</source>
<translation>Autorsko pravo</translation>
</message>
<message>
<location line="+0"/>
- <source>The Bitcoin developers</source>
+ <source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
</context>
@@ -146,13 +146,13 @@ This product includes software developed by the OpenSSL Project for use in the O
</message>
<message>
<location line="+13"/>
- <source>Error exporting</source>
- <translation>Pogreška kod izvoza</translation>
+ <source>Exporting Failed</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation>Ne mogu pisati u datoteku %1.</translation>
+ <location line="+1"/>
+ <source>There was an error trying to save the address list to %1.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -317,22 +317,27 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+260"/>
+ <location filename="../bitcoingui.cpp" line="+295"/>
<source>Sign &amp;message...</source>
<translation>&amp;Potpišite poruku...</translation>
</message>
<message>
- <location line="+290"/>
+ <location line="+335"/>
<source>Synchronizing with network...</source>
<translation>Usklađivanje s mrežom ...</translation>
</message>
<message>
- <location line="-360"/>
+ <location line="-407"/>
<source>&amp;Overview</source>
<translation>&amp;Pregled</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="-137"/>
+ <source>Node</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+138"/>
<source>Show general overview of wallet</source>
<translation>Prikaži opći pregled novÄanika</translation>
</message>
@@ -347,7 +352,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Pretraži povijest transakcija</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>E&amp;xit</source>
<translation>&amp;Izlaz</translation>
</message>
@@ -393,7 +398,22 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>&amp;Promijena lozinke...</translation>
</message>
<message>
- <location line="+295"/>
+ <location line="+10"/>
+ <source>&amp;Sending addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Receiving addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open &amp;URI...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+325"/>
<source>Importing blocks from disk...</source>
<translation>Importiranje blokova sa diska...</translation>
</message>
@@ -403,12 +423,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Re-indeksiranje blokova na disku...</translation>
</message>
<message>
- <location line="-358"/>
+ <location line="-405"/>
<source>Send coins to a Bitcoin address</source>
<translation>Slanje novca na bitcoin adresu</translation>
</message>
<message>
- <location line="+47"/>
+ <location line="+49"/>
<source>Modify configuration options for Bitcoin</source>
<translation>Promijeni postavke konfiguracije za bitcoin</translation>
</message>
@@ -438,18 +458,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>&amp;Potvrdite poruku...</translation>
</message>
<message>
- <location line="+375"/>
+ <location line="+430"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-563"/>
- <location line="+10"/>
+ <location line="-643"/>
<source>Wallet</source>
<translation>NovÄanik</translation>
</message>
<message>
- <location line="+113"/>
+ <location line="+146"/>
<source>&amp;Send</source>
<translation>&amp;Pošalji</translation>
</message>
@@ -459,7 +478,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+44"/>
+ <location line="+46"/>
<location line="+2"/>
<source>&amp;Show / Hide</source>
<translation type="unfinished"/>
@@ -485,86 +504,80 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+39"/>
+ <location line="+48"/>
<source>&amp;File</source>
<translation>&amp;Datoteka</translation>
</message>
<message>
- <location line="+11"/>
+ <location line="+14"/>
<source>&amp;Settings</source>
<translation>&amp;Konfiguracija</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>&amp;Help</source>
<translation>&amp;Pomoć</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+15"/>
<source>Tabs toolbar</source>
<translation>Traka kartica</translation>
</message>
<message>
- <location line="-244"/>
- <location line="+321"/>
+ <location line="-284"/>
+ <location line="+376"/>
<source>[testnet]</source>
<translation>[testnet]</translation>
</message>
<message>
- <location line="-331"/>
- <location line="+10"/>
+ <location line="-401"/>
<source>Bitcoin Core</source>
<translation>Bitcoin Jezgra</translation>
</message>
<message>
- <location line="+121"/>
+ <location line="+163"/>
<source>Request payments (generates QR codes and bitcoin: URIs)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+27"/>
+ <location line="+29"/>
<location line="+2"/>
<source>&amp;About Bitcoin Core</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+34"/>
- <source>&amp;Used sending addresses...</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+35"/>
<source>Show the list of used sending addresses and labels</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Used &amp;receiving addresses...</source>
+ <location line="+2"/>
+ <source>Show the list of used receiving addresses and labels</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Show the list of used receiving addresses and labels</source>
+ <location line="+3"/>
+ <source>Open a bitcoin: URI or payment request</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+2"/>
- <source>Open URI...</source>
+ <source>&amp;Command-line options</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
- <source>Open a bitcoin: URI or payment request</source>
+ <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+126"/>
+ <location line="+159"/>
<location line="+5"/>
<source>Bitcoin client</source>
<translation>Bitcoin klijent</translation>
</message>
<message numerus="yes">
- <location line="+133"/>
+ <location line="+142"/>
<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>
@@ -584,7 +597,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Obrađeno %1 blokova povijesti transakcije.</translation>
</message>
<message numerus="yes">
- <location line="+20"/>
+ <location line="+23"/>
<source>%n hour(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -604,7 +617,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
+ <location line="+21"/>
<source>Last received block was generated %1 ago.</source>
<translation type="unfinished"/>
</message>
@@ -629,27 +642,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Informacija</translation>
</message>
<message>
- <location line="+77"/>
- <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="-152"/>
+ <location line="-85"/>
<source>Up to date</source>
<translation>Ažurno</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Catching up...</source>
<translation>Ažuriranje...</translation>
</message>
<message>
- <location line="+124"/>
- <source>Confirm transaction fee</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+130"/>
<source>Sent transaction</source>
<translation>Poslana transakcija</translation>
</message>
@@ -672,7 +675,7 @@ Adresa:%4
</translation>
</message>
<message>
- <location line="+67"/>
+ <location line="+69"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation>NovÄanik je &lt;b&gt;Å¡ifriran&lt;/b&gt; i trenutno &lt;b&gt;otkljuÄan&lt;/b&gt;</translation>
</message>
@@ -682,7 +685,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 filename="../bitcoin.cpp" line="+116"/>
+ <location filename="../bitcoin.cpp" line="+438"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation type="unfinished"/>
</message>
@@ -904,7 +907,12 @@ Adresa:%4
<translation type="unfinished"/>
</message>
<message>
- <location line="+171"/>
+ <location line="+31"/>
+ <source>none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+140"/>
<source>Dust</source>
<translation type="unfinished"/>
</message>
@@ -941,7 +949,7 @@ Adresa:%4
</message>
<message>
<location line="+1"/>
- <source>This label turns red, if the priority is smaller than &quot;medium&quot;</source>
+ <source>This label turns red, if the priority is smaller than &quot;medium&quot;.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1010,7 +1018,7 @@ Adresa:%4
<translation>&amp;Adresa</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+25"/>
+ <location filename="../editaddressdialog.cpp" line="+28"/>
<source>New receiving address</source>
<translation>Nova adresa za primanje</translation>
</message>
@@ -1079,20 +1087,24 @@ Adresa:%4
</message>
</context>
<context>
- <name>GUIUtil::HelpMessageBox</name>
+ <name>HelpMessageDialog</name>
<message>
- <location filename="../guiutil.cpp" line="+597"/>
- <source>version</source>
- <translation>verzija</translation>
+ <location filename="../forms/helpmessagedialog.ui" line="+19"/>
+ <source>Bitcoin Core - Command-line options</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <location line="+13"/>
+ <location filename="../utilitydialog.cpp" line="+38"/>
<source>Bitcoin Core</source>
<translation>Bitcoin Jezgra</translation>
</message>
<message>
- <location line="-11"/>
+ <location line="+0"/>
+ <source>version</source>
+ <translation>verzija</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Usage:</source>
<translation>Upotreba:</translation>
</message>
@@ -1221,7 +1233,7 @@ Adresa:%4
<translation>Postavke</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+13"/>
<source>&amp;Main</source>
<translation>&amp;Glavno</translation>
</message>
@@ -1246,7 +1258,52 @@ Adresa:%4
<translation>&amp;Pokreni Bitcoin kod pokretanja sustava</translation>
</message>
<message>
- <location line="+35"/>
+ <location line="+9"/>
+ <source>Size of &amp;database cache</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set database cache size in megabytes (default: 25)</source>
+ <translation>Postavi cache za bazu podataka u MB (zadano:25)</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>MB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Number of script &amp;verification threads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Connect to the Bitcoin network through a SOCKS proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Connect through SOCKS proxy (default proxy):</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+224"/>
+ <source>Active command-line options that override above options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
<source>Reset all client options to default.</source>
<translation type="unfinished"/>
</message>
@@ -1256,7 +1313,7 @@ Adresa:%4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="-323"/>
<source>&amp;Network</source>
<translation>&amp;Mreža</translation>
</message>
@@ -1271,32 +1328,17 @@ Adresa:%4
<translation>Mapiraj port koristeći &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>Spojite se na Bitcon mrežu putem SOCKS proxy-a (npr. kod povezivanja kroz Tor)</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>&amp;Connect through SOCKS proxy:</source>
- <translation>&amp;Povezivanje putem SOCKS proxy-a:</translation>
- </message>
- <message>
- <location line="+9"/>
+ <location line="+19"/>
<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>IP adresa proxy-a (npr. 127.0.0.1)</translation>
- </message>
- <message>
- <location line="+7"/>
+ <location line="+32"/>
<source>&amp;Port:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+19"/>
+ <location line="+25"/>
<source>Port of the proxy (e.g. 9050)</source>
<translation>Port od proxy-a (npr. 9050)</translation>
</message>
@@ -1381,7 +1423,7 @@ Adresa:%4
<translation type="unfinished"/>
</message>
<message>
- <location line="+71"/>
+ <location line="+136"/>
<source>&amp;OK</source>
<translation>&amp;U redu</translation>
</message>
@@ -1391,44 +1433,38 @@ Adresa:%4
<translation>&amp;Odustani</translation>
</message>
<message>
- <location line="+10"/>
- <source>&amp;Apply</source>
- <translation>&amp;Primjeni</translation>
- </message>
- <message>
- <location filename="../optionsdialog.cpp" line="+63"/>
+ <location filename="../optionsdialog.cpp" line="+67"/>
<source>default</source>
<translation>standardne vrijednosti</translation>
</message>
<message>
- <location line="+131"/>
- <source>Confirm options reset</source>
+ <location line="+57"/>
+ <source>none</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Some settings may require a client restart to take effect.</source>
+ <location line="+75"/>
+ <source>Confirm options reset</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>Do you want to proceed?</source>
- <translation>Želite li nastaviti?</translation>
+ <location line="+1"/>
+ <location line="+29"/>
+ <source>Client restart required to activate changes.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
- <location line="+9"/>
- <source>Warning</source>
- <translation>Upozorenje</translation>
+ <location line="-29"/>
+ <source>Client will be shutdown, do you want to proceed?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="-9"/>
- <location line="+9"/>
- <source>This setting will take effect after restarting Bitcoin.</source>
+ <location line="+33"/>
+ <source>This change would require a client restart.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+29"/>
+ <location line="+34"/>
<source>The supplied proxy address is invalid.</source>
<translation type="unfinished"/>
</message>
@@ -1442,22 +1478,22 @@ Adresa:%4
</message>
<message>
<location line="+50"/>
- <location line="+214"/>
+ <location line="+231"/>
<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="-140"/>
+ <location line="-155"/>
<source>Unconfirmed:</source>
<translation>Nepotvrđene:</translation>
</message>
<message>
- <location line="-81"/>
+ <location line="-83"/>
<source>Wallet</source>
<translation>NovÄanik</translation>
</message>
<message>
- <location line="+49"/>
+ <location line="+51"/>
<source>Confirmed:</source>
<translation>Potvrđeno:</translation>
</message>
@@ -1492,7 +1528,7 @@ Adresa:%4
<translation type="unfinished"/>
</message>
<message>
- <location line="+56"/>
+ <location line="+71"/>
<source>&lt;b&gt;Recent transactions&lt;/b&gt;</source>
<translation>&lt;b&gt;Nedavne transakcije&lt;/b&gt;</translation>
</message>
@@ -1506,7 +1542,8 @@ Adresa:%4
<context>
<name>PaymentServer</name>
<message>
- <location filename="../paymentserver.cpp" line="+397"/>
+ <location filename="../paymentserver.cpp" line="+403"/>
+ <location line="+13"/>
<source>URI handling</source>
<translation>URI upravljanje</translation>
</message>
@@ -1516,24 +1553,52 @@ Adresa:%4
<translation type="unfinished"/>
</message>
<message>
- <location line="+91"/>
+ <location line="+96"/>
<source>Requested payment amount of %1 is too small (considered dust).</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-204"/>
- <location line="+195"/>
+ <location line="-221"/>
+ <location line="+212"/>
<location line="+13"/>
+ <location line="+95"/>
+ <location line="+18"/>
+ <location line="+16"/>
<source>Payment request error</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-207"/>
+ <location line="-353"/>
<source>Cannot start bitcoin: click-to-pay handler</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+195"/>
+ <location line="+58"/>
+ <source>Net manager warning</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Your active proxy doesn&apos;t support SOCKS5, which is required for payment requests via proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>Payment request fetch URL is invalid: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Payment request file handling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Payment request file can not be read or processed! This can be caused by an invalid payment request file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+73"/>
<source>Unverified payment requests to custom payment scripts are unsupported.</source>
<translation type="unfinished"/>
</message>
@@ -1543,24 +1608,27 @@ Adresa:%4
<translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
+ <location line="+43"/>
<source>Error communicating with %1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+28"/>
+ <location line="+24"/>
+ <source>Payment request can not be parsed or processed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
<source>Bad response from server %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+32"/>
+ <location line="+33"/>
<source>Payment acknowledged</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-55"/>
- <location line="+27"/>
- <location line="+17"/>
+ <location line="-11"/>
<source>Network request error</source>
<translation type="unfinished"/>
</message>
@@ -1568,18 +1636,18 @@ Adresa:%4
<context>
<name>QObject</name>
<message>
- <location filename="../bitcoin.cpp" line="+119"/>
- <location line="+5"/>
+ <location filename="../bitcoin.cpp" line="+71"/>
+ <location line="+11"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-4"/>
+ <location line="+1"/>
<source>Error: Specified data directory &quot;%1&quot; does not exist.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="-12"/>
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation type="unfinished"/>
</message>
@@ -1621,15 +1689,16 @@ Adresa:%4
<location line="+23"/>
<location line="+23"/>
<location line="+36"/>
- <location line="+53"/>
+ <location line="+23"/>
+ <location line="+36"/>
<location line="+23"/>
<location line="+23"/>
- <location filename="../rpcconsole.cpp" line="+360"/>
+ <location filename="../rpcconsole.cpp" line="+359"/>
<source>N/A</source>
<translation>N/A</translation>
</message>
<message>
- <location line="-217"/>
+ <location line="-223"/>
<source>Client version</source>
<translation>Verzija klijenta</translation>
</message>
@@ -1644,7 +1713,12 @@ Adresa:%4
<translation type="unfinished"/>
</message>
<message>
- <location line="+78"/>
+ <location line="+25"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+53"/>
<source>Using OpenSSL version</source>
<translation>Koristim OpenSSL verziju</translation>
</message>
@@ -1660,16 +1734,16 @@ Adresa:%4
</message>
<message>
<location line="+7"/>
- <source>Number of connections</source>
- <translation>Broj konekcija</translation>
+ <source>Name</source>
+ <translation>Ime</translation>
</message>
<message>
<location line="+23"/>
- <source>On testnet</source>
- <translation type="unfinished"/>
+ <source>Number of connections</source>
+ <translation>Broj konekcija</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+29"/>
<source>Block chain</source>
<translation>Lanac blokova</translation>
</message>
@@ -1694,16 +1768,6 @@ Adresa:%4
<translation>&amp;Otvori</translation>
</message>
<message>
- <location line="+16"/>
- <source>Command-line options</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+10"/>
- <source>&amp;Show</source>
- <translation>&amp;Pokaži</translation>
- </message>
- <message>
<location line="+24"/>
<source>&amp;Console</source>
<translation>&amp;Konzola</translation>
@@ -1734,17 +1798,12 @@ Adresa:%4
<translation type="unfinished"/>
</message>
<message>
- <location line="-541"/>
+ <location line="-521"/>
<source>Build date</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-79"/>
- <source>Bitcoin Core</source>
- <translation>Bitcoin Jezgra</translation>
- </message>
- <message>
- <location line="+279"/>
+ <location line="+206"/>
<source>Debug log file</source>
<translation type="unfinished"/>
</message>
@@ -1754,11 +1813,6 @@ Adresa:%4
<translation type="unfinished"/>
</message>
<message>
- <location line="+26"/>
- <source>Show the Bitcoin-Core help message to get a list with possible Bitcoin command-line options.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location line="+76"/>
<source>Clear console</source>
<translation>OÄisti konzolu</translation>
@@ -1779,7 +1833,7 @@ Adresa:%4
<translation type="unfinished"/>
</message>
<message>
- <location line="+128"/>
+ <location line="+122"/>
<source>%1 B</source>
<translation type="unfinished"/>
</message>
@@ -1822,12 +1876,7 @@ Adresa:%4
<translation type="unfinished"/>
</message>
<message>
- <location line="+19"/>
- <source>The amount to request</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="-32"/>
+ <location line="-13"/>
<source>&amp;Label:</source>
<translation>&amp;Oznaka:</translation>
</message>
@@ -1837,12 +1886,7 @@ Adresa:%4
<translation type="unfinished"/>
</message>
<message>
- <location line="+20"/>
- <source>The message to attach to payment request</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="-37"/>
+ <location line="-17"/>
<source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
@@ -1853,16 +1897,26 @@ Adresa:%4
</message>
<message>
<location line="+27"/>
- <source>The label to associate with the new receiving address</source>
+ <source>An optional label to associate with the new receiving address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
- <source>Use this form to request payments. All fields are optional.</source>
+ <location line="+7"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+56"/>
+ <location line="+7"/>
+ <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+39"/>
+ <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+17"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"/>
</message>
@@ -1878,11 +1932,11 @@ Adresa:%4
</message>
<message>
<location line="+47"/>
- <source>Previously requested payments</source>
+ <source>Requested payments</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+12"/>
+ <location line="+16"/>
<source>Show the selected request (does the same as double clicking an entry)</source>
<translation type="unfinished"/>
</message>
@@ -1973,7 +2027,7 @@ Adresa:%4
<context>
<name>RecentRequestsTableModel</name>
<message>
- <location filename="../recentrequeststablemodel.cpp" line="+14"/>
+ <location filename="../recentrequeststablemodel.cpp" line="+24"/>
<source>Date</source>
<translation>Datum</translation>
</message>
@@ -1993,7 +2047,7 @@ Adresa:%4
<translation>Iznos</translation>
</message>
<message>
- <location line="+36"/>
+ <location line="+38"/>
<source>(no label)</source>
<translation>(bez oznake)</translation>
</message>
@@ -2008,7 +2062,7 @@ Adresa:%4
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
<location filename="../sendcoinsdialog.cpp" line="+381"/>
- <location line="+81"/>
+ <location line="+80"/>
<source>Send Coins</source>
<translation>Slanje novca</translation>
</message>
@@ -2118,7 +2172,7 @@ Adresa:%4
<translation>&amp;Pošalji</translation>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-229"/>
+ <location filename="../sendcoinsdialog.cpp" line="-228"/>
<source>Confirm send coins</source>
<translation>Potvrdi slanje novca</translation>
</message>
@@ -2221,22 +2275,22 @@ Adresa:%4
<translation type="unfinished"/>
</message>
<message>
- <location line="+113"/>
+ <location line="+112"/>
<source>Warning: Invalid Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+21"/>
<source>(no label)</source>
<translation>(bez oznake)</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="-11"/>
<source>Warning: Unknown change address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-378"/>
+ <location line="-366"/>
<source>Are you sure you want to send?</source>
<translation type="unfinished"/>
</message>
@@ -2260,13 +2314,13 @@ Adresa:%4
<name>SendCoinsEntry</name>
<message>
<location filename="../forms/sendcoinsentry.ui" line="+131"/>
- <location line="+501"/>
+ <location line="+521"/>
<location line="+536"/>
<source>A&amp;mount:</source>
<translation>&amp;Iznos:</translation>
</message>
<message>
- <location line="-1132"/>
+ <location line="-1152"/>
<source>Pay &amp;To:</source>
<translation>&amp;Primatelj plaćanja:</translation>
</message>
@@ -2312,23 +2366,33 @@ Adresa:%4
</message>
<message>
<location line="+7"/>
- <location line="+504"/>
+ <location line="+524"/>
<location line="+536"/>
<source>Remove this entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-40"/>
+ <location line="-1008"/>
+ <source>Message:</source>
+ <translation>Poruka:</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+958"/>
<source>This is a verified payment request.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-971"/>
+ <location line="-991"/>
<source>Enter a label for this address to add it to the list of used addresses</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+439"/>
+ <location line="+459"/>
<source>This is an unverified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2351,6 +2415,19 @@ Adresa:%4
</message>
</context>
<context>
+ <name>ShutdownWindow</name>
+ <message>
+ <location filename="../utilitydialog.cpp" line="+48"/>
+ <source>Bitcoin Core is shutting down...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Do not shut down the computer until this window disappears.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>SignVerifyMessageDialog</name>
<message>
<location filename="../forms/signverifymessagedialog.ui" line="+14"/>
@@ -2358,7 +2435,7 @@ Adresa:%4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+10"/>
<source>&amp;Sign Message</source>
<translation>&amp;Potpišite poruku</translation>
</message>
@@ -2546,7 +2623,7 @@ Adresa:%4
<context>
<name>SplashScreen</name>
<message>
- <location filename="../splashscreen.cpp" line="+26"/>
+ <location filename="../splashscreen.cpp" line="+28"/>
<source>Bitcoin Core</source>
<translation>Bitcoin Jezgra</translation>
</message>
@@ -2645,12 +2722,12 @@ Adresa:%4
<location line="+12"/>
<location line="+45"/>
<location line="+17"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Credit</source>
<translation>Uplaćeno</translation>
</message>
<message numerus="yes">
- <location line="-120"/>
+ <location line="-125"/>
<source>matures in %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -2663,12 +2740,12 @@ Adresa:%4
<location line="+44"/>
<location line="+8"/>
<location line="+15"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Debit</source>
<translation>Zaduženje</translation>
</message>
<message>
- <location line="-57"/>
+ <location line="-62"/>
<source>Transaction fee</source>
<translation>Naknada za transakciju</translation>
</message>
@@ -2679,11 +2756,12 @@ Adresa:%4
</message>
<message>
<location line="+6"/>
+ <location line="+9"/>
<source>Message</source>
<translation>Poruka</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="-7"/>
<source>Comment</source>
<translation>Komentar</translation>
</message>
@@ -2693,7 +2771,7 @@ Adresa:%4
<translation>ID transakcije</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+18"/>
<source>Merchant</source>
<translation type="unfinished"/>
</message>
@@ -2733,7 +2811,7 @@ Adresa:%4
<translation type="unfinished"/>
</message>
<message>
- <location line="-227"/>
+ <location line="-232"/>
<source>, has not been successfully broadcast yet</source>
<translation>, još nije bio uspješno emitiran</translation>
</message>
@@ -2783,8 +2861,13 @@ Adresa:%4
<source>Amount</source>
<translation>Iznos</translation>
</message>
+ <message>
+ <location line="+59"/>
+ <source>Immature (%1 confirmations, will be available after %2)</source>
+ <translation type="unfinished"/>
+ </message>
<message numerus="yes">
- <location line="+57"/>
+ <location line="+16"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -2804,17 +2887,13 @@ Adresa:%4
<translation>Nepotvrđen (%1 od %2 potvrda)</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="-22"/>
+ <location line="+25"/>
<source>Confirmed (%1 confirmations)</source>
<translation>Potvrđen (%1 potvrda)</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"/>
+ <location line="-22"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation>Generirano - Upozorenje: ovaj blok nije bio primljen od strane bilo kojeg drugog noda i vjerojatno neće biti prihvaćen!</translation>
</message>
@@ -2824,7 +2903,7 @@ Adresa:%4
<translation>Generirano, ali nije prihvaćeno</translation>
</message>
<message>
- <location line="+43"/>
+ <location line="+62"/>
<source>Received with</source>
<translation>Primljeno s</translation>
</message>
@@ -3120,7 +3199,7 @@ Adresa:%4
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+217"/>
+ <location filename="../bitcoinstrings.cpp" line="+221"/>
<source>Usage:</source>
<translation>Upotreba:</translation>
</message>
@@ -3140,7 +3219,7 @@ Adresa:%4
<translation>Postavke:</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+22"/>
<source>Specify configuration file (default: bitcoin.conf)</source>
<translation>Odredi konfiguracijsku datoteku (ugrađeni izbor: bitcoin.conf)</translation>
</message>
@@ -3160,7 +3239,7 @@ Adresa:%4
<translation>Postavi cache za bazu podataka u MB (zadano:25)</translation>
</message>
<message>
- <location line="-27"/>
+ <location line="-26"/>
<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>
@@ -3170,7 +3249,7 @@ Adresa:%4
<translation>Održavaj najviÅ¡e &lt;n&gt; veza sa Älanovima (default: 125)</translation>
</message>
<message>
- <location line="-50"/>
+ <location line="-51"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation type="unfinished"/>
</message>
@@ -3180,22 +3259,22 @@ Adresa:%4
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<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="-147"/>
+ <location line="-148"/>
<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="-33"/>
+ <location line="-36"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<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>
@@ -3205,7 +3284,7 @@ Adresa:%4
<translation>Prihvati komande iz tekst moda i JSON-RPC</translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<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>
@@ -3215,12 +3294,12 @@ Adresa:%4
<translation>Koristi test mrežu</translation>
</message>
<message>
- <location line="-117"/>
+ <location line="-118"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-92"/>
+ <location line="-95"/>
<source>%s, you must set a rpcpassword in the configuration file:
%s
It is recommended you use the following random password:
@@ -3261,6 +3340,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+4"/>
+ <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</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>
@@ -3366,6 +3450,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+1"/>
+ <source>Do not load the wallet and disable wallet RPC calls</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Do you want to rebuild the block database now?</source>
<translation type="unfinished"/>
</message>
@@ -3530,7 +3619,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+8"/>
+ <location line="+7"/>
<source>Set maximum block size in bytes (default: %d)</source>
<translation type="unfinished"/>
</message>
@@ -3550,7 +3639,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+12"/>
+ <location line="+3"/>
+ <source>This is intended for regression testing tools and app development.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Usage (deprecated, use bitcoin-cli):</source>
<translation type="unfinished"/>
</message>
@@ -3575,7 +3669,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
+ <location line="+2"/>
+ <source>Wallet options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source>
<translation type="unfinished"/>
</message>
@@ -3585,12 +3684,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-78"/>
+ <location line="-79"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation>Importiraj blokove sa vanjskog blk000??.dat fajla</translation>
</message>
<message>
- <location line="-104"/>
+ <location line="-105"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
@@ -3610,7 +3709,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+88"/>
+ <location line="+89"/>
<source>Information</source>
<translation>Informacija</translation>
</message>
@@ -3660,11 +3759,6 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Å alji trace/debug informacije na konzolu umjesto u debug.log datoteku</translation>
</message>
<message>
- <location line="+1"/>
- <source>Send trace/debug info to debugger</source>
- <translation>Pošalji trace/debug informacije u debugger</translation>
- </message>
- <message>
<location line="+6"/>
<source>Set minimum block size in bytes (default: 0)</source>
<translation>Podesite minimalnu veliÄinu bloka u bajtovima (default: 0)</translation>
@@ -3690,7 +3784,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Pogreška sistema:</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Transaction amount too small</source>
<translation type="unfinished"/>
</message>
@@ -3720,7 +3814,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>KorisniÄko ime za JSON-RPC veze</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Warning</source>
<translation>Upozorenje</translation>
</message>
@@ -3740,37 +3834,37 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-57"/>
+ <location line="-58"/>
<source>Password for JSON-RPC connections</source>
<translation>Lozinka za JSON-RPC veze</translation>
</message>
<message>
- <location line="-69"/>
+ <location line="-70"/>
<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="+79"/>
+ <location line="+80"/>
<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="-131"/>
+ <location line="-132"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation>Izvršite naredbu kada se najbolji blok promjeni (%s u cmd je zamjenjen sa block hash)</translation>
</message>
<message>
- <location line="+160"/>
+ <location line="+161"/>
<source>Upgrade wallet to latest format</source>
<translation>Nadogradite novÄanik u posljednji format.</translation>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<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>
<message>
- <location line="-12"/>
+ <location line="-11"/>
<source>Rescan the block chain for missing wallet transactions</source>
<translation>Ponovno pretraži lanac blokova za transakcije koje nedostaju</translation>
</message>
@@ -3780,7 +3874,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Koristi OpenSSL (https) za JSON-RPC povezivanje</translation>
</message>
<message>
- <location line="-29"/>
+ <location line="-30"/>
<source>Server certificate file (default: server.cert)</source>
<translation>Uslužnikov SSL certifikat (ugrađeni izbor: server.cert)</translation>
</message>
@@ -3795,17 +3889,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Ova poruka za pomoć</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Unable to bind to %s on this computer (bind returned error %d, %s)</source>
<translation>Program ne može koristiti %s na ovom raÄunalu (bind returned error %d, %s)</translation>
</message>
<message>
- <location line="-106"/>
+ <location line="-107"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation>Dozvoli DNS upite za dodavanje nodova i povezivanje</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+60"/>
<source>Loading addresses...</source>
<translation>UÄitavanje adresa...</translation>
</message>
@@ -3845,7 +3939,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3855,7 +3949,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+47"/>
+ <location line="+48"/>
<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>
@@ -3875,7 +3969,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>UÄitavanje indeksa blokova...</translation>
</message>
<message>
- <location line="-61"/>
+ <location line="-62"/>
<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>
@@ -3885,12 +3979,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Program ne može koristiti %s na ovom raÄunalu. Bitcoin program je vjerojatno već pokrenut.</translation>
</message>
<message>
- <location line="+94"/>
+ <location line="+95"/>
<source>Loading wallet...</source>
<translation>UÄitavanje novÄanika...</translation>
</message>
<message>
- <location line="-55"/>
+ <location line="-56"/>
<source>Cannot downgrade wallet</source>
<translation>Nije moguće novÄanik vratiti na prijaÅ¡nju verziju.</translation>
</message>
@@ -3900,7 +3994,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Nije moguće upisati zadanu adresu.</translation>
</message>
<message>
- <location line="+66"/>
+ <location line="+67"/>
<source>Rescanning...</source>
<translation>Rescaniranje</translation>
</message>
@@ -3920,7 +4014,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Greška</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-35"/>
<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 352c4de8f7..ee4152aa5b 100644
--- a/src/qt/locale/bitcoin_hu.ts
+++ b/src/qt/locale/bitcoin_hu.ts
@@ -3,13 +3,13 @@
<name>AboutDialog</name>
<message>
<location filename="../forms/aboutdialog.ui" line="+14"/>
- <source>About Bitcoin</source>
- <translation>A Bitcoinról</translation>
+ <source>About Bitcoin Core</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+39"/>
- <source>&lt;b&gt;Bitcoin&lt;/b&gt; version</source>
- <translation>&lt;b&gt;Bitcoin&lt;/b&gt; verzió</translation>
+ <source>&lt;b&gt;Bitcoin Core&lt;/b&gt; version</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+57"/>
@@ -26,14 +26,14 @@ 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="+14"/>
+ <location filename="../utilitydialog.cpp" line="+29"/>
<source>Copyright</source>
<translation>Copyright</translation>
</message>
<message>
<location line="+0"/>
- <source>The Bitcoin developers</source>
- <translation>A Bitcoin fejlesztői</translation>
+ <source>The Bitcoin Core developers</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -69,7 +69,7 @@ Ez a termék az OpenSSL Project által lett kifejlesztve az OpenSSL Toolkit (htt
<translation type="unfinished"/>
</message>
<message>
- <location filename="../addressbookpage.cpp" line="+72"/>
+ <location filename="../addressbookpage.cpp" line="+74"/>
<source>&amp;Copy Address</source>
<translation>&amp;Cím másolása</translation>
</message>
@@ -139,7 +139,7 @@ Ez a termék az OpenSSL Project által lett kifejlesztve az OpenSSL Toolkit (htt
<translation>Sz&amp;erkesztés</translation>
</message>
<message>
- <location line="+197"/>
+ <location line="+194"/>
<source>Export Address List</source>
<translation type="unfinished"/>
</message>
@@ -150,19 +150,19 @@ Ez a termék az OpenSSL Project által lett kifejlesztve az OpenSSL Toolkit (htt
</message>
<message>
<location line="+13"/>
- <source>Error exporting</source>
- <translation>Hiba exportálás közben</translation>
+ <source>Exporting Failed</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation>%1 nevű fájl nem írható.</translation>
+ <location line="+1"/>
+ <source>There was an error trying to save the address list to %1.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<name>AddressTableModel</name>
<message>
- <location filename="../addresstablemodel.cpp" line="+164"/>
+ <location filename="../addresstablemodel.cpp" line="+168"/>
<source>Label</source>
<translation>Címke</translation>
</message>
@@ -200,7 +200,7 @@ Ez a termék az OpenSSL Project által lett kifejlesztve az OpenSSL Toolkit (htt
<translation>Új jelszó újra</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="+34"/>
+ <location filename="../askpassphrasedialog.cpp" line="+40"/>
<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>Ãrd be az új jelszót a tárcához.&lt;br/&gt;Használj legalább 10&lt;br/&gt;véletlenszerű karaktert&lt;/b&gt; vagy &lt;b&gt;legalább nyolc szót&lt;/b&gt;.</translation>
</message>
@@ -321,22 +321,27 @@ Ez a termék az OpenSSL Project által lett kifejlesztve az OpenSSL Toolkit (htt
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+250"/>
+ <location filename="../bitcoingui.cpp" line="+295"/>
<source>Sign &amp;message...</source>
<translation>Üzenet aláírása...</translation>
</message>
<message>
- <location line="+254"/>
+ <location line="+335"/>
<source>Synchronizing with network...</source>
<translation>Szinkronizálás a hálózattal...</translation>
</message>
<message>
- <location line="-324"/>
+ <location line="-407"/>
<source>&amp;Overview</source>
<translation>&amp;Ãttekintés</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="-137"/>
+ <source>Node</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+138"/>
<source>Show general overview of wallet</source>
<translation>Tárca általános áttekintése</translation>
</message>
@@ -351,7 +356,7 @@ 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="+15"/>
+ <location line="+17"/>
<source>E&amp;xit</source>
<translation>&amp;Kilépés</translation>
</message>
@@ -397,7 +402,22 @@ 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="+10"/>
+ <source>&amp;Sending addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Receiving addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open &amp;URI...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+325"/>
<source>Importing blocks from disk...</source>
<translation>A blokkok importálása lemezről...</translation>
</message>
@@ -407,12 +427,12 @@ Ez a termék az OpenSSL Project által lett kifejlesztve az OpenSSL Toolkit (htt
<translation>A blokkok lemezen történő ujraindexelése...</translation>
</message>
<message>
- <location line="-322"/>
+ <location line="-405"/>
<source>Send coins to a Bitcoin address</source>
<translation>Érmék küldése megadott címre</translation>
</message>
<message>
- <location line="+47"/>
+ <location line="+49"/>
<source>Modify configuration options for Bitcoin</source>
<translation>Bitcoin konfigurációs opciók</translation>
</message>
@@ -442,20 +462,17 @@ Ez a termék az OpenSSL Project által lett kifejlesztve az OpenSSL Toolkit (htt
<translation>Üzenet &amp;valódiságának ellenőrzése</translation>
</message>
<message>
- <location line="-180"/>
- <location line="+6"/>
- <location line="+513"/>
+ <location line="+430"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-519"/>
- <location line="+6"/>
+ <location line="-643"/>
<source>Wallet</source>
<translation>Tárca</translation>
</message>
<message>
- <location line="+109"/>
+ <location line="+146"/>
<source>&amp;Send</source>
<translation>&amp;Küldés</translation>
</message>
@@ -465,13 +482,7 @@ Ez a termék az OpenSSL Project által lett kifejlesztve az OpenSSL Toolkit (htt
<translation>&amp;Fogadás</translation>
</message>
<message>
- <location line="+28"/>
- <location line="+2"/>
- <source>&amp;About Bitcoin</source>
- <translation>&amp;A Bitcoinról</translation>
- </message>
- <message>
- <location line="+14"/>
+ <location line="+46"/>
<location line="+2"/>
<source>&amp;Show / Hide</source>
<translation>&amp;Mutat / Elrejt</translation>
@@ -497,64 +508,80 @@ Ez a termék az OpenSSL Project által lett kifejlesztve az OpenSSL Toolkit (htt
<translation>Annak ellenőrzése, hogy az üzenetek valóban a megjelölt Bitcoin címekkel vannak-e alaírva</translation>
</message>
<message>
- <location line="+35"/>
+ <location line="+48"/>
<source>&amp;File</source>
<translation>&amp;Fájl</translation>
</message>
<message>
- <location line="+10"/>
+ <location line="+14"/>
<source>&amp;Settings</source>
<translation>&amp;Beállítások</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>&amp;Help</source>
<translation>&amp;Súgó</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+15"/>
<source>Tabs toolbar</source>
<translation>Fül eszköztár</translation>
</message>
<message>
- <location line="-235"/>
- <location line="+294"/>
+ <location line="-284"/>
+ <location line="+376"/>
<source>[testnet]</source>
<translation>[teszthálózat]</translation>
</message>
<message>
- <location line="-177"/>
+ <location line="-401"/>
+ <source>Bitcoin Core</source>
+ <translation>Bitcoin Core</translation>
+ </message>
+ <message>
+ <location line="+163"/>
<source>Request payments (generates QR codes and bitcoin: URIs)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+63"/>
- <source>&amp;Used sending addresses...</source>
+ <location line="+29"/>
+ <location line="+2"/>
+ <source>&amp;About Bitcoin Core</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="+35"/>
<source>Show the list of used sending addresses and labels</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Used &amp;receiving addresses...</source>
+ <location line="+2"/>
+ <source>Show the list of used receiving addresses and labels</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open a bitcoin: URI or payment request</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Command-line options</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
- <source>Show the list of used receiving addresses and labels</source>
+ <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+106"/>
+ <location line="+159"/>
<location line="+5"/>
<source>Bitcoin client</source>
<translation>Bitcoin kliens</translation>
</message>
<message numerus="yes">
- <location line="+120"/>
+ <location line="+142"/>
<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>
@@ -574,7 +601,7 @@ Ez a termék az OpenSSL Project által lett kifejlesztve az OpenSSL Toolkit (htt
<translation>A tranzakció-történet %1 blokkja feldolgozva.</translation>
</message>
<message numerus="yes">
- <location line="+20"/>
+ <location line="+23"/>
<source>%n hour(s)</source>
<translation><numerusform>%n óra</numerusform><numerusform>%n óra</numerusform></translation>
</message>
@@ -594,7 +621,7 @@ Ez a termék az OpenSSL Project által lett kifejlesztve az OpenSSL Toolkit (htt
<translation>%1 lemaradás</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="+21"/>
<source>Last received block was generated %1 ago.</source>
<translation>Az utolsóként kapott blokk kora: %1.</translation>
</message>
@@ -619,27 +646,17 @@ Ez a termék az OpenSSL Project által lett kifejlesztve az OpenSSL Toolkit (htt
<translation>Információ</translation>
</message>
<message>
- <location line="+77"/>
- <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="-152"/>
+ <location line="-85"/>
<source>Up to date</source>
<translation>Naprakész</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Catching up...</source>
<translation>Frissítés...</translation>
</message>
<message>
- <location line="+124"/>
- <source>Confirm transaction fee</source>
- <translation>Tranzakciós díj jóváhagyása</translation>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+130"/>
<source>Sent transaction</source>
<translation>Tranzakció elküldve.</translation>
</message>
@@ -662,17 +679,7 @@ Cím: %4
</translation>
</message>
<message>
- <location line="+34"/>
- <source>URI handling</source>
- <translation>URI kezelés</translation>
- </message>
- <message>
- <location line="+0"/>
- <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="+45"/>
+ <location line="+69"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation>Tárca &lt;b&gt;kódolva&lt;/b&gt; és jelenleg &lt;b&gt;nyitva&lt;/b&gt;.</translation>
</message>
@@ -682,7 +689,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 filename="../bitcoin.cpp" line="+110"/>
+ <location filename="../bitcoin.cpp" line="+438"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation type="unfinished"/>
</message>
@@ -690,12 +697,304 @@ Cím: %4
<context>
<name>ClientModel</name>
<message>
- <location filename="../clientmodel.cpp" line="+115"/>
+ <location filename="../clientmodel.cpp" line="+119"/>
<source>Network Alert</source>
<translation>Hálózati figyelmeztetés</translation>
</message>
</context>
<context>
+ <name>CoinControlDialog</name>
+ <message>
+ <location filename="../forms/coincontroldialog.ui" line="+14"/>
+ <source>Coin Control Address Selection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>Quantity:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Bytes:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>Amount:</source>
+ <translation>Összeg:</translation>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Priority:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Low Output:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>After Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Change:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+63"/>
+ <source>(un)select all</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Tree mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>List mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>Amount</source>
+ <translation>Összeg</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Address</source>
+ <translation>Cím</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Date</source>
+ <translation>Dátum</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Confirmations</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Confirmed</source>
+ <translation>Megerősítve</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../coincontroldialog.cpp" line="+42"/>
+ <source>Copy address</source>
+ <translation>Cím másolása</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy label</source>
+ <translation>Címke másolása</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+26"/>
+ <source>Copy amount</source>
+ <translation>Összeg másolása</translation>
+ </message>
+ <message>
+ <location line="-25"/>
+ <source>Copy transaction ID</source>
+ <translation>Tranzakcióazonosító másolása</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Lock unspent</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Unlock unspent</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+22"/>
+ <source>Copy quantity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Copy fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy after fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy bytes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy low output</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy change</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+323"/>
+ <source>highest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>higher</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>high</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>medium-high</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>medium</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>low-medium</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>low</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>lower</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>lowest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>(%1 locked)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+140"/>
+ <source>Dust</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>yes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>no</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>This label turns red, if the transaction size is greater than 1000 bytes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+5"/>
+ <source>This means a fee of at least %1 per kB is required.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-4"/>
+ <source>Can vary +/- 1 byte per input.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Transactions with higher priority are more likely to get included into a block.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>This label turns red, if the priority is smaller than &quot;medium&quot;.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>This label turns red, if any recipient receives an amount smaller than %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+4"/>
+ <source>This means a fee of at least %1 is required.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-3"/>
+ <source>Amounts below 0.546 times the minimum relay fee are shown as dust.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>This label turns red, if the change is smaller than %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
+ <location line="+66"/>
+ <source>(no label)</source>
+ <translation>(nincs címke)</translation>
+ </message>
+ <message>
+ <location line="-9"/>
+ <source>change from %1 (%2)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>(change)</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>EditAddressDialog</name>
<message>
<location filename="../forms/editaddressdialog.ui" line="+14"/>
@@ -723,7 +1022,7 @@ Cím: %4
<translation>&amp;Cím</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+21"/>
+ <location filename="../editaddressdialog.cpp" line="+28"/>
<source>New receiving address</source>
<translation>Új fogadó cím</translation>
</message>
@@ -766,14 +1065,14 @@ Cím: %4
<context>
<name>FreespaceChecker</name>
<message>
- <location filename="../intro.cpp" line="+61"/>
+ <location filename="../intro.cpp" line="+65"/>
<source>A new data directory will be created.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+22"/>
<source>name</source>
- <translation type="unfinished"/>
+ <translation>Név</translation>
</message>
<message>
<location line="+2"/>
@@ -792,15 +1091,19 @@ Cím: %4
</message>
</context>
<context>
- <name>GUIUtil::HelpMessageBox</name>
+ <name>HelpMessageDialog</name>
<message>
- <location filename="../guiutil.cpp" line="+558"/>
- <location line="+13"/>
- <source>Bitcoin-Qt</source>
- <translation>Bitcoin-Qt</translation>
+ <location filename="../forms/helpmessagedialog.ui" line="+19"/>
+ <source>Bitcoin Core - Command-line options</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="-13"/>
+ <location filename="../utilitydialog.cpp" line="+38"/>
+ <source>Bitcoin Core</source>
+ <translation>Bitcoin Core</translation>
+ </message>
+ <message>
+ <location line="+0"/>
<source>version</source>
<translation>verzió</translation>
</message>
@@ -850,17 +1153,17 @@ Cím: %4
</message>
<message>
<location line="+9"/>
- <source>Welcome to Bitcoin-Qt.</source>
+ <source>Welcome to Bitcoin Core.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+26"/>
- <source>As this is the first time the program is launched, you can choose where Bitcoin-Qt will store its data.</source>
+ <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+10"/>
- <source>Bitcoin-Qt will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
+ <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -874,7 +1177,17 @@ Cím: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../intro.cpp" line="+105"/>
+ <location filename="../intro.cpp" line="+85"/>
+ <source>Bitcoin</source>
+ <translation>Bitcoin</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error: Specified data directory &quot;%1&quot; can not be created.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+19"/>
<source>Error</source>
<translation>Hiba</translation>
</message>
@@ -890,6 +1203,34 @@ Cím: %4
</message>
</context>
<context>
+ <name>OpenURIDialog</name>
+ <message>
+ <location filename="../forms/openuridialog.ui" line="+14"/>
+ <source>Open URI</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Open payment request from URI or file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>URI:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Select payment request file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../openuridialog.cpp" line="+47"/>
+ <source>Select payment request file to open</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OptionsDialog</name>
<message>
<location filename="../forms/optionsdialog.ui" line="+14"/>
@@ -897,7 +1238,7 @@ Cím: %4
<translation>Opciók</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+13"/>
<source>&amp;Main</source>
<translation>&amp;FÅ‘</translation>
</message>
@@ -922,7 +1263,52 @@ Cím: %4
<translation>&amp;Induljon el a számítógép bekapcsolásakor</translation>
</message>
<message>
- <location line="+35"/>
+ <location line="+9"/>
+ <source>Size of &amp;database cache</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set database cache size in megabytes (default: 25)</source>
+ <translation>Az adatbázis gyorsítótár mérete megabájtban (alapértelmezés: 25)</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>MB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Number of script &amp;verification threads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
+ <translation>Szkriptellenőrzési szálak számának beállítása (maximum 16, 0 = automatikus, &lt;0 = szabadon hagyott magok száma, alapértelmezett: 0)</translation>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Connect to the Bitcoin network through a SOCKS proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Connect through SOCKS proxy (default proxy):</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+224"/>
+ <source>Active command-line options that override above options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
<source>Reset all client options to default.</source>
<translation>Minden kliensbeállítás alapértelmezettre állítása.</translation>
</message>
@@ -932,7 +1318,7 @@ Cím: %4
<translation>Beállítások tö&amp;rlése</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="-323"/>
<source>&amp;Network</source>
<translation>&amp;Hálózat</translation>
</message>
@@ -947,32 +1333,17 @@ Cím: %4
<translation>&amp;UPnP port-feltérképezés</translation>
</message>
<message>
- <location line="+7"/>
- <source>Connect to the Bitcoin network through a SOCKS proxy (e.g. when connecting through Tor).</source>
- <translation>SOCKS proxyn keresztüli csatlakozás a Bitcoin hálózatához (pl. Tor-on keresztüli csatlakozás esetén)</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>&amp;Connect through SOCKS proxy:</source>
- <translation>&amp;Csatlakozás SOCKS proxyn keresztül:</translation>
- </message>
- <message>
- <location line="+9"/>
+ <location line="+19"/>
<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 címe (pl.: 127.0.0.1)</translation>
- </message>
- <message>
- <location line="+7"/>
+ <location line="+32"/>
<source>&amp;Port:</source>
<translation>&amp;Port:</translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+25"/>
<source>Port of the proxy (e.g. 9050)</source>
<translation>Proxy portja (pl.: 9050)</translation>
</message>
@@ -1047,7 +1418,17 @@ Cím: %4
<translation>&amp;Címek megjelenítése a tranzakciólistában</translation>
</message>
<message>
- <location line="+71"/>
+ <location line="+7"/>
+ <source>Whether to show coin control features or not.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Display coin &amp;control features (experts only)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+136"/>
<source>&amp;OK</source>
<translation>&amp;OK</translation>
</message>
@@ -1057,44 +1438,38 @@ Cím: %4
<translation>Megszakítás</translation>
</message>
<message>
- <location line="+10"/>
- <source>&amp;Apply</source>
- <translation>Alkalmazás</translation>
- </message>
- <message>
- <location filename="../optionsdialog.cpp" line="+58"/>
+ <location filename="../optionsdialog.cpp" line="+67"/>
<source>default</source>
<translation>alapértelmezett</translation>
</message>
<message>
- <location line="+130"/>
+ <location line="+57"/>
+ <source>none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+75"/>
<source>Confirm options reset</source>
<translation>Beállítások törlésének jóváhagyása.</translation>
</message>
<message>
<location line="+1"/>
- <source>Some settings may require a client restart to take effect.</source>
+ <location line="+29"/>
+ <source>Client restart required to activate changes.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>Do you want to proceed?</source>
- <translation>Valóban végre akarod hajtani?</translation>
- </message>
- <message>
- <location line="+42"/>
- <location line="+9"/>
- <source>Warning</source>
- <translation>Figyelem</translation>
+ <location line="-29"/>
+ <source>Client will be shutdown, do you want to proceed?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="-9"/>
- <location line="+9"/>
- <source>This setting will take effect after restarting Bitcoin.</source>
- <translation>Ez a beállítás a Bitcoin ujraindítása után lép érvénybe.</translation>
+ <location line="+33"/>
+ <source>This change would require a client restart.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+29"/>
+ <location line="+34"/>
<source>The supplied proxy address is invalid.</source>
<translation>A megadott proxy cím nem érvényes.</translation>
</message>
@@ -1108,22 +1483,22 @@ Cím: %4
</message>
<message>
<location line="+50"/>
- <location line="+202"/>
+ <location line="+231"/>
<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 kijelzett információ lehet, hogy elavult. A pénztárcája automatikusan szinkronizálja magát a Bitcoin hálózattal miután a kapcsolat létrejön, de ez e folyamat még nem fejeződött be.</translation>
</message>
<message>
- <location line="-131"/>
+ <location line="-155"/>
<source>Unconfirmed:</source>
<translation>Megerősítetlen:</translation>
</message>
<message>
- <location line="-78"/>
+ <location line="-83"/>
<source>Wallet</source>
<translation>Tárca</translation>
</message>
<message>
- <location line="+49"/>
+ <location line="+51"/>
<source>Confirmed:</source>
<translation>Megerősítve:</translation>
</message>
@@ -1133,12 +1508,12 @@ Cím: %4
<translation>Jelenlegi egyenleg</translation>
</message>
<message>
- <location line="+29"/>
+ <location line="+32"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation>Még megerősítésre váró, a jelenlegi egyenlegbe be nem számított tranzakciók</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+16"/>
<source>Immature:</source>
<translation>Éretlen:</translation>
</message>
@@ -1148,7 +1523,7 @@ Cím: %4
<translation>Bányászott egyenleg amely még nem érett be.</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+16"/>
<source>Total:</source>
<translation>Összesen:</translation>
</message>
@@ -1158,12 +1533,12 @@ Cím: %4
<translation>Aktuális egyenleged</translation>
</message>
<message>
- <location line="+53"/>
+ <location line="+71"/>
<source>&lt;b&gt;Recent transactions&lt;/b&gt;</source>
<translation>&lt;b&gt;Legutóbbi tranzakciók&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../overviewpage.cpp" line="+116"/>
+ <location filename="../overviewpage.cpp" line="+120"/>
<location line="+1"/>
<source>out of sync</source>
<translation>Nincs szinkronban.</translation>
@@ -1172,7 +1547,8 @@ Cím: %4
<context>
<name>PaymentServer</name>
<message>
- <location filename="../paymentserver.cpp" line="+392"/>
+ <location filename="../paymentserver.cpp" line="+403"/>
+ <location line="+13"/>
<source>URI handling</source>
<translation>URI kezelés</translation>
</message>
@@ -1182,45 +1558,82 @@ Cím: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+69"/>
+ <location line="+96"/>
<source>Requested payment amount of %1 is too small (considered dust).</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
- <location line="+37"/>
+ <location line="-221"/>
+ <location line="+212"/>
+ <location line="+13"/>
+ <location line="+95"/>
+ <location line="+18"/>
+ <location line="+16"/>
<source>Payment request error</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="-353"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
+ <translation>A bitcoint nem lehet elindítani: click-to-pay handler</translation>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Net manager warning</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+1"/>
- <source>Insecure requests to custom payment scripts unsupported</source>
+ <source>Your active proxy doesn&apos;t support SOCKS5, which is required for payment requests via proxy.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+38"/>
+ <location line="+52"/>
+ <source>Payment request fetch URL is invalid: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Payment request file handling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Payment request file can not be read or processed! This can be caused by an invalid payment request file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+73"/>
+ <source>Unverified payment requests to custom payment scripts are unsupported.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+59"/>
<source>Refund from %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
+ <location line="+43"/>
<source>Error communicating with %1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+24"/>
+ <source>Payment request can not be parsed or processed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
<source>Bad response from server %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+32"/>
+ <location line="+33"/>
<source>Payment acknowledged</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-58"/>
- <location line="+30"/>
- <location line="+17"/>
+ <location line="-11"/>
<source>Network request error</source>
<translation type="unfinished"/>
</message>
@@ -1228,32 +1641,26 @@ Cím: %4
<context>
<name>QObject</name>
<message>
- <location filename="../bitcoin.cpp" line="+114"/>
- <location line="+5"/>
- <location filename="../intro.cpp" line="-32"/>
+ <location filename="../bitcoin.cpp" line="+71"/>
+ <location line="+11"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-4"/>
+ <location line="+1"/>
<source>Error: Specified data directory &quot;%1&quot; does not exist.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="-12"/>
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../intro.cpp" line="+1"/>
- <source>Error: Specified data directory &quot;%1&quot; can not be created.</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>QRImageWidget</name>
<message>
- <location filename="../receiverequestdialog.cpp" line="+32"/>
+ <location filename="../receiverequestdialog.cpp" line="+36"/>
<source>&amp;Save Image...</source>
<translation type="unfinished"/>
</message>
@@ -1269,8 +1676,8 @@ Cím: %4
</message>
<message>
<location line="+0"/>
- <source>PNG Images (*.png)</source>
- <translation>PNG Képfájlok (*.png)</translation>
+ <source>PNG Image (*.png)</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1287,15 +1694,16 @@ Cím: %4
<location line="+23"/>
<location line="+23"/>
<location line="+36"/>
- <location line="+53"/>
+ <location line="+23"/>
+ <location line="+36"/>
<location line="+23"/>
<location line="+23"/>
- <location filename="../rpcconsole.cpp" line="+352"/>
+ <location filename="../rpcconsole.cpp" line="+359"/>
<source>N/A</source>
<translation>Nem elérhető</translation>
</message>
<message>
- <location line="-217"/>
+ <location line="-223"/>
<source>Client version</source>
<translation>Kliens verzió</translation>
</message>
@@ -1305,7 +1713,17 @@ Cím: %4
<translation>&amp;Információ</translation>
</message>
<message>
- <location line="+68"/>
+ <location line="-10"/>
+ <source>Debug window</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+25"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+53"/>
<source>Using OpenSSL version</source>
<translation>Használt OpenSSL verzió</translation>
</message>
@@ -1321,16 +1739,16 @@ Cím: %4
</message>
<message>
<location line="+7"/>
- <source>Number of connections</source>
- <translation>Kapcsolatok száma</translation>
+ <source>Name</source>
+ <translation>Név</translation>
</message>
<message>
<location line="+23"/>
- <source>On testnet</source>
- <translation>Teszthálózaton</translation>
+ <source>Number of connections</source>
+ <translation>Kapcsolatok száma</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+29"/>
<source>Block chain</source>
<translation>Blokklánc</translation>
</message>
@@ -1355,21 +1773,6 @@ Cím: %4
<translation>&amp;Megnyitás</translation>
</message>
<message>
- <location line="+16"/>
- <source>Command-line options</source>
- <translation>Parancssoros opciók</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"/>
- </message>
- <message>
- <location line="+3"/>
- <source>&amp;Show</source>
- <translation>&amp;Mutat</translation>
- </message>
- <message>
<location line="+24"/>
<source>&amp;Console</source>
<translation>&amp;Konzol</translation>
@@ -1400,22 +1803,12 @@ Cím: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-541"/>
+ <location line="-521"/>
<source>Build date</source>
<translation>Fordítás dátuma</translation>
</message>
<message>
- <location line="-104"/>
- <source>Bitcoin - Debug window</source>
- <translation>Bitcoin - Debug ablak</translation>
- </message>
- <message>
- <location line="+25"/>
- <source>Bitcoin Core</source>
- <translation>Bitcoin Core</translation>
- </message>
- <message>
- <location line="+279"/>
+ <location line="+206"/>
<source>Debug log file</source>
<translation>Debug naplófájl</translation>
</message>
@@ -1425,7 +1818,7 @@ Cím: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+102"/>
+ <location line="+76"/>
<source>Clear console</source>
<translation>Konzol törlése</translation>
</message>
@@ -1445,7 +1838,7 @@ Cím: %4
<translation>Ãrd be azt, hogy &lt;b&gt;help&lt;/b&gt; az elérhetÅ‘ parancsok áttekintéséhez.</translation>
</message>
<message>
- <location line="+128"/>
+ <location line="+122"/>
<source>%1 B</source>
<translation type="unfinished"/>
</message>
@@ -1483,48 +1876,48 @@ Cím: %4
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+22"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
<source>&amp;Amount:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
- <source>The amount to request</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+7"/>
+ <location line="-13"/>
<source>&amp;Label:</source>
<translation>Címke:</translation>
</message>
<message>
- <location line="+10"/>
- <source>The label to associate with the receiving address</source>
+ <location line="-34"/>
+ <source>&amp;Message:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>&amp;Message:</source>
+ <location line="-17"/>
+ <source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>The message to attach to payment request</source>
+ <location line="+3"/>
+ <source>R&amp;euse an existing receiving address (not recommended)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
- <source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
+ <location line="+27"/>
+ <source>An optional label to associate with the new receiving address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>R&amp;euse an existing receiving address (not recommended)</source>
+ <location line="+7"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+7"/>
- <source>Use this form to request payments. All fields are optional.</source>
+ <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+39"/>
+ <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1542,28 +1935,48 @@ Cím: %4
<source>&amp;Request payment</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+47"/>
+ <source>Requested payments</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Show the selected request (does the same as double clicking an entry)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Show</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Remove the selected entries from the list</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Remove</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
<message>
<location filename="../forms/receiverequestdialog.ui" line="+29"/>
<source>QR Code</source>
- <translation type="unfinished"/>
+ <translation>QR kód</translation>
</message>
<message>
<location line="+46"/>
<source>Copy &amp;URI</source>
- <translation type="unfinished"/>
+ <translation>&amp;URI másolása</translation>
</message>
<message>
<location line="+7"/>
<source>Copy &amp;Address</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+7"/>
- <source>&amp;Copy Image</source>
- <translation type="unfinished"/>
+ <translation>&amp;Cím másolása</translation>
</message>
<message>
<location line="+7"/>
@@ -1571,7 +1984,7 @@ Cím: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../receiverequestdialog.cpp" line="+58"/>
+ <location filename="../receiverequestdialog.cpp" line="+56"/>
<source>Request payment to %1</source>
<translation type="unfinished"/>
</message>
@@ -1617,16 +2030,119 @@ Cím: %4
</message>
</context>
<context>
+ <name>RecentRequestsTableModel</name>
+ <message>
+ <location filename="../recentrequeststablemodel.cpp" line="+24"/>
+ <source>Date</source>
+ <translation>Dátum</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Label</source>
+ <translation>Címke</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Message</source>
+ <translation>Ãœzenet</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Amount</source>
+ <translation>Összeg</translation>
+ </message>
+ <message>
+ <location line="+38"/>
+ <source>(no label)</source>
+ <translation>(nincs címke)</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>(no message)</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+140"/>
- <location line="+213"/>
+ <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location line="+80"/>
<source>Send Coins</source>
<translation>Érmék küldése</translation>
</message>
<message>
- <location line="+50"/>
+ <location line="+76"/>
+ <source>Coin Control Features</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Inputs...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>automatically selected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Insufficient funds!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+89"/>
+ <source>Quantity:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+35"/>
+ <source>Bytes:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Amount:</source>
+ <translation>Összeg:</translation>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Priority:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Low Output:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>After Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Change:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+44"/>
+ <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Custom change address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+115"/>
<source>Send to multiple recipients at once</source>
<translation>Küldés több címzettnek egyszerre</translation>
</message>
@@ -1651,12 +2167,7 @@ Cím: %4
<translation>Egyenleg:</translation>
</message>
<message>
- <location line="+10"/>
- <source>123.456 BTC</source>
- <translation>123.456 BTC</translation>
- </message>
- <message>
- <location line="+31"/>
+ <location line="+41"/>
<source>Confirm the send action</source>
<translation>Küldés megerősítése</translation>
</message>
@@ -1666,69 +2177,135 @@ Cím: %4
<translation>&amp;Küldés</translation>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-154"/>
+ <location filename="../sendcoinsdialog.cpp" line="-228"/>
<source>Confirm send coins</source>
<translation>Küldés megerősítése</translation>
</message>
<message>
- <location line="-90"/>
+ <location line="-74"/>
<location line="+5"/>
<location line="+5"/>
+ <location line="+4"/>
<source>%1 to %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+26"/>
+ <location line="-136"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation>Adj meg egy Bitcoin-címet (pl.: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L )</translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Copy quantity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation>Összeg másolása</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy after fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy bytes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy low output</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy change</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+170"/>
+ <source>Total Amount %1 (= %2)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>or</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+202"/>
<source>The recipient address is not valid, please recheck.</source>
<translation>A címzett címe érvénytelen, kérlek, ellenőrizd.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The amount to pay must be larger than 0.</source>
<translation>A fizetendő összegnek nagyobbnak kell lennie 0-nál.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The amount exceeds your balance.</source>
<translation>Nincs ennyi bitcoin az egyenlegeden.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The total exceeds your balance when the %1 transaction fee is included.</source>
<translation>A küldeni kívánt összeg és a %1 tranzakciós díj együtt meghaladja az egyenlegeden rendelkezésedre álló összeget.</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+3"/>
<source>Duplicate address found, can only send to each address once per send operation.</source>
<translation>Többször szerepel ugyanaz a cím. Egy küldési műveletben egy címre csak egyszer lehet küldeni.</translation>
</message>
<message>
+ <location line="+3"/>
+ <source>Transaction creation failed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+4"/>
- <source>Error: Transaction creation failed!</source>
- <translation>Hiba: nem sikerült létrehozni a tranzakciót.</translation>
+ <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+15"/>
- <source>Are you sure you want to send?</source>
+ <location line="+112"/>
+ <source>Warning: Invalid Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+9"/>
- <source>added as transaction fee</source>
+ <location line="+21"/>
+ <source>(no label)</source>
+ <translation>(nincs címke)</translation>
+ </message>
+ <message>
+ <location line="-11"/>
+ <source>Warning: Unknown change address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
- <source>Total Amount %1</source>
+ <location line="-366"/>
+ <source>Are you sure you want to send?</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+20"/>
- <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>Hiba: a tranzakciót elutasították. Ezt az okozhatja, ha már elköltöttél valamennyi érmét a tárcádból például ha a wallet.dat-od egy másolatát használtad, és így az elköltés csak abban lett jelölve, de itt nem.</translation>
+ <location line="+9"/>
+ <source>added as transaction fee</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+144"/>
+ <location line="+170"/>
<source>Payment request expired</source>
<translation type="unfinished"/>
</message>
@@ -1741,40 +2318,45 @@ Cím: %4
<context>
<name>SendCoinsEntry</name>
<message>
- <location filename="../forms/sendcoinsentry.ui" line="+33"/>
- <location line="+585"/>
+ <location filename="../forms/sendcoinsentry.ui" line="+131"/>
+ <location line="+521"/>
+ <location line="+536"/>
<source>A&amp;mount:</source>
<translation>Összeg:</translation>
</message>
<message>
- <location line="-572"/>
- <location line="+585"/>
+ <location line="-1152"/>
<source>Pay &amp;To:</source>
<translation>Címzett:</translation>
</message>
<message>
- <location line="-551"/>
+ <location line="+18"/>
<source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../sendcoinsentry.cpp" line="+28"/>
+ <location filename="../sendcoinsentry.cpp" line="+30"/>
<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>
</message>
<message>
- <location filename="../forms/sendcoinsentry.ui" line="-18"/>
+ <location filename="../forms/sendcoinsentry.ui" line="+57"/>
<source>&amp;Label:</source>
<translation>Címke:</translation>
</message>
<message>
- <location line="+28"/>
+ <location line="-50"/>
<source>Choose previously used address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
+ <location line="-40"/>
+ <source>This is a normal payment.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+50"/>
<source>Alt+A</source>
<translation>Alt+A</translation>
</message>
@@ -1790,16 +2372,45 @@ Cím: %4
</message>
<message>
<location line="+7"/>
- <source>Remove this recipient</source>
- <translation>Címzett eltávolítása</translation>
+ <location line="+524"/>
+ <location line="+536"/>
+ <source>Remove this entry</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="-1008"/>
+ <source>Message:</source>
+ <translation>Ãœzenet:</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+958"/>
+ <source>This is a verified payment request.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-991"/>
<source>Enter a label for this address to add it to the list of used addresses</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+465"/>
+ <location line="+459"/>
+ <source>This is an unverified payment request.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+18"/>
+ <location line="+532"/>
+ <source>Pay To:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-498"/>
+ <location line="+536"/>
<source>Memo:</source>
<translation type="unfinished"/>
</message>
@@ -1810,6 +2421,19 @@ Cím: %4
</message>
</context>
<context>
+ <name>ShutdownWindow</name>
+ <message>
+ <location filename="../utilitydialog.cpp" line="+48"/>
+ <source>Bitcoin Core is shutting down...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Do not shut down the computer until this window disappears.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>SignVerifyMessageDialog</name>
<message>
<location filename="../forms/signverifymessagedialog.ui" line="+14"/>
@@ -1817,7 +2441,7 @@ Cím: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+10"/>
<source>&amp;Sign Message</source>
<translation>Üzenet aláírása...</translation>
</message>
@@ -1920,7 +2544,7 @@ Cím: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+27"/>
+ <location filename="../signverifymessagedialog.cpp" line="+29"/>
<location line="+3"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>Adj meg egy Bitcoin-címet (pl.: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L )</translation>
@@ -1936,7 +2560,7 @@ Cím: %4
<translation>Adja meg a Bitcoin aláírást</translation>
</message>
<message>
- <location line="+85"/>
+ <location line="+84"/>
<location line="+81"/>
<source>The entered address is invalid.</source>
<translation>A megadott cím nem érvényes.</translation>
@@ -1994,7 +2618,7 @@ Cím: %4
<message>
<location line="+7"/>
<source>Message verification failed.</source>
- <translation type="unfinished"/>
+ <translation>Az üzenet ellenőrzése nem sikerült.</translation>
</message>
<message>
<location line="+5"/>
@@ -2005,9 +2629,14 @@ Cím: %4
<context>
<name>SplashScreen</name>
<message>
- <location filename="../splashscreen.cpp" line="+23"/>
- <source>The Bitcoin developers</source>
- <translation>A Bitcoin fejlesztői</translation>
+ <location filename="../splashscreen.cpp" line="+28"/>
+ <source>Bitcoin Core</source>
+ <translation>Bitcoin Core</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>The Bitcoin Core developers</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
@@ -2018,7 +2647,7 @@ Cím: %4
<context>
<name>TrafficGraphWidget</name>
<message>
- <location filename="../trafficgraphwidget.cpp" line="+75"/>
+ <location filename="../trafficgraphwidget.cpp" line="+79"/>
<source>KB/s</source>
<translation type="unfinished"/>
</message>
@@ -2026,7 +2655,7 @@ Cím: %4
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="+22"/>
+ <location filename="../transactiondesc.cpp" line="+28"/>
<source>Open until %1</source>
<translation>Megnyitva %1-ig</translation>
</message>
@@ -2099,12 +2728,12 @@ Cím: %4
<location line="+12"/>
<location line="+45"/>
<location line="+17"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Credit</source>
<translation>Jóváírás</translation>
</message>
<message numerus="yes">
- <location line="-120"/>
+ <location line="-125"/>
<source>matures in %n more block(s)</source>
<translation><numerusform>beérik %n blokk múlva</numerusform><numerusform>beérik %n blokk múlva</numerusform></translation>
</message>
@@ -2117,12 +2746,12 @@ Cím: %4
<location line="+44"/>
<location line="+8"/>
<location line="+15"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Debit</source>
<translation>Terhelés</translation>
</message>
<message>
- <location line="-57"/>
+ <location line="-62"/>
<source>Transaction fee</source>
<translation>Tranzakciós díj</translation>
</message>
@@ -2133,11 +2762,12 @@ Cím: %4
</message>
<message>
<location line="+6"/>
+ <location line="+9"/>
<source>Message</source>
<translation>Ãœzenet</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="-7"/>
<source>Comment</source>
<translation>Megjegyzés</translation>
</message>
@@ -2147,7 +2777,7 @@ Cím: %4
<translation>Tranzakcióazonosító</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+18"/>
<source>Merchant</source>
<translation type="unfinished"/>
</message>
@@ -2187,7 +2817,7 @@ Cím: %4
<translation>hamis</translation>
</message>
<message>
- <location line="-227"/>
+ <location line="-232"/>
<source>, has not been successfully broadcast yet</source>
<translation>, még nem sikerült elküldeni.</translation>
</message>
@@ -2218,7 +2848,7 @@ Cím: %4
<context>
<name>TransactionTableModel</name>
<message>
- <location filename="../transactiontablemodel.cpp" line="+227"/>
+ <location filename="../transactiontablemodel.cpp" line="+234"/>
<source>Date</source>
<translation>Dátum</translation>
</message>
@@ -2237,8 +2867,13 @@ Cím: %4
<source>Amount</source>
<translation>Összeg</translation>
</message>
+ <message>
+ <location line="+59"/>
+ <source>Immature (%1 confirmations, will be available after %2)</source>
+ <translation type="unfinished"/>
+ </message>
<message numerus="yes">
- <location line="+57"/>
+ <location line="+16"/>
<source>Open for %n more block(s)</source>
<translation><numerusform>%n további blokkra megnyitva</numerusform><numerusform>%n további blokkra megnyitva</numerusform></translation>
</message>
@@ -2258,17 +2893,13 @@ Cím: %4
<translation>Megerősítetlen (%1 %2 megerősítésből)</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="-22"/>
+ <location line="+25"/>
<source>Confirmed (%1 confirmations)</source>
<translation>Megerősítve (%1 megerősítés)</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></translation>
- </message>
<message>
- <location line="+5"/>
+ <location line="-22"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation>Ezt a blokkot egyetlen másik csomópont sem kapta meg, így valószínűleg nem lesz elfogadva!</translation>
</message>
@@ -2278,7 +2909,7 @@ Cím: %4
<translation>Legenerálva, de még el nem fogadva.</translation>
</message>
<message>
- <location line="+43"/>
+ <location line="+62"/>
<source>Received with</source>
<translation>Erre a címre</translation>
</message>
@@ -2336,7 +2967,7 @@ Cím: %4
<context>
<name>TransactionView</name>
<message>
- <location filename="../transactionview.cpp" line="+52"/>
+ <location filename="../transactionview.cpp" line="+57"/>
<location line="+16"/>
<source>All</source>
<translation>Mind</translation>
@@ -2397,12 +3028,12 @@ Cím: %4
<translation>Más</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+6"/>
<source>Enter address or label to search</source>
<translation>Ãrd be a keresendÅ‘ címet vagy címkét</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+6"/>
<source>Min amount</source>
<translation>Minimális összeg</translation>
</message>
@@ -2437,17 +3068,37 @@ Cím: %4
<translation>Tranzakciós részletek megjelenítése</translation>
</message>
<message>
- <location line="+143"/>
- <source>Export Transaction Data</source>
- <translation>Tranzakció adatainak exportálása</translation>
+ <location line="+142"/>
+ <source>Export Transaction History</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="+19"/>
+ <source>Exporting Failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>There was an error trying to save the transaction history to %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Exporting Successful</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The transaction history was successfully saved to %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-22"/>
<source>Comma separated file (*.csv)</source>
<translation>Vesszővel elválasztott fájl (*.csv)</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+9"/>
<source>Confirmed</source>
<translation>Megerősítve</translation>
</message>
@@ -2482,17 +3133,7 @@ Cím: %4
<translation>Azonosító</translation>
</message>
<message>
- <location line="+4"/>
- <source>Error exporting</source>
- <translation>Hiba lépett fel exportálás közben</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation>%1 fájlba való kiírás sikertelen.</translation>
- </message>
- <message>
- <location line="+100"/>
+ <location line="+107"/>
<source>Range:</source>
<translation>Tartomány:</translation>
</message>
@@ -2503,9 +3144,17 @@ Cím: %4
</message>
</context>
<context>
+ <name>WalletFrame</name>
+ <message>
+ <location filename="../walletframe.cpp" line="+26"/>
+ <source>No wallet has been loaded.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>WalletModel</name>
<message>
- <location filename="../walletmodel.cpp" line="+218"/>
+ <location filename="../walletmodel.cpp" line="+245"/>
<source>Send Coins</source>
<translation>Érmék küldése</translation>
</message>
@@ -2513,7 +3162,7 @@ Cím: %4
<context>
<name>WalletView</name>
<message>
- <location filename="../walletview.cpp" line="+46"/>
+ <location filename="../walletview.cpp" line="+43"/>
<source>&amp;Export</source>
<translation>&amp;Exportálás...</translation>
</message>
@@ -2523,68 +3172,63 @@ Cím: %4
<translation>Jelenlegi nézet exportálása fájlba</translation>
</message>
<message>
- <location line="+183"/>
+ <location line="+181"/>
<source>Backup Wallet</source>
<translation>Biztonsági másolat készítése a Tárcáról</translation>
</message>
<message>
- <location line="+0"/>
+ <location line="+1"/>
<source>Wallet Data (*.dat)</source>
<translation>Tárca fájl (*.dat)</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="+6"/>
<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>
+ <source>There was an error trying to save the wallet data to %1.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+4"/>
- <source>Backup Successful</source>
- <translation>Sikeres biztonsági mentés</translation>
+ <source>The wallet data was successfully saved to %1.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+0"/>
- <source>The wallet data was successfully saved to the new location.</source>
- <translation>A tárca sikeresen elmentve az új helyre.</translation>
+ <source>Backup Successful</source>
+ <translation>Sikeres biztonsági mentés</translation>
</message>
</context>
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+102"/>
- <source>Bitcoin version</source>
- <translation>Bitcoin verzió</translation>
- </message>
- <message>
- <location line="+107"/>
+ <location filename="../bitcoinstrings.cpp" line="+221"/>
<source>Usage:</source>
<translation>Használat:</translation>
</message>
<message>
- <location line="-55"/>
+ <location line="-54"/>
<source>List commands</source>
<translation>Parancsok kilistázása
</translation>
</message>
<message>
- <location line="-13"/>
+ <location line="-14"/>
<source>Get help for a command</source>
<translation>Segítség egy parancsról
</translation>
</message>
<message>
- <location line="+25"/>
+ <location line="+26"/>
<source>Options:</source>
<translation>Opciók
</translation>
</message>
<message>
- <location line="+24"/>
+ <location line="+22"/>
<source>Specify configuration file (default: bitcoin.conf)</source>
<translation>Konfigurációs fájl (alapértelmezett: bitcoin.conf)
</translation>
@@ -2607,7 +3251,7 @@ Cím: %4
<translation>Az adatbázis gyorsítótár mérete megabájtban (alapértelmezés: 25)</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-26"/>
<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>
@@ -2617,7 +3261,7 @@ Cím: %4
<translation>Maximálisan &lt;n&gt; számú kapcsolat fenntartása a peerekkel (alapértelmezés: 125)</translation>
</message>
<message>
- <location line="-49"/>
+ <location line="-51"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation>Kapcsolódás egy csomóponthoz a peerek címeinek megszerzése miatt, majd szétkapcsolás</translation>
</message>
@@ -2627,39 +3271,39 @@ Cím: %4
<translation>Adja meg az Ön saját nyilvános címét</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation>Helytelenül viselkedő peerek leválasztási határértéke (alapértelmezés: 100)</translation>
</message>
<message>
- <location line="-142"/>
+ <location line="-148"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation>Helytelenül viselkedő peerek kizárási ideje másodpercben (alapértelmezés: 86400)</translation>
</message>
<message>
- <location line="-33"/>
+ <location line="-36"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<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="+40"/>
+ <location line="+45"/>
<source>Accept command line and JSON-RPC commands</source>
<translation>Parancssoros és JSON-RPC parancsok elfogadása
</translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<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="+40"/>
+ <location line="+39"/>
<source>Use the test network</source>
<translation>Teszthálózat használata
</translation>
@@ -2670,7 +3314,7 @@ Cím: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-87"/>
+ <location line="-95"/>
<source>%s, you must set a rpcpassword in the configuration file:
%s
It is recommended you use the following random password:
@@ -2711,6 +3355,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+4"/>
+ <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</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>Hiba: a tranzakciót elutasították. Ezt az okozhatja, ha már elköltöttél valamennyi érmét a tárcádból például ha a wallet.dat-od egy másolatát használtad, és így az elköltés csak abban lett jelölve, de itt nem.</translation>
</message>
@@ -2725,17 +3374,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Parancs, amit akkor hajt végre, amikor egy tárca-tranzakció megváltozik (%s a parancsban lecserélődik a blokk TxID-re)</translation>
</message>
<message>
- <location line="+11"/>
- <source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source>
+ <location line="+18"/>
+ <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="+6"/>
- <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
+ <location line="+5"/>
+ <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+3"/>
<source>Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source>
<translation>Figyelem: a -paytxfee nagyon magas. Ennyi tranzakciós díjat fogsz fizetni, ha elküldöd a tranzakciót.</translation>
</message>
@@ -2765,17 +3414,27 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
+ <location line="+9"/>
+ <source>&lt;category&gt; can be:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
<source>Attempt to recover private keys from a corrupt wallet.dat</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
+ <source>Bitcoin Core Daemon</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Bitcoin RPC client version</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
<source>Block creation options:</source>
<translation type="unfinished"/>
</message>
@@ -2785,7 +3444,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Csatlakozás csak a megadott csomóponthoz</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
+ <source>Connect through SOCKS proxy</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect to JSON-RPC on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation type="unfinished"/>
</message>
@@ -2801,6 +3465,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+1"/>
+ <source>Do not load the wallet and disable wallet RPC calls</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Do you want to rebuild the block database now?</source>
<translation>Újra akarod építeni a blokk adatbázist most?</translation>
</message>
@@ -2842,7 +3511,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<message>
<location line="+1"/>
<source>Failed to listen on any port. Use -listen=0 if you want this.</source>
- <translation type="unfinished"/>
+ <translation>Egyik hálózati porton sem sikerül hallgatni. Használja a -listen=0 kapcsolót, ha ezt szeretné.</translation>
</message>
<message>
<location line="+1"/>
@@ -2895,7 +3564,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>A stornóadatok írása nem sikerült</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
+ <source>Fee per kB to add to transactions you send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Find peers using DNS lookup (default: 1 unless -connect)</source>
<translation type="unfinished"/>
</message>
@@ -2915,6 +3589,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Blokkellenőrzése részletessége (0-4, alapértelmezett: 3)</translation>
</message>
<message>
+ <location line="+1"/>
+ <source>If &lt;category&gt; is not supplied, output all debugging information.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+2"/>
<source>Incorrect or no genesis block found. Wrong datadir for network?</source>
<translation>Helytelen vagy nemlétező genézis blokk. Helytelen hálózati adatkönyvtár?</translation>
@@ -2930,17 +3609,37 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Nincs elég fájlleíró. </translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+5"/>
+ <source>Prepend debug output with timestamp (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>RPC client options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Rebuild block chain index from current blk000??.dat files</source>
<translation>Blokklánc index újraalkotása az alábbi blk000??.dat fájlokból</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+5"/>
+ <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Send command to Bitcoin server</source>
+ <translation>Parancs küldése a Bicoin szervernek</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Set maximum block size in bytes (default: %d)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
+ <location line="+2"/>
<source>Set the number of threads to service RPC calls (default: 4)</source>
<translation type="unfinished"/>
</message>
@@ -2952,15 +3651,20 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<message>
<location line="+2"/>
<source>Start Bitcoin server</source>
+ <translation>Bitcoin szerver indítása</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>This is intended for regression testing tools and app development.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+12"/>
+ <location line="+10"/>
<source>Usage (deprecated, use bitcoin-cli):</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+8"/>
+ <location line="+7"/>
<source>Verifying blocks...</source>
<translation>Blokkok ellenőrzése...</translation>
</message>
@@ -2971,31 +3675,56 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+1"/>
+ <source>Wait for RPC server to start</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Wallet %s resides outside data directory %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+2"/>
+ <source>Wallet options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>You need to rebuild the database using -reindex to change -txindex</source>
<translation>Az adatbázist újra kell építeni -reindex használatával (módosítás -tindex).</translation>
</message>
<message>
- <location line="-78"/>
+ <location line="-79"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-98"/>
+ <location line="-105"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+17"/>
+ <location line="+14"/>
+ <source>Output debugging information (default: 0, supplying &lt;category&gt; is optional)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
<translation>Szkriptellenőrzési szálak számának beállítása (maximum 16, 0 = automatikus, &lt;0 = szabadon hagyott magok száma, alapértelmezett: 0)</translation>
</message>
<message>
- <location line="+83"/>
+ <location line="+89"/>
<source>Information</source>
<translation>Információ</translation>
</message>
@@ -3035,47 +3764,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<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>Időbélyeges hibakeresési kimenet hozzáadása az elejéhez</translation>
- </message>
- <message>
- <location line="+5"/>
+ <location line="+9"/>
<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>
<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"/>
+ <location line="+4"/>
<source>Send trace/debug info to console instead of debug.log file</source>
<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>trace/debug információ küldése a debuggerre</translation>
- </message>
- <message>
- <location line="+5"/>
- <source>Set maximum block size in bytes (default: 250000)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+6"/>
<source>Set minimum block size in bytes (default: 0)</source>
<translation type="unfinished"/>
</message>
@@ -3100,7 +3799,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Rendszerhiba:</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Transaction amount too small</source>
<translation>Tranzakció összege túl alacsony</translation>
</message>
@@ -3125,33 +3824,33 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>UPnP-használat engedélyezése a figyelő port feltérképezésénél (default: 1 when listening)</translation>
</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>Felhasználói név JSON-RPC csatlakozásokhoz
</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+7"/>
<source>Warning</source>
<translation>Figyelem</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Warning: This version is obsolete, upgrade required!</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+2"/>
+ <source>version</source>
+ <translation>verzió</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>wallet.dat corrupt, salvage failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-54"/>
+ <location line="-58"/>
<source>Password for JSON-RPC connections</source>
<translation>Jelszó JSON-RPC csatlakozásokhoz
</translation>
@@ -3163,29 +3862,29 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<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="-126"/>
+ <location line="-132"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation>Parancs, amit akkor hajt végre, amikor a legjobb blokk megváltozik (%s a cmd-ban lecserélődik a blokk hash-re)</translation>
</message>
<message>
- <location line="+155"/>
+ <location line="+161"/>
<source>Upgrade wallet to latest format</source>
<translation>A Tárca frissítése a legfrissebb formátumra</translation>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation>Kulcskarika mérete &lt;n&gt; (alapértelmezett: 100)
</translation>
</message>
<message>
- <location line="-12"/>
+ <location line="-11"/>
<source>Rescan the block chain for missing wallet transactions</source>
<translation>Blokklánc újraszkennelése hiányzó tárca-tranzakciók után
</translation>
@@ -3197,7 +3896,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</translation>
</message>
<message>
- <location line="-29"/>
+ <location line="-30"/>
<source>Server certificate file (default: server.cert)</source>
<translation>Szervertanúsítvány-fájl (alapértelmezett: server.cert)
</translation>
@@ -3215,27 +3914,22 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Unable to bind to %s on this computer (bind returned error %d, %s)</source>
<translation>A %s nem elérhető ezen a gépen (bind returned error %d, %s)</translation>
</message>
<message>
- <location line="-95"/>
- <source>Connect through socks proxy</source>
- <translation>Csatlakozás SOCKS proxyn keresztül</translation>
- </message>
- <message>
- <location line="-11"/>
+ <location line="-107"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation>DNS-kikeresés engedélyezése az addnode-nál és a connect-nél</translation>
</message>
<message>
- <location line="+58"/>
+ <location line="+60"/>
<source>Loading addresses...</source>
<translation>Címek betöltése...</translation>
</message>
<message>
- <location line="-36"/>
+ <location line="-37"/>
<source>Error loading wallet.dat: Wallet corrupted</source>
<translation>Hiba a wallet.dat betöltése közben: meghibásodott tárca</translation>
</message>
@@ -3255,12 +3949,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Hiba az wallet.dat betöltése közben</translation>
</message>
<message>
- <location line="+30"/>
+ <location line="+31"/>
<source>Invalid -proxy address: &apos;%s&apos;</source>
<translation>Érvénytelen -proxy cím: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+57"/>
+ <location line="+56"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation>Ismeretlen hálózat lett megadva -onlynet: &apos;%s&apos;</translation>
</message>
@@ -3270,7 +3964,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Ismeretlen -socks proxy kérése: %i</translation>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation>Csatlakozási cím (-bind address) feloldása nem sikerült: &apos;%s&apos;</translation>
</message>
@@ -3280,7 +3974,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Külső cím (-externalip address) feloldása nem sikerült: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+46"/>
+ <location line="+48"/>
<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>
@@ -3300,27 +3994,22 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Blokkindex betöltése...</translation>
</message>
<message>
- <location line="-60"/>
+ <location line="-62"/>
<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>
<message>
- <location line="-28"/>
+ <location line="-32"/>
<source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source>
<translation>A %s nem elérhető ezen a gépen. A Bitcoin valószínűleg fut már.</translation>
</message>
<message>
- <location line="+69"/>
- <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="+20"/>
+ <location line="+95"/>
<source>Loading wallet...</source>
<translation>Tárca betöltése...</translation>
</message>
<message>
- <location line="-54"/>
+ <location line="-56"/>
<source>Cannot downgrade wallet</source>
<translation>Nem sikerült a Tárca visszaállítása a korábbi verzióra</translation>
</message>
@@ -3330,7 +4019,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Nem sikerült az alapértelmezett címet írni.</translation>
</message>
<message>
- <location line="+66"/>
+ <location line="+67"/>
<source>Rescanning...</source>
<translation>Újraszkennelés...</translation>
</message>
@@ -3350,7 +4039,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Hiba</translation>
</message>
<message>
- <location line="-33"/>
+ <location line="-35"/>
<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_id_ID.ts b/src/qt/locale/bitcoin_id_ID.ts
index dc4222cbff..6c28be4dc8 100644
--- a/src/qt/locale/bitcoin_id_ID.ts
+++ b/src/qt/locale/bitcoin_id_ID.ts
@@ -3,13 +3,13 @@
<name>AboutDialog</name>
<message>
<location filename="../forms/aboutdialog.ui" line="+14"/>
- <source>About Bitcoin</source>
- <translation>Mengenai Bitcoin</translation>
+ <source>About Bitcoin Core</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+39"/>
- <source>&lt;b&gt;Bitcoin&lt;/b&gt; version</source>
- <translation>Versi &lt;b&gt;Bitcoin&lt;/b&gt;</translation>
+ <source>&lt;b&gt;Bitcoin Core&lt;/b&gt; version</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+57"/>
@@ -22,13 +22,13 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location filename="../aboutdialog.cpp" line="+14"/>
+ <location filename="../utilitydialog.cpp" line="+29"/>
<source>Copyright</source>
- <translation type="unfinished"/>
+ <translation>Copyright</translation>
</message>
<message>
<location line="+0"/>
- <source>The Bitcoin developers</source>
+ <source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
</context>
@@ -52,7 +52,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+11"/>
<source>Copy the currently selected address to the system clipboard</source>
- <translation>Salin alamat terpilih ke salinan sistem</translation>
+ <translation>Salin alamat yang dipilih ke clipboard</translation>
</message>
<message>
<location line="+3"/>
@@ -65,7 +65,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location filename="../addressbookpage.cpp" line="+72"/>
+ <location filename="../addressbookpage.cpp" line="+74"/>
<source>&amp;Copy Address</source>
<translation>&amp;Salin Alamat</translation>
</message>
@@ -135,30 +135,30 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>&amp;Ubah</translation>
</message>
<message>
- <location line="+197"/>
+ <location line="+194"/>
<source>Export Address List</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
<source>Comma separated file (*.csv)</source>
- <translation>Berkas CSV (*.csv)</translation>
+ <translation>File CSV (*.csv)</translation>
</message>
<message>
<location line="+13"/>
- <source>Error exporting</source>
- <translation>Gagal mengekspor</translation>
+ <source>Exporting Failed</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation>Tidak dapat menyimpan ke berkas %1.</translation>
+ <location line="+1"/>
+ <source>There was an error trying to save the address list to %1.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<name>AddressTableModel</name>
<message>
- <location filename="../addresstablemodel.cpp" line="+164"/>
+ <location filename="../addresstablemodel.cpp" line="+168"/>
<source>Label</source>
<translation>Label</translation>
</message>
@@ -196,7 +196,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Ulangi kata kunci baru</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="+34"/>
+ <location filename="../askpassphrasedialog.cpp" line="+40"/>
<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>Masukkan kata kunci baru ke dompet.&lt;br/&gt;Mohon gunakan kata kunci dengan &lt;b&gt;10 karakter atau lebih dengan acak&lt;/b&gt;, atau &lt;b&gt;delapan kata atau lebih&lt;/b&gt;.</translation>
</message>
@@ -317,22 +317,27 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+250"/>
+ <location filename="../bitcoingui.cpp" line="+295"/>
<source>Sign &amp;message...</source>
<translation>Pesan &amp;penanda...</translation>
</message>
<message>
- <location line="+254"/>
+ <location line="+335"/>
<source>Synchronizing with network...</source>
<translation>Sinkronisasi dengan jaringan...</translation>
</message>
<message>
- <location line="-324"/>
+ <location line="-407"/>
<source>&amp;Overview</source>
<translation>&amp;Kilasan</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="-137"/>
+ <source>Node</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+138"/>
<source>Show general overview of wallet</source>
<translation>Tampilkan kilasan umum dari dompet</translation>
</message>
@@ -347,7 +352,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Jelajah sejarah transaksi</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>E&amp;xit</source>
<translation>K&amp;eluar</translation>
</message>
@@ -393,22 +398,37 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>&amp;Ubah Kata Kunci...</translation>
</message>
<message>
- <location line="+259"/>
+ <location line="+10"/>
+ <source>&amp;Sending addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Receiving addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open &amp;URI...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+325"/>
<source>Importing blocks from disk...</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
<source>Reindexing blocks on disk...</source>
- <translation type="unfinished"/>
+ <translation>Mengindex ulang block di harddisk...</translation>
</message>
<message>
- <location line="-322"/>
+ <location line="-405"/>
<source>Send coins to a Bitcoin address</source>
<translation>Kirim koin ke alamat Bitcoin</translation>
</message>
<message>
- <location line="+47"/>
+ <location line="+49"/>
<source>Modify configuration options for Bitcoin</source>
<translation>Ubah pilihan konfigurasi untuk Bitcoin</translation>
</message>
@@ -438,20 +458,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>&amp;Verifikasi pesan...</translation>
</message>
<message>
- <location line="-180"/>
- <location line="+6"/>
- <location line="+513"/>
+ <location line="+430"/>
<source>Bitcoin</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-519"/>
- <location line="+6"/>
+ <location line="-643"/>
<source>Wallet</source>
<translation>Dompet</translation>
</message>
<message>
- <location line="+109"/>
+ <location line="+146"/>
<source>&amp;Send</source>
<translation type="unfinished"/>
</message>
@@ -461,13 +478,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+28"/>
- <location line="+2"/>
- <source>&amp;About Bitcoin</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+14"/>
+ <location line="+46"/>
<location line="+2"/>
<source>&amp;Show / Hide</source>
<translation type="unfinished"/>
@@ -493,64 +504,80 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+35"/>
+ <location line="+48"/>
<source>&amp;File</source>
<translation>&amp;Berkas</translation>
</message>
<message>
- <location line="+10"/>
+ <location line="+14"/>
<source>&amp;Settings</source>
<translation>&amp;Pengaturan</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>&amp;Help</source>
<translation>&amp;Bantuan</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+15"/>
<source>Tabs toolbar</source>
<translation>Baris tab</translation>
</message>
<message>
- <location line="-235"/>
- <location line="+294"/>
+ <location line="-284"/>
+ <location line="+376"/>
<source>[testnet]</source>
<translation>[testnet]</translation>
</message>
<message>
- <location line="-177"/>
+ <location line="-401"/>
+ <source>Bitcoin Core</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+163"/>
<source>Request payments (generates QR codes and bitcoin: URIs)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+63"/>
- <source>&amp;Used sending addresses...</source>
+ <location line="+29"/>
+ <location line="+2"/>
+ <source>&amp;About Bitcoin Core</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="+35"/>
<source>Show the list of used sending addresses and labels</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Used &amp;receiving addresses...</source>
+ <location line="+2"/>
+ <source>Show the list of used receiving addresses and labels</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open a bitcoin: URI or payment request</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Command-line options</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
- <source>Show the list of used receiving addresses and labels</source>
+ <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+106"/>
+ <location line="+159"/>
<location line="+5"/>
<source>Bitcoin client</source>
<translation>Klien Bitcoin</translation>
</message>
<message numerus="yes">
- <location line="+120"/>
+ <location line="+142"/>
<source>%n active connection(s) to Bitcoin network</source>
<translation><numerusform>%n hubungan aktif ke jaringan Bitcoin</numerusform></translation>
</message>
@@ -570,7 +597,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+20"/>
+ <location line="+23"/>
<source>%n hour(s)</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
@@ -590,7 +617,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
+ <location line="+21"/>
<source>Last received block was generated %1 ago.</source>
<translation type="unfinished"/>
</message>
@@ -612,30 +639,20 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+3"/>
<source>Information</source>
- <translation type="unfinished"/>
+ <translation>Informasi</translation>
</message>
<message>
- <location line="+77"/>
- <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="-152"/>
+ <location line="-85"/>
<source>Up to date</source>
<translation>Terbaru</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Catching up...</source>
<translation>Menyusul...</translation>
</message>
<message>
- <location line="+124"/>
- <source>Confirm transaction fee</source>
- <translation>Konfirmasi biaya transaksi</translation>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+130"/>
<source>Sent transaction</source>
<translation>Transaksi terkirim</translation>
</message>
@@ -658,17 +675,7 @@ Alamat: %4
</translation>
</message>
<message>
- <location line="+34"/>
- <source>URI handling</source>
- <translation>Penanganan URI</translation>
- </message>
- <message>
- <location line="+0"/>
- <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="+45"/>
+ <location line="+69"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation>Dompet saat ini &lt;b&gt;terenkripsi&lt;/b&gt; dan &lt;b&gt;terbuka&lt;/b&gt;</translation>
</message>
@@ -678,7 +685,7 @@ Alamat: %4
<translation>Dompet saat ini &lt;b&gt;terenkripsi&lt;/b&gt; dan &lt;b&gt;terkunci&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+110"/>
+ <location filename="../bitcoin.cpp" line="+438"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation type="unfinished"/>
</message>
@@ -686,12 +693,304 @@ Alamat: %4
<context>
<name>ClientModel</name>
<message>
- <location filename="../clientmodel.cpp" line="+115"/>
+ <location filename="../clientmodel.cpp" line="+119"/>
<source>Network Alert</source>
<translation>Notifikasi Jaringan</translation>
</message>
</context>
<context>
+ <name>CoinControlDialog</name>
+ <message>
+ <location filename="../forms/coincontroldialog.ui" line="+14"/>
+ <source>Coin Control Address Selection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>Quantity:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Bytes:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>Amount:</source>
+ <translation>Jumlah:</translation>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Priority:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Low Output:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>After Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Change:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+63"/>
+ <source>(un)select all</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Tree mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>List mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>Amount</source>
+ <translation>Jumlah</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Address</source>
+ <translation>Alamat</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Date</source>
+ <translation>Tanggal</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Confirmations</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Confirmed</source>
+ <translation>Terkonfirmasi</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../coincontroldialog.cpp" line="+42"/>
+ <source>Copy address</source>
+ <translation>Salin alamat</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy label</source>
+ <translation>Salin label</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+26"/>
+ <source>Copy amount</source>
+ <translation>Salin jumlah</translation>
+ </message>
+ <message>
+ <location line="-25"/>
+ <source>Copy transaction ID</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Lock unspent</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Unlock unspent</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+22"/>
+ <source>Copy quantity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Copy fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy after fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy bytes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy low output</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy change</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+323"/>
+ <source>highest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>higher</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>high</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>medium-high</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>medium</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>low-medium</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>low</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>lower</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>lowest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>(%1 locked)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+140"/>
+ <source>Dust</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>yes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>no</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>This label turns red, if the transaction size is greater than 1000 bytes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+5"/>
+ <source>This means a fee of at least %1 per kB is required.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-4"/>
+ <source>Can vary +/- 1 byte per input.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Transactions with higher priority are more likely to get included into a block.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>This label turns red, if the priority is smaller than &quot;medium&quot;.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>This label turns red, if any recipient receives an amount smaller than %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+4"/>
+ <source>This means a fee of at least %1 is required.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-3"/>
+ <source>Amounts below 0.546 times the minimum relay fee are shown as dust.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>This label turns red, if the change is smaller than %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
+ <location line="+66"/>
+ <source>(no label)</source>
+ <translation>(tidak ada label)</translation>
+ </message>
+ <message>
+ <location line="-9"/>
+ <source>change from %1 (%2)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>(change)</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>EditAddressDialog</name>
<message>
<location filename="../forms/editaddressdialog.ui" line="+14"/>
@@ -719,7 +1018,7 @@ Alamat: %4
<translation>&amp;Alamat</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+21"/>
+ <location filename="../editaddressdialog.cpp" line="+28"/>
<source>New receiving address</source>
<translation>Alamat menerima baru</translation>
</message>
@@ -762,7 +1061,7 @@ Alamat: %4
<context>
<name>FreespaceChecker</name>
<message>
- <location filename="../intro.cpp" line="+61"/>
+ <location filename="../intro.cpp" line="+65"/>
<source>A new data directory will be created.</source>
<translation type="unfinished"/>
</message>
@@ -788,15 +1087,19 @@ Alamat: %4
</message>
</context>
<context>
- <name>GUIUtil::HelpMessageBox</name>
+ <name>HelpMessageDialog</name>
<message>
- <location filename="../guiutil.cpp" line="+558"/>
- <location line="+13"/>
- <source>Bitcoin-Qt</source>
- <translation>Bitcoin-Qt</translation>
+ <location filename="../forms/helpmessagedialog.ui" line="+19"/>
+ <source>Bitcoin Core - Command-line options</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="-13"/>
+ <location filename="../utilitydialog.cpp" line="+38"/>
+ <source>Bitcoin Core</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
<source>version</source>
<translation>versi</translation>
</message>
@@ -845,17 +1148,17 @@ Alamat: %4
</message>
<message>
<location line="+9"/>
- <source>Welcome to Bitcoin-Qt.</source>
+ <source>Welcome to Bitcoin Core.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+26"/>
- <source>As this is the first time the program is launched, you can choose where Bitcoin-Qt will store its data.</source>
+ <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+10"/>
- <source>Bitcoin-Qt will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
+ <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -869,7 +1172,17 @@ Alamat: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../intro.cpp" line="+105"/>
+ <location filename="../intro.cpp" line="+85"/>
+ <source>Bitcoin</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error: Specified data directory &quot;%1&quot; can not be created.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+19"/>
<source>Error</source>
<translation>Gagal</translation>
</message>
@@ -885,6 +1198,34 @@ Alamat: %4
</message>
</context>
<context>
+ <name>OpenURIDialog</name>
+ <message>
+ <location filename="../forms/openuridialog.ui" line="+14"/>
+ <source>Open URI</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Open payment request from URI or file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>URI:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Select payment request file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../openuridialog.cpp" line="+47"/>
+ <source>Select payment request file to open</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OptionsDialog</name>
<message>
<location filename="../forms/optionsdialog.ui" line="+14"/>
@@ -892,7 +1233,7 @@ Alamat: %4
<translation>Pilihan</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+13"/>
<source>&amp;Main</source>
<translation>&amp;Utama</translation>
</message>
@@ -917,57 +1258,87 @@ Alamat: %4
<translation>&amp;Menyalakan Bitcoin pada login sistem</translation>
</message>
<message>
- <location line="+35"/>
- <source>Reset all client options to default.</source>
+ <location line="+9"/>
+ <source>Size of &amp;database cache</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>&amp;Reset Options</source>
+ <location line="+13"/>
+ <source>Set database cache size in megabytes (default: 25)</source>
+ <translation>Atur ukuran tembolok dalam megabyte (standar: 25)</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>MB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Number of script &amp;verification threads</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+13"/>
- <source>&amp;Network</source>
- <translation>&amp;Jaringan</translation>
+ <source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</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>
+ <location line="+58"/>
+ <source>Connect to the Bitcoin network through a SOCKS proxy.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
- <source>Map port using &amp;UPnP</source>
- <translation>Petakan port dengan &amp;UPnP</translation>
+ <source>&amp;Connect through SOCKS proxy (default proxy):</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>
+ <location line="+34"/>
+ <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+224"/>
+ <source>Active command-line options that override above options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
+ <source>Reset all client options to default.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
- <source>&amp;Connect through SOCKS proxy:</source>
- <translation>&amp;Hubungkan melalui proxy SOCKS:</translation>
+ <source>&amp;Reset Options</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+9"/>
- <source>Proxy &amp;IP:</source>
- <translation>IP Proxy:</translation>
+ <location line="-323"/>
+ <source>&amp;Network</source>
+ <translation>&amp;Jaringan</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>Otomatis membuka port client Bitcoin di router. Hanya berjalan apabila router anda mendukung UPnP dan di-enable.</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Map port using &amp;UPnP</source>
+ <translation>Petakan port dengan &amp;UPnP</translation>
</message>
<message>
<location line="+19"/>
- <source>IP address of the proxy (e.g. 127.0.0.1)</source>
- <translation>Alamat IP proxy (cth. 127.0.0.1)</translation>
+ <source>Proxy &amp;IP:</source>
+ <translation>IP Proxy:</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+32"/>
<source>&amp;Port:</source>
<translation>&amp;Port:</translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+25"/>
<source>Port of the proxy (e.g. 9050)</source>
<translation>Port proxy (cth. 9050)</translation>
</message>
@@ -1042,7 +1413,17 @@ Alamat: %4
<translation>&amp;Tampilkan alamat dalam daftar transaksi</translation>
</message>
<message>
- <location line="+71"/>
+ <location line="+7"/>
+ <source>Whether to show coin control features or not.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Display coin &amp;control features (experts only)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+136"/>
<source>&amp;OK</source>
<translation>&amp;YA</translation>
</message>
@@ -1052,46 +1433,40 @@ Alamat: %4
<translation>&amp;Batal</translation>
</message>
<message>
- <location line="+10"/>
- <source>&amp;Apply</source>
- <translation>&amp;Terapkan</translation>
- </message>
- <message>
- <location filename="../optionsdialog.cpp" line="+58"/>
+ <location filename="../optionsdialog.cpp" line="+67"/>
<source>default</source>
<translation>standar</translation>
</message>
<message>
- <location line="+130"/>
- <source>Confirm options reset</source>
+ <location line="+57"/>
+ <source>none</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Some settings may require a client restart to take effect.</source>
+ <location line="+75"/>
+ <source>Confirm options reset</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>Do you want to proceed?</source>
+ <location line="+1"/>
+ <location line="+29"/>
+ <source>Client restart required to activate changes.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
- <location line="+9"/>
- <source>Warning</source>
- <translation>Peringatan</translation>
+ <location line="-29"/>
+ <source>Client will be shutdown, do you want to proceed?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="-9"/>
- <location line="+9"/>
- <source>This setting will take effect after restarting Bitcoin.</source>
+ <location line="+33"/>
+ <source>This change would require a client restart.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+29"/>
+ <location line="+34"/>
<source>The supplied proxy address is invalid.</source>
- <translation type="unfinished"/>
+ <translation>Alamat proxy yang diisi tidak valid.</translation>
</message>
</context>
<context>
@@ -1103,22 +1478,22 @@ Alamat: %4
</message>
<message>
<location line="+50"/>
- <location line="+202"/>
+ <location line="+231"/>
<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>Informasi terlampir mungkin sudah kedaluwarsa. Dompet Anda secara otomatis mensinkronisasi dengan jaringan Bitcoin ketika sebuah hubungan terbentuk, namun proses ini belum selesai.</translation>
</message>
<message>
- <location line="-131"/>
+ <location line="-155"/>
<source>Unconfirmed:</source>
<translation>Tidak terkonfirmasi:</translation>
</message>
<message>
- <location line="-78"/>
+ <location line="-83"/>
<source>Wallet</source>
<translation>Dompet</translation>
</message>
<message>
- <location line="+49"/>
+ <location line="+51"/>
<source>Confirmed:</source>
<translation type="unfinished"/>
</message>
@@ -1128,12 +1503,12 @@ Alamat: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+29"/>
+ <location line="+32"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+16"/>
<source>Immature:</source>
<translation type="unfinished"/>
</message>
@@ -1143,7 +1518,7 @@ Alamat: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+16"/>
<source>Total:</source>
<translation type="unfinished"/>
</message>
@@ -1153,12 +1528,12 @@ Alamat: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+53"/>
+ <location line="+71"/>
<source>&lt;b&gt;Recent transactions&lt;/b&gt;</source>
<translation>&lt;b&gt;Transaksi sebelumnya&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../overviewpage.cpp" line="+116"/>
+ <location filename="../overviewpage.cpp" line="+120"/>
<location line="+1"/>
<source>out of sync</source>
<translation>tidak tersinkron</translation>
@@ -1167,7 +1542,8 @@ Alamat: %4
<context>
<name>PaymentServer</name>
<message>
- <location filename="../paymentserver.cpp" line="+392"/>
+ <location filename="../paymentserver.cpp" line="+403"/>
+ <location line="+13"/>
<source>URI handling</source>
<translation>Penanganan URI</translation>
</message>
@@ -1177,45 +1553,82 @@ Alamat: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+69"/>
+ <location line="+96"/>
<source>Requested payment amount of %1 is too small (considered dust).</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
- <location line="+37"/>
+ <location line="-221"/>
+ <location line="+212"/>
+ <location line="+13"/>
+ <location line="+95"/>
+ <location line="+18"/>
+ <location line="+16"/>
<source>Payment request error</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="-353"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Net manager warning</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+1"/>
- <source>Insecure requests to custom payment scripts unsupported</source>
+ <source>Your active proxy doesn&apos;t support SOCKS5, which is required for payment requests via proxy.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+38"/>
+ <location line="+52"/>
+ <source>Payment request fetch URL is invalid: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Payment request file handling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Payment request file can not be read or processed! This can be caused by an invalid payment request file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+73"/>
+ <source>Unverified payment requests to custom payment scripts are unsupported.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+59"/>
<source>Refund from %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
+ <location line="+43"/>
<source>Error communicating with %1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+24"/>
+ <source>Payment request can not be parsed or processed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
<source>Bad response from server %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+32"/>
+ <location line="+33"/>
<source>Payment acknowledged</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-58"/>
- <location line="+30"/>
- <location line="+17"/>
+ <location line="-11"/>
<source>Network request error</source>
<translation type="unfinished"/>
</message>
@@ -1223,32 +1636,26 @@ Alamat: %4
<context>
<name>QObject</name>
<message>
- <location filename="../bitcoin.cpp" line="+114"/>
- <location line="+5"/>
- <location filename="../intro.cpp" line="-32"/>
+ <location filename="../bitcoin.cpp" line="+71"/>
+ <location line="+11"/>
<source>Bitcoin</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-4"/>
+ <location line="+1"/>
<source>Error: Specified data directory &quot;%1&quot; does not exist.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="-12"/>
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../intro.cpp" line="+1"/>
- <source>Error: Specified data directory &quot;%1&quot; can not be created.</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>QRImageWidget</name>
<message>
- <location filename="../receiverequestdialog.cpp" line="+32"/>
+ <location filename="../receiverequestdialog.cpp" line="+36"/>
<source>&amp;Save Image...</source>
<translation type="unfinished"/>
</message>
@@ -1264,8 +1671,8 @@ Alamat: %4
</message>
<message>
<location line="+0"/>
- <source>PNG Images (*.png)</source>
- <translation>Gambar PNG (*.png)</translation>
+ <source>PNG Image (*.png)</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1282,15 +1689,16 @@ Alamat: %4
<location line="+23"/>
<location line="+23"/>
<location line="+36"/>
- <location line="+53"/>
+ <location line="+23"/>
+ <location line="+36"/>
<location line="+23"/>
<location line="+23"/>
- <location filename="../rpcconsole.cpp" line="+352"/>
+ <location filename="../rpcconsole.cpp" line="+359"/>
<source>N/A</source>
<translation>T/S</translation>
</message>
<message>
- <location line="-217"/>
+ <location line="-223"/>
<source>Client version</source>
<translation>Versi Klien</translation>
</message>
@@ -1300,7 +1708,17 @@ Alamat: %4
<translation>&amp;Informasi</translation>
</message>
<message>
- <location line="+68"/>
+ <location line="-10"/>
+ <source>Debug window</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+25"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+53"/>
<source>Using OpenSSL version</source>
<translation type="unfinished"/>
</message>
@@ -1316,16 +1734,16 @@ Alamat: %4
</message>
<message>
<location line="+7"/>
- <source>Number of connections</source>
- <translation>Jumlah hubungan</translation>
+ <source>Name</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+23"/>
- <source>On testnet</source>
- <translation>Pada testnet</translation>
+ <source>Number of connections</source>
+ <translation>Jumlah hubungan</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+29"/>
<source>Block chain</source>
<translation>Rantai blok</translation>
</message>
@@ -1350,21 +1768,6 @@ Alamat: %4
<translation>&amp;Buka</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;Konsol</translation>
@@ -1395,22 +1798,12 @@ Alamat: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-541"/>
+ <location line="-521"/>
<source>Build date</source>
<translation>Tanggal pembuatan</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"/>
+ <location line="+206"/>
<source>Debug log file</source>
<translation type="unfinished"/>
</message>
@@ -1420,7 +1813,7 @@ Alamat: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+102"/>
+ <location line="+76"/>
<source>Clear console</source>
<translation>Bersihkan konsol</translation>
</message>
@@ -1440,7 +1833,7 @@ Alamat: %4
<translation>Ketik &lt;b&gt;help&lt;/b&gt; untuk menampilkan perintah tersedia.</translation>
</message>
<message>
- <location line="+128"/>
+ <location line="+122"/>
<source>%1 B</source>
<translation type="unfinished"/>
</message>
@@ -1478,48 +1871,48 @@ Alamat: %4
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+22"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
<source>&amp;Amount:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
- <source>The amount to request</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+7"/>
+ <location line="-13"/>
<source>&amp;Label:</source>
<translation>&amp;Label:</translation>
</message>
<message>
- <location line="+10"/>
- <source>The label to associate with the receiving address</source>
+ <location line="-34"/>
+ <source>&amp;Message:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>&amp;Message:</source>
+ <location line="-17"/>
+ <source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>The message to attach to payment request</source>
+ <location line="+3"/>
+ <source>R&amp;euse an existing receiving address (not recommended)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
- <source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
+ <location line="+27"/>
+ <source>An optional label to associate with the new receiving address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>R&amp;euse an existing receiving address (not recommended)</source>
+ <location line="+7"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+7"/>
- <source>Use this form to request payments. All fields are optional.</source>
+ <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+39"/>
+ <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1537,6 +1930,31 @@ Alamat: %4
<source>&amp;Request payment</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+47"/>
+ <source>Requested payments</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Show the selected request (does the same as double clicking an entry)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Show</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Remove the selected entries from the list</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Remove</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
@@ -1557,16 +1975,11 @@ Alamat: %4
</message>
<message>
<location line="+7"/>
- <source>&amp;Copy Image</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+7"/>
<source>&amp;Save Image...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../receiverequestdialog.cpp" line="+58"/>
+ <location filename="../receiverequestdialog.cpp" line="+56"/>
<source>Request payment to %1</source>
<translation type="unfinished"/>
</message>
@@ -1598,7 +2011,7 @@ Alamat: %4
<message>
<location line="+2"/>
<source>Message</source>
- <translation type="unfinished"/>
+ <translation>Pesan</translation>
</message>
<message>
<location line="+10"/>
@@ -1612,16 +2025,119 @@ Alamat: %4
</message>
</context>
<context>
+ <name>RecentRequestsTableModel</name>
+ <message>
+ <location filename="../recentrequeststablemodel.cpp" line="+24"/>
+ <source>Date</source>
+ <translation>Tanggal</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Label</source>
+ <translation>Label</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Message</source>
+ <translation>Pesan:</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Amount</source>
+ <translation>Jumlah</translation>
+ </message>
+ <message>
+ <location line="+38"/>
+ <source>(no label)</source>
+ <translation>(tidak ada label)</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>(no message)</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+140"/>
- <location line="+213"/>
+ <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location line="+80"/>
<source>Send Coins</source>
<translation>Kirim Koin</translation>
</message>
<message>
- <location line="+50"/>
+ <location line="+76"/>
+ <source>Coin Control Features</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Inputs...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>automatically selected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Insufficient funds!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+89"/>
+ <source>Quantity:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+35"/>
+ <source>Bytes:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Amount:</source>
+ <translation>Jumlah:</translation>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Priority:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Low Output:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>After Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Change:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+44"/>
+ <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Custom change address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+115"/>
<source>Send to multiple recipients at once</source>
<translation>Kirim ke beberapa penerima sekaligus</translation>
</message>
@@ -1646,12 +2162,7 @@ Alamat: %4
<translation>Saldo:</translation>
</message>
<message>
- <location line="+10"/>
- <source>123.456 BTC</source>
- <translation>123.456 BTC</translation>
- </message>
- <message>
- <location line="+31"/>
+ <location line="+41"/>
<source>Confirm the send action</source>
<translation>Konfirmasi aksi pengiriman</translation>
</message>
@@ -1661,69 +2172,135 @@ Alamat: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-154"/>
+ <location filename="../sendcoinsdialog.cpp" line="-228"/>
<source>Confirm send coins</source>
<translation>Konfirmasi pengiriman koin</translation>
</message>
<message>
- <location line="-90"/>
+ <location line="-74"/>
<location line="+5"/>
<location line="+5"/>
+ <location line="+4"/>
<source>%1 to %2</source>
+ <translation>%1 ke %2</translation>
+ </message>
+ <message>
+ <location line="-136"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation>Masukkan alamat Bitcoin (cth. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Copy quantity</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+26"/>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation>Salin jumlah</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy after fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy bytes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy low output</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy change</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+170"/>
+ <source>Total Amount %1 (= %2)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>or</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+202"/>
<source>The recipient address is not valid, please recheck.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The amount to pay must be larger than 0.</source>
<translation>Jumlah yang dibayar harus lebih besar dari 0.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The amount exceeds your balance.</source>
<translation>Jumlah melebihi saldo Anda.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The total exceeds your balance when the %1 transaction fee is included.</source>
<translation>Kelebihan total saldo Anda ketika biaya transaksi %1 ditambahkan.</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+3"/>
<source>Duplicate address found, can only send to each address once per send operation.</source>
<translation>Ditemukan alamat ganda, hanya dapat mengirim ke tiap alamat sekali per operasi pengiriman.</translation>
</message>
<message>
+ <location line="+3"/>
+ <source>Transaction creation failed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+4"/>
- <source>Error: Transaction creation failed!</source>
+ <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+15"/>
- <source>Are you sure you want to send?</source>
+ <location line="+112"/>
+ <source>Warning: Invalid Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+9"/>
- <source>added as transaction fee</source>
+ <location line="+21"/>
+ <source>(no label)</source>
+ <translation>(tidak ada label)</translation>
+ </message>
+ <message>
+ <location line="-11"/>
+ <source>Warning: Unknown change address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
- <source>Total Amount %1</source>
+ <location line="-366"/>
+ <source>Are you sure you want to send?</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+20"/>
- <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>Gagal: Transaksi ditolak. Ini mungkin terjadi jika beberapa dari koin dalam dompet Anda telah digunakan, seperti ketika Anda menggunakan salinan wallet.dat dan beberapa koin telah dibelanjakan dalam salinan tersebut tetapi disini tidak tertandai sebagai terpakai.</translation>
+ <location line="+9"/>
+ <source>added as transaction fee</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+144"/>
+ <location line="+170"/>
<source>Payment request expired</source>
<translation type="unfinished"/>
</message>
@@ -1736,39 +2313,44 @@ Alamat: %4
<context>
<name>SendCoinsEntry</name>
<message>
- <location filename="../forms/sendcoinsentry.ui" line="+33"/>
- <location line="+585"/>
+ <location filename="../forms/sendcoinsentry.ui" line="+131"/>
+ <location line="+521"/>
+ <location line="+536"/>
<source>A&amp;mount:</source>
<translation>J&amp;umlah:</translation>
</message>
<message>
- <location line="-572"/>
- <location line="+585"/>
+ <location line="-1152"/>
<source>Pay &amp;To:</source>
<translation>Kirim &amp;Ke:</translation>
</message>
<message>
- <location line="-551"/>
+ <location line="+18"/>
<source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../sendcoinsentry.cpp" line="+28"/>
+ <location filename="../sendcoinsentry.cpp" line="+30"/>
<source>Enter a label for this address to add it to your address book</source>
<translation>Masukkan label bagi alamat ini untuk menambahkannya ke buku alamat Anda</translation>
</message>
<message>
- <location filename="../forms/sendcoinsentry.ui" line="-18"/>
+ <location filename="../forms/sendcoinsentry.ui" line="+57"/>
<source>&amp;Label:</source>
<translation>&amp;Label:</translation>
</message>
<message>
- <location line="+28"/>
+ <location line="-50"/>
<source>Choose previously used address</source>
+ <translation>Pilih alamat yang telah digunakan sebelumnya</translation>
+ </message>
+ <message>
+ <location line="-40"/>
+ <source>This is a normal payment.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
+ <location line="+50"/>
<source>Alt+A</source>
<translation>Alt+J</translation>
</message>
@@ -1784,16 +2366,45 @@ Alamat: %4
</message>
<message>
<location line="+7"/>
- <source>Remove this recipient</source>
- <translation>Hapus penerima ini</translation>
+ <location line="+524"/>
+ <location line="+536"/>
+ <source>Remove this entry</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="-1008"/>
+ <source>Message:</source>
+ <translation>Pesan:</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+958"/>
+ <source>This is a verified payment request.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-991"/>
<source>Enter a label for this address to add it to the list of used addresses</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+465"/>
+ <location line="+459"/>
+ <source>This is an unverified payment request.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+18"/>
+ <location line="+532"/>
+ <source>Pay To:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-498"/>
+ <location line="+536"/>
<source>Memo:</source>
<translation type="unfinished"/>
</message>
@@ -1804,6 +2415,19 @@ Alamat: %4
</message>
</context>
<context>
+ <name>ShutdownWindow</name>
+ <message>
+ <location filename="../utilitydialog.cpp" line="+48"/>
+ <source>Bitcoin Core is shutting down...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Do not shut down the computer until this window disappears.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>SignVerifyMessageDialog</name>
<message>
<location filename="../forms/signverifymessagedialog.ui" line="+14"/>
@@ -1811,7 +2435,7 @@ Alamat: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+10"/>
<source>&amp;Sign Message</source>
<translation type="unfinished"/>
</message>
@@ -1829,7 +2453,7 @@ Alamat: %4
<location line="+10"/>
<location line="+213"/>
<source>Choose previously used address</source>
- <translation type="unfinished"/>
+ <translation>Pilih alamat yang telah digunakan sebelumnya</translation>
</message>
<message>
<location line="-203"/>
@@ -1914,7 +2538,7 @@ Alamat: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+27"/>
+ <location filename="../signverifymessagedialog.cpp" line="+29"/>
<location line="+3"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>Masukkan alamat Bitcoin (cth. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
@@ -1930,10 +2554,10 @@ Alamat: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+85"/>
+ <location line="+84"/>
<location line="+81"/>
<source>The entered address is invalid.</source>
- <translation type="unfinished"/>
+ <translation>Alamat yang dimasukkan tidak sesuai.</translation>
</message>
<message>
<location line="-81"/>
@@ -1941,7 +2565,7 @@ Alamat: %4
<location line="+73"/>
<location line="+8"/>
<source>Please check the address and try again.</source>
- <translation type="unfinished"/>
+ <translation>Silahkan periksa alamat dan coba lagi.</translation>
</message>
<message>
<location line="-81"/>
@@ -1999,8 +2623,13 @@ Alamat: %4
<context>
<name>SplashScreen</name>
<message>
- <location filename="../splashscreen.cpp" line="+23"/>
- <source>The Bitcoin developers</source>
+ <location filename="../splashscreen.cpp" line="+28"/>
+ <source>Bitcoin Core</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
<message>
@@ -2012,15 +2641,15 @@ Alamat: %4
<context>
<name>TrafficGraphWidget</name>
<message>
- <location filename="../trafficgraphwidget.cpp" line="+75"/>
+ <location filename="../trafficgraphwidget.cpp" line="+79"/>
<source>KB/s</source>
- <translation type="unfinished"/>
+ <translation>KB/s</translation>
</message>
</context>
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="+22"/>
+ <location filename="../transactiondesc.cpp" line="+28"/>
<source>Open until %1</source>
<translation>Buka hingga %1</translation>
</message>
@@ -2042,7 +2671,7 @@ Alamat: %4
<message>
<location line="+18"/>
<source>Status</source>
- <translation type="unfinished"/>
+ <translation>Status</translation>
</message>
<message numerus="yes">
<location line="+7"/>
@@ -2068,14 +2697,14 @@ Alamat: %4
<location line="+5"/>
<location line="+17"/>
<source>From</source>
- <translation type="unfinished"/>
+ <translation>Dari</translation>
</message>
<message>
<location line="+1"/>
<location line="+22"/>
<location line="+58"/>
<source>To</source>
- <translation type="unfinished"/>
+ <translation>Untuk</translation>
</message>
<message>
<location line="-77"/>
@@ -2093,12 +2722,12 @@ Alamat: %4
<location line="+12"/>
<location line="+45"/>
<location line="+17"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Credit</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="-120"/>
+ <location line="-125"/>
<source>matures in %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
@@ -2111,12 +2740,12 @@ Alamat: %4
<location line="+44"/>
<location line="+8"/>
<location line="+15"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Debit</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-57"/>
+ <location line="-62"/>
<source>Transaction fee</source>
<translation type="unfinished"/>
</message>
@@ -2127,11 +2756,12 @@ Alamat: %4
</message>
<message>
<location line="+6"/>
+ <location line="+9"/>
<source>Message</source>
- <translation type="unfinished"/>
+ <translation>Pesan:</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="-7"/>
<source>Comment</source>
<translation type="unfinished"/>
</message>
@@ -2141,7 +2771,7 @@ Alamat: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+18"/>
<source>Merchant</source>
<translation type="unfinished"/>
</message>
@@ -2158,7 +2788,7 @@ Alamat: %4
<message>
<location line="+8"/>
<source>Transaction</source>
- <translation type="unfinished"/>
+ <translation>Transaksi</translation>
</message>
<message>
<location line="+3"/>
@@ -2181,7 +2811,7 @@ Alamat: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-227"/>
+ <location line="-232"/>
<source>, has not been successfully broadcast yet</source>
<translation>, belum berhasil disiarkan</translation>
</message>
@@ -2212,7 +2842,7 @@ Alamat: %4
<context>
<name>TransactionTableModel</name>
<message>
- <location filename="../transactiontablemodel.cpp" line="+227"/>
+ <location filename="../transactiontablemodel.cpp" line="+234"/>
<source>Date</source>
<translation>Tanggal</translation>
</message>
@@ -2231,8 +2861,13 @@ Alamat: %4
<source>Amount</source>
<translation>Jumlah</translation>
</message>
+ <message>
+ <location line="+59"/>
+ <source>Immature (%1 confirmations, will be available after %2)</source>
+ <translation type="unfinished"/>
+ </message>
<message numerus="yes">
- <location line="+57"/>
+ <location line="+16"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
@@ -2252,17 +2887,13 @@ Alamat: %4
<translation>Tidak terkonfirmasi (%1 dari %2 konfirmasi)</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="-22"/>
+ <location line="+25"/>
<source>Confirmed (%1 confirmations)</source>
<translation>Terkonfirmasi (%1 konfirmasi)</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></translation>
- </message>
<message>
- <location line="+5"/>
+ <location line="-22"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation>Blok ini tidak diterima oleh node lainnya dan kemungkinan tidak akan diterima!</translation>
</message>
@@ -2272,7 +2903,7 @@ Alamat: %4
<translation>Terbuat tetapi tidak diterima</translation>
</message>
<message>
- <location line="+43"/>
+ <location line="+62"/>
<source>Received with</source>
<translation>Diterima dengan</translation>
</message>
@@ -2330,7 +2961,7 @@ Alamat: %4
<context>
<name>TransactionView</name>
<message>
- <location filename="../transactionview.cpp" line="+52"/>
+ <location filename="../transactionview.cpp" line="+57"/>
<location line="+16"/>
<source>All</source>
<translation>Semua</translation>
@@ -2391,12 +3022,12 @@ Alamat: %4
<translation>Lainnya</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+6"/>
<source>Enter address or label to search</source>
<translation>Masukkan alamat atau label untuk mencari</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+6"/>
<source>Min amount</source>
<translation>Jumlah min</translation>
</message>
@@ -2431,17 +3062,37 @@ Alamat: %4
<translation>Tampilkan rincian transaksi</translation>
</message>
<message>
- <location line="+143"/>
- <source>Export Transaction Data</source>
- <translation>Ekspor Data Transaksi</translation>
+ <location line="+142"/>
+ <source>Export Transaction History</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="+19"/>
+ <source>Exporting Failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>There was an error trying to save the transaction history to %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Exporting Successful</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The transaction history was successfully saved to %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-22"/>
<source>Comma separated file (*.csv)</source>
<translation>Berkas CSV (*.csv)</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+9"/>
<source>Confirmed</source>
<translation>Terkonfirmasi</translation>
</message>
@@ -2476,17 +3127,7 @@ Alamat: %4
<translation>ID</translation>
</message>
<message>
- <location line="+4"/>
- <source>Error exporting</source>
- <translation>Gagal mengekspor</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation>Tidak dapat menyimpan ke berkas %1.</translation>
- </message>
- <message>
- <location line="+100"/>
+ <location line="+107"/>
<source>Range:</source>
<translation>Jarak:</translation>
</message>
@@ -2497,9 +3138,17 @@ Alamat: %4
</message>
</context>
<context>
+ <name>WalletFrame</name>
+ <message>
+ <location filename="../walletframe.cpp" line="+26"/>
+ <source>No wallet has been loaded.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>WalletModel</name>
<message>
- <location filename="../walletmodel.cpp" line="+218"/>
+ <location filename="../walletmodel.cpp" line="+245"/>
<source>Send Coins</source>
<translation>Kirim Koin</translation>
</message>
@@ -2507,7 +3156,7 @@ Alamat: %4
<context>
<name>WalletView</name>
<message>
- <location filename="../walletview.cpp" line="+46"/>
+ <location filename="../walletview.cpp" line="+43"/>
<source>&amp;Export</source>
<translation type="unfinished"/>
</message>
@@ -2517,65 +3166,60 @@ Alamat: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+183"/>
+ <location line="+181"/>
<source>Backup Wallet</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
+ <location line="+1"/>
<source>Wallet Data (*.dat)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
+ <location line="+6"/>
<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>
+ <source>There was an error trying to save the wallet data to %1.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+4"/>
- <source>Backup Successful</source>
+ <source>The wallet data was successfully saved to %1.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+0"/>
- <source>The wallet data was successfully saved to the new location.</source>
+ <source>Backup Successful</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+102"/>
- <source>Bitcoin version</source>
- <translation>Versi Bitcoin</translation>
- </message>
- <message>
- <location line="+107"/>
+ <location filename="../bitcoinstrings.cpp" line="+221"/>
<source>Usage:</source>
<translation>Penggunaan:</translation>
</message>
<message>
- <location line="-55"/>
+ <location line="-54"/>
<source>List commands</source>
<translation>Daftar perintah</translation>
</message>
<message>
- <location line="-13"/>
+ <location line="-14"/>
<source>Get help for a command</source>
<translation>Dapatkan bantuan untuk perintah</translation>
</message>
<message>
- <location line="+25"/>
+ <location line="+26"/>
<source>Options:</source>
<translation>Pilihan:</translation>
</message>
<message>
- <location line="+24"/>
+ <location line="+22"/>
<source>Specify configuration file (default: bitcoin.conf)</source>
<translation>Tentukan berkas konfigurasi (standar: bitcoin.conf)</translation>
</message>
@@ -2595,7 +3239,7 @@ Alamat: %4
<translation>Atur ukuran tembolok dalam megabyte (standar: 25)</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-26"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
<translation>Menerima hubungan pada &lt;port&gt; (standar: 8333 atau testnet: 18333)</translation>
</message>
@@ -2605,7 +3249,7 @@ Alamat: %4
<translation>Mengatur hubungan paling banyak &lt;n&gt; ke peer (standar: 125)</translation>
</message>
<message>
- <location line="-49"/>
+ <location line="-51"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation>Hubungkan ke node untuk menerima alamat peer, dan putuskan</translation>
</message>
@@ -2615,37 +3259,37 @@ Alamat: %4
<translation>Tentukan alamat publik Anda sendiri</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation>Batas untuk memutuskan peer buruk (standar: 100)</translation>
</message>
<message>
- <location line="-142"/>
+ <location line="-148"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation>Jumlah kedua untuk menjaga peer buruk dari hubung-ulang (standar: 86400)</translation>
</message>
<message>
- <location line="-33"/>
+ <location line="-36"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+40"/>
+ <location line="+45"/>
<source>Accept command line and JSON-RPC commands</source>
<translation>Menerima perintah baris perintah dan JSON-RPC</translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>Berjalan dibelakang sebagai daemin dan menerima perintah</translation>
</message>
<message>
- <location line="+40"/>
+ <location line="+39"/>
<source>Use the test network</source>
<translation>Gunakan jaringan uji</translation>
</message>
@@ -2655,7 +3299,7 @@ Alamat: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-87"/>
+ <location line="-95"/>
<source>%s, you must set a rpcpassword in the configuration file:
%s
It is recommended you use the following random password:
@@ -2696,6 +3340,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+4"/>
+ <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</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>
@@ -2710,17 +3359,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+11"/>
- <source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source>
+ <location line="+18"/>
+ <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="+6"/>
- <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
+ <location line="+5"/>
+ <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+3"/>
<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>
@@ -2750,17 +3399,27 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
+ <location line="+9"/>
+ <source>&lt;category&gt; can be:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
<source>Attempt to recover private keys from a corrupt wallet.dat</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
+ <source>Bitcoin Core Daemon</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Bitcoin RPC client version</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
<source>Block creation options:</source>
<translation type="unfinished"/>
</message>
@@ -2770,7 +3429,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
+ <source>Connect through SOCKS proxy</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect to JSON-RPC on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation type="unfinished"/>
</message>
@@ -2786,6 +3450,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+1"/>
+ <source>Do not load the wallet and disable wallet RPC calls</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Do you want to rebuild the block database now?</source>
<translation type="unfinished"/>
</message>
@@ -2822,7 +3491,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<message>
<location line="+1"/>
<source>Error: system error: </source>
- <translation type="unfinished"/>
+ <translation>Error: system error:</translation>
</message>
<message>
<location line="+1"/>
@@ -2880,7 +3549,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
+ <source>Fee per kB to add to transactions you send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Find peers using DNS lookup (default: 1 unless -connect)</source>
<translation type="unfinished"/>
</message>
@@ -2900,6 +3574,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
+ <location line="+1"/>
+ <source>If &lt;category&gt; is not supplied, output all debugging information.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+2"/>
<source>Incorrect or no genesis block found. Wrong datadir for network?</source>
<translation type="unfinished"/>
@@ -2915,17 +3594,37 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+8"/>
+ <location line="+5"/>
+ <source>Prepend debug output with timestamp (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>RPC client options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Rebuild block chain index from current blk000??.dat files</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+5"/>
+ <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Send command to Bitcoin server</source>
+ <translation>Kirim perintah ke Bitcoin server</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Set maximum block size in bytes (default: %d)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
+ <location line="+2"/>
<source>Set the number of threads to service RPC calls (default: 4)</source>
<translation type="unfinished"/>
</message>
@@ -2937,15 +3636,20 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<message>
<location line="+2"/>
<source>Start Bitcoin server</source>
+ <translation>Mulai Bitcoin server</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>This is intended for regression testing tools and app development.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+12"/>
+ <location line="+10"/>
<source>Usage (deprecated, use bitcoin-cli):</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+8"/>
+ <location line="+7"/>
<source>Verifying blocks...</source>
<translation type="unfinished"/>
</message>
@@ -2956,33 +3660,58 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+1"/>
+ <source>Wait for RPC server to start</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Wallet %s resides outside data directory %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+2"/>
+ <source>Wallet options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>You need to rebuild the database using -reindex to change -txindex</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-78"/>
+ <location line="-79"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-98"/>
+ <location line="-105"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+17"/>
+ <location line="+14"/>
+ <source>Output debugging information (default: 0, supplying &lt;category&gt; is optional)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+83"/>
+ <location line="+89"/>
<source>Information</source>
- <translation type="unfinished"/>
+ <translation>Informasi</translation>
</message>
<message>
<location line="+4"/>
@@ -3020,47 +3749,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<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>Tambahkan keluaran debug dengan cap waktu</translation>
- </message>
- <message>
- <location line="+5"/>
+ <location line="+9"/>
<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"/>
+ <location line="+4"/>
<source>Send trace/debug info to console instead of debug.log file</source>
<translation>Kirim info lacak/debug ke konsol sebaliknya dari berkas debug.log</translation>
</message>
<message>
- <location line="+1"/>
- <source>Send trace/debug info to debugger</source>
- <translation>Kirim info lacak/debug ke debugger</translation>
- </message>
- <message>
- <location line="+5"/>
- <source>Set maximum block size in bytes (default: 250000)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+6"/>
<source>Set minimum block size in bytes (default: 0)</source>
<translation type="unfinished"/>
</message>
@@ -3085,7 +3784,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Transaction amount too small</source>
<translation type="unfinished"/>
</message>
@@ -3110,32 +3809,32 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<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>Nama pengguna untuk hubungan JSON-RPC</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+7"/>
<source>Warning</source>
<translation>Peringatan</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Warning: This version is obsolete, upgrade required!</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+2"/>
+ <source>version</source>
+ <translation>versi</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>wallet.dat corrupt, salvage failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-54"/>
+ <location line="-58"/>
<source>Password for JSON-RPC connections</source>
<translation>Kata sandi untuk hubungan JSON-RPC</translation>
</message>
@@ -3145,27 +3844,27 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Izinkan hubungan JSON-RPC dari alamat IP yang ditentukan</translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation>Kirim perintah ke node berjalan pada &lt;ip&gt; (standar: 127.0.0.1)</translation>
</message>
<message>
- <location line="-126"/>
+ <location line="-132"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation>Menjalankan perintah ketika perubahan blok terbaik (%s dalam cmd digantikan oleh hash blok)</translation>
</message>
<message>
- <location line="+155"/>
+ <location line="+161"/>
<source>Upgrade wallet to latest format</source>
<translation>Perbarui dompet ke format terbaru</translation>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation>Kirim ukuran kolam kunci ke &lt;n&gt; (standar: 100)</translation>
</message>
<message>
- <location line="-12"/>
+ <location line="-11"/>
<source>Rescan the block chain for missing wallet transactions</source>
<translation>Pindai ulang rantai-blok untuk transaksi dompet yang hilang</translation>
</message>
@@ -3175,7 +3874,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Gunakan OpenSSL (https) untuk hubungan JSON-RPC</translation>
</message>
<message>
- <location line="-29"/>
+ <location line="-30"/>
<source>Server certificate file (default: server.cert)</source>
<translation>Berkas sertifikat server (standar: server.cert)</translation>
</message>
@@ -3190,27 +3889,22 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Pesan bantuan ini</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Unable to bind to %s on this computer (bind returned error %d, %s)</source>
<translation>Tidak dapat mengikat ke %s dengan komputer ini (ikatan gagal %d, %s)</translation>
</message>
<message>
- <location line="-95"/>
- <source>Connect through socks proxy</source>
- <translation>Hubungkan melalui proxy socks</translation>
- </message>
- <message>
- <location line="-11"/>
+ <location line="-107"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation>Izinkan peninjauan DNS untuk -addnote, -seednode dan -connect</translation>
</message>
<message>
- <location line="+58"/>
+ <location line="+60"/>
<source>Loading addresses...</source>
<translation>Memuat alamat...</translation>
</message>
<message>
- <location line="-36"/>
+ <location line="-37"/>
<source>Error loading wallet.dat: Wallet corrupted</source>
<translation>Gagal memuat wallet.dat: Dompet rusak</translation>
</message>
@@ -3230,12 +3924,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Gagal memuat wallet.dat</translation>
</message>
<message>
- <location line="+30"/>
+ <location line="+31"/>
<source>Invalid -proxy address: &apos;%s&apos;</source>
<translation>Alamat -proxy salah: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+57"/>
+ <location line="+56"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation>Jaringan tidak diketahui yang ditentukan dalam -onlynet: &apos;%s&apos;</translation>
</message>
@@ -3245,7 +3939,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Diminta versi proxy -socks tidak diketahui: %i</translation>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation>Tidak dapat menyelesaikan alamat -bind: &apos;%s&apos;</translation>
</message>
@@ -3255,7 +3949,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Tidak dapat menyelesaikan alamat -externalip: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+46"/>
+ <location line="+48"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation>Jumlah salah untuk -paytxfee=&lt;amount&gt;: &apos;%s&apos;</translation>
</message>
@@ -3275,27 +3969,22 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Memuat indeks blok...</translation>
</message>
<message>
- <location line="-60"/>
+ <location line="-62"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation>Tambahkan node untuk dihubungkan dan upaya untuk menjaga hubungan tetap terbuka</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-32"/>
<source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+69"/>
- <source>Fee per KB to add to transactions you send</source>
- <translation>Biaya per KB untuk ditambahkan ke transaksi yang Anda kirim</translation>
- </message>
- <message>
- <location line="+20"/>
+ <location line="+95"/>
<source>Loading wallet...</source>
<translation>Memuat dompet...</translation>
</message>
<message>
- <location line="-54"/>
+ <location line="-56"/>
<source>Cannot downgrade wallet</source>
<translation>Tidak dapat menurunkan versi dompet</translation>
</message>
@@ -3305,7 +3994,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Tidak dapat menyimpan alamat standar</translation>
</message>
<message>
- <location line="+66"/>
+ <location line="+67"/>
<source>Rescanning...</source>
<translation>Memindai ulang...</translation>
</message>
@@ -3325,7 +4014,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Gagal</translation>
</message>
<message>
- <location line="-33"/>
+ <location line="-35"/>
<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 b0e143ce88..11d539d8c2 100644
--- a/src/qt/locale/bitcoin_it.ts
+++ b/src/qt/locale/bitcoin_it.ts
@@ -27,14 +27,14 @@ 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="+19"/>
+ <location filename="../utilitydialog.cpp" line="+29"/>
<source>Copyright</source>
<translation>Copyright</translation>
</message>
<message>
<location line="+0"/>
- <source>The Bitcoin developers</source>
- <translation>Sviluppatori di Bitcoin</translation>
+ <source>The Bitcoin Core developers</source>
+ <translation>Gli sviluppatori del Bitcoin Core</translation>
</message>
</context>
<context>
@@ -151,13 +151,13 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l&apos;uso
</message>
<message>
<location line="+13"/>
- <source>Error exporting</source>
- <translation>Errore nell&apos;esportazione</translation>
+ <source>Exporting Failed</source>
+ <translation>Esportazione Fallita.</translation>
</message>
<message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation>Impossibile scrivere sul file %1.</translation>
+ <location line="+1"/>
+ <source>There was an error trying to save the address list to %1.</source>
+ <translation>C&apos;è stato un errore tentanto di salvare la lista indirizzi in %1.</translation>
</message>
</context>
<context>
@@ -322,22 +322,27 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l&apos;uso
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+260"/>
+ <location filename="../bitcoingui.cpp" line="+295"/>
<source>Sign &amp;message...</source>
<translation>Firma il &amp;messaggio...</translation>
</message>
<message>
- <location line="+290"/>
+ <location line="+335"/>
<source>Synchronizing with network...</source>
<translation>Sto sincronizzando con la rete...</translation>
</message>
<message>
- <location line="-360"/>
+ <location line="-407"/>
<source>&amp;Overview</source>
<translation>&amp;Sintesi</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="-137"/>
+ <source>Node</source>
+ <translation>Nodo</translation>
+ </message>
+ <message>
+ <location line="+138"/>
<source>Show general overview of wallet</source>
<translation>Mostra lo stato generale del portamonete</translation>
</message>
@@ -352,7 +357,7 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l&apos;uso
<translation>Cerca nelle transazioni</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>E&amp;xit</source>
<translation>&amp;Esci</translation>
</message>
@@ -398,7 +403,22 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l&apos;uso
<translation>&amp;Cambia la passphrase...</translation>
</message>
<message>
- <location line="+295"/>
+ <location line="+10"/>
+ <source>&amp;Sending addresses...</source>
+ <translation>&amp;Indirizzi invianti</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Receiving addresses...</source>
+ <translation>Indirizzi &amp;riceventi...</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open &amp;URI...</source>
+ <translation>Apri &amp;URI...</translation>
+ </message>
+ <message>
+ <location line="+325"/>
<source>Importing blocks from disk...</source>
<translation>Importa blocchi dal disco...</translation>
</message>
@@ -408,12 +428,12 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l&apos;uso
<translation>Re-indicizzazione blocchi su disco...</translation>
</message>
<message>
- <location line="-358"/>
+ <location line="-405"/>
<source>Send coins to a Bitcoin address</source>
<translation>Invia monete ad un indirizzo bitcoin</translation>
</message>
<message>
- <location line="+47"/>
+ <location line="+49"/>
<source>Modify configuration options for Bitcoin</source>
<translation>Modifica configurazione opzioni per bitcoin</translation>
</message>
@@ -443,18 +463,17 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l&apos;uso
<translation>&amp;Verifica messaggio...</translation>
</message>
<message>
- <location line="+375"/>
+ <location line="+430"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-563"/>
- <location line="+10"/>
+ <location line="-643"/>
<source>Wallet</source>
<translation>Portamonete</translation>
</message>
<message>
- <location line="+113"/>
+ <location line="+146"/>
<source>&amp;Send</source>
<translation>&amp;Spedisci</translation>
</message>
@@ -464,7 +483,7 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l&apos;uso
<translation>&amp;Ricevi</translation>
</message>
<message>
- <location line="+44"/>
+ <location line="+46"/>
<location line="+2"/>
<source>&amp;Show / Hide</source>
<translation>&amp;Mostra/Nascondi</translation>
@@ -490,86 +509,80 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l&apos;uso
<translation>Verifica i messaggi per accertarsi che siano stati firmati con gli indirizzi Bitcoin specificati</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+48"/>
<source>&amp;File</source>
<translation>&amp;File</translation>
</message>
<message>
- <location line="+11"/>
+ <location line="+14"/>
<source>&amp;Settings</source>
<translation>&amp;Impostazioni</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>&amp;Help</source>
<translation>&amp;Aiuto</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+15"/>
<source>Tabs toolbar</source>
<translation>Barra degli strumenti &quot;Tabs&quot;</translation>
</message>
<message>
- <location line="-244"/>
- <location line="+321"/>
+ <location line="-284"/>
+ <location line="+376"/>
<source>[testnet]</source>
<translation>[testnet]</translation>
</message>
<message>
- <location line="-331"/>
- <location line="+10"/>
+ <location line="-401"/>
<source>Bitcoin Core</source>
- <translation>Nucleo di Bitcoin</translation>
+ <translation>Bitcoin Core</translation>
</message>
<message>
- <location line="+121"/>
+ <location line="+163"/>
<source>Request payments (generates QR codes and bitcoin: URIs)</source>
<translation>Richiedi pagamenti (genera codici QR e bitcoin: URI)</translation>
</message>
<message>
- <location line="+27"/>
+ <location line="+29"/>
<location line="+2"/>
<source>&amp;About Bitcoin Core</source>
<translation>%Info su Bitcoin Core</translation>
</message>
<message>
- <location line="+34"/>
- <source>&amp;Used sending addresses...</source>
- <translation>&amp;Modifica indirizzo d&apos;invio</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+35"/>
<source>Show the list of used sending addresses and labels</source>
<translation>Modifica la lista degli indirizzi salvati e delle etichette</translation>
</message>
<message>
- <location line="+1"/>
- <source>Used &amp;receiving addresses...</source>
- <translation>Nuovo indirizzo di &amp;ricezione</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Show the list of used receiving addresses and labels</source>
<translation>Mostra la lista di indirizzi su cui ricevere pagamenti</translation>
</message>
<message>
+ <location line="+3"/>
+ <source>Open a bitcoin: URI or payment request</source>
+ <translation>Apri un bitcoin: URI o richiesta di pagamento</translation>
+ </message>
+ <message>
<location line="+2"/>
- <source>Open URI...</source>
- <translation>Apri URI...</translation>
+ <source>&amp;Command-line options</source>
+ <translation>Opzioni riga di &amp;comando</translation>
</message>
<message>
<location line="+1"/>
- <source>Open a bitcoin: URI or payment request</source>
- <translation type="unfinished"/>
+ <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
+ <translation>Mostra il messaggio di aiuto di Bitcoin Core per avere la lista di tutte le opzioni della riga di comando di Bitcoin.</translation>
</message>
<message>
- <location line="+126"/>
+ <location line="+159"/>
<location line="+5"/>
<source>Bitcoin client</source>
<translation>Bitcoin client</translation>
</message>
<message numerus="yes">
- <location line="+133"/>
+ <location line="+142"/>
<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>
@@ -589,7 +602,7 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l&apos;uso
<translation>Processati %1 blocchi della cronologia transazioni.</translation>
</message>
<message numerus="yes">
- <location line="+20"/>
+ <location line="+23"/>
<source>%n hour(s)</source>
<translation><numerusform>%n ora</numerusform><numerusform>%n ore</numerusform></translation>
</message>
@@ -609,7 +622,7 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l&apos;uso
<translation>%1 dietro</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="+21"/>
<source>Last received block was generated %1 ago.</source>
<translation>L&apos;ultimo blocco ricevuto è stato generato %1 fa.</translation>
</message>
@@ -634,27 +647,17 @@ Questo prodotto include software sviluppato dal progetto OpenSSL per l&apos;uso
<translation>Informazioni</translation>
</message>
<message>
- <location line="+77"/>
- <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
- <translation>Questa transazione è superiore al limite di dimensione. È comunque possibile inviarla con una commissione di %1, che va ai nodi che processano la tua transazione e contribuisce a sostenere la rete. Vuoi pagare la commissione?</translation>
- </message>
- <message>
- <location line="-152"/>
+ <location line="-85"/>
<source>Up to date</source>
<translation>Aggiornato</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Catching up...</source>
<translation>In aggiornamento...</translation>
</message>
<message>
- <location line="+124"/>
- <source>Confirm transaction fee</source>
- <translation>Conferma compenso transazione</translation>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+130"/>
<source>Sent transaction</source>
<translation>Transazione inviata</translation>
</message>
@@ -678,7 +681,7 @@ Indirizzo: %4
</translation>
</message>
<message>
- <location line="+67"/>
+ <location line="+69"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation>Il portamonete è &lt;b&gt;cifrato&lt;/b&gt; e attualmente &lt;b&gt;sbloccato&lt;/b&gt;</translation>
</message>
@@ -688,7 +691,7 @@ 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 filename="../bitcoin.cpp" line="+116"/>
+ <location filename="../bitcoin.cpp" line="+438"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation>Riscontrato un errore irreversibile. Bitcoin non può più continuare in sicurezza e verrà terminato.</translation>
</message>
@@ -706,7 +709,7 @@ Indirizzo: %4
<message>
<location filename="../forms/coincontroldialog.ui" line="+14"/>
<source>Coin Control Address Selection</source>
- <translation type="unfinished"/>
+ <translation>Selezione Indirizzo Coin Control</translation>
</message>
<message>
<location line="+34"/>
@@ -736,7 +739,7 @@ Indirizzo: %4
<message>
<location line="+32"/>
<source>Low Output:</source>
- <translation type="unfinished"/>
+ <translation>Low Output:</translation>
</message>
<message>
<location line="+48"/>
@@ -817,12 +820,12 @@ Indirizzo: %4
<message>
<location line="+1"/>
<source>Lock unspent</source>
- <translation type="unfinished"/>
+ <translation>Bloccare non spesi</translation>
</message>
<message>
<location line="+1"/>
<source>Unlock unspent</source>
- <translation type="unfinished"/>
+ <translation>Sbloccare non spesi</translation>
</message>
<message>
<location line="+22"/>
@@ -852,7 +855,7 @@ Indirizzo: %4
<message>
<location line="+1"/>
<source>Copy low output</source>
- <translation type="unfinished"/>
+ <translation>Copia low output</translation>
</message>
<message>
<location line="+1"/>
@@ -862,57 +865,62 @@ Indirizzo: %4
<message>
<location line="+323"/>
<source>highest</source>
- <translation type="unfinished"/>
+ <translation>massima</translation>
</message>
<message>
<location line="+1"/>
<source>higher</source>
- <translation type="unfinished"/>
+ <translation>superiore</translation>
</message>
<message>
<location line="+1"/>
<source>high</source>
- <translation type="unfinished"/>
+ <translation>alta</translation>
</message>
<message>
<location line="+1"/>
<source>medium-high</source>
- <translation type="unfinished"/>
+ <translation>medio-alta</translation>
</message>
<message>
<location line="+1"/>
<source>medium</source>
- <translation type="unfinished"/>
+ <translation>media</translation>
</message>
<message>
<location line="+4"/>
<source>low-medium</source>
- <translation type="unfinished"/>
+ <translation>medio-bassa</translation>
</message>
<message>
<location line="+1"/>
<source>low</source>
- <translation type="unfinished"/>
+ <translation>bassa</translation>
</message>
<message>
<location line="+1"/>
<source>lower</source>
- <translation type="unfinished"/>
+ <translation>minore</translation>
</message>
<message>
<location line="+1"/>
<source>lowest</source>
- <translation type="unfinished"/>
+ <translation>infima</translation>
</message>
<message>
<location line="+11"/>
<source>(%1 locked)</source>
- <translation type="unfinished"/>
+ <translation>(%1 bloccato)</translation>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>none</source>
+ <translation>nessuno</translation>
</message>
<message>
- <location line="+171"/>
+ <location line="+140"/>
<source>Dust</source>
- <translation type="unfinished"/>
+ <translation>Trascurabile</translation>
</message>
<message>
<location line="+0"/>
@@ -933,43 +941,43 @@ Indirizzo: %4
<location line="+1"/>
<location line="+5"/>
<source>This means a fee of at least %1 per kB is required.</source>
- <translation type="unfinished"/>
+ <translation>Questo significa che è richiesta una commissione di almeno %1 per ogni kB.</translation>
</message>
<message>
<location line="-4"/>
<source>Can vary +/- 1 byte per input.</source>
- <translation type="unfinished"/>
+ <translation>Può variare di +/- 1 byte per input.</translation>
</message>
<message>
<location line="+2"/>
<source>Transactions with higher priority are more likely to get included into a block.</source>
- <translation type="unfinished"/>
+ <translation>Le transazioni con priorita&apos; piu&apos; alta e&apos; piu&apos; probabile che vengano incluse in un blocco.</translation>
</message>
<message>
<location line="+1"/>
- <source>This label turns red, if the priority is smaller than &quot;medium&quot;</source>
- <translation type="unfinished"/>
+ <source>This label turns red, if the priority is smaller than &quot;medium&quot;.</source>
+ <translation>Questa etichetta diventa rossa, se la priorità è più piccola di &quot;media&quot;.</translation>
</message>
<message>
<location line="+3"/>
<source>This label turns red, if any recipient receives an amount smaller than %1.</source>
- <translation type="unfinished"/>
+ <translation>Questa etichetta diventa rossa, se qualsiasi destinatario riceve un ammontare inferiore di %1.</translation>
</message>
<message>
<location line="+1"/>
<location line="+4"/>
<source>This means a fee of at least %1 is required.</source>
- <translation type="unfinished"/>
+ <translation>Questo significa che è richiesta una commissione di almeno %1</translation>
</message>
<message>
<location line="-3"/>
<source>Amounts below 0.546 times the minimum relay fee are shown as dust.</source>
- <translation type="unfinished"/>
+ <translation>Importi inferiori a 0.546 volte la commissione minima di trasferimento sono mostrati come trascurabili.</translation>
</message>
<message>
<location line="+2"/>
<source>This label turns red, if the change is smaller than %1.</source>
- <translation type="unfinished"/>
+ <translation>Questa etichetta diventa rossa, se il resto è più piccolo di %1.</translation>
</message>
<message>
<location line="+43"/>
@@ -1016,7 +1024,7 @@ Indirizzo: %4
<translation>&amp;Indirizzo</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+25"/>
+ <location filename="../editaddressdialog.cpp" line="+28"/>
<source>New receiving address</source>
<translation>Nuovo indirizzo di ricezione</translation>
</message>
@@ -1085,20 +1093,24 @@ Indirizzo: %4
</message>
</context>
<context>
- <name>GUIUtil::HelpMessageBox</name>
+ <name>HelpMessageDialog</name>
<message>
- <location filename="../guiutil.cpp" line="+597"/>
- <source>version</source>
- <translation>versione</translation>
+ <location filename="../forms/helpmessagedialog.ui" line="+19"/>
+ <source>Bitcoin Core - Command-line options</source>
+ <translation>Bitcoin Core - Opzioni linea di comando</translation>
</message>
<message>
- <location line="+0"/>
- <location line="+13"/>
+ <location filename="../utilitydialog.cpp" line="+38"/>
<source>Bitcoin Core</source>
- <translation>Nucleo di Bitcoin</translation>
+ <translation>Bitcoin Core</translation>
</message>
<message>
- <location line="-11"/>
+ <location line="+0"/>
+ <source>version</source>
+ <translation>versione</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Usage:</source>
<translation>Utilizzo:</translation>
</message>
@@ -1120,13 +1132,12 @@ Indirizzo: %4
<message>
<location line="+1"/>
<source>Start minimized</source>
- <translation>Parti in icona
-</translation>
+ <translation>Parti in icona</translation>
</message>
<message>
<location line="+1"/>
<source>Show splash screen on startup (default: 1)</source>
- <translation>Mostra finestra di presentazione all&apos;avvio (default: 1)</translation>
+ <translation>Mostra finestra di presentazione all&apos;avvio (predefinito: 1)</translation>
</message>
<message>
<location line="+1"/>
@@ -1149,12 +1160,12 @@ Indirizzo: %4
<message>
<location line="+26"/>
<source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
- <translation type="unfinished"/>
+ <translation>Visto che questa è la prima volta che il programma viene lanciato, puoi scegliere dove Bitcoin-Qt salverà i suoi dati.</translation>
</message>
<message>
<location line="+10"/>
<source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
- <translation type="unfinished"/>
+ <translation>Bitcoin Core scaricherà e salverà una copia del block chain di Bitcoin. Almeno %1GB di dati saranno salvati in questa cartella, e aumenteranno col tempo. Anche il portafoglio sarà salvato in questa cartella.</translation>
</message>
<message>
<location line="+10"/>
@@ -1228,7 +1239,7 @@ Indirizzo: %4
<translation>Opzioni</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+13"/>
<source>&amp;Main</source>
<translation>&amp;Principale</translation>
</message>
@@ -1253,7 +1264,52 @@ Indirizzo: %4
<translation>&amp;Fai partire Bitcoin all&apos;avvio del sistema</translation>
</message>
<message>
- <location line="+35"/>
+ <location line="+9"/>
+ <source>Size of &amp;database cache</source>
+ <translation>Dimensione della cache del &amp;database.</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set database cache size in megabytes (default: 25)</source>
+ <translation>Imposta la dimensione cache del database in megabyte (predefinita: 25)</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>MB</source>
+ <translation>MB</translation>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Number of script &amp;verification threads</source>
+ <translation>Numero di thread di &amp;verification degli script </translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
+ <translation>Imposta il numero di thread di verifica script (fino a 16, 0 = auto, &lt;0 = lascia il maggior numero di core liberi, predefinito: 0)</translation>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Connect to the Bitcoin network through a SOCKS proxy.</source>
+ <translation>Connetti alla rete Bitcoin attraverso un proxy SOCKS.</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Connect through SOCKS proxy (default proxy):</source>
+ <translation>&amp;Connetti attraverso proxy SOCKS (proxy predefinito):</translation>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
+ <translation>Indirizzo IP del proxy (es: IPv4: 127.0.0.1 / IPv6: ::1)</translation>
+ </message>
+ <message>
+ <location line="+224"/>
+ <source>Active command-line options that override above options:</source>
+ <translation>Attiva le opzioni command-line che ignorano queste opzioni:</translation>
+ </message>
+ <message>
+ <location line="+43"/>
<source>Reset all client options to default.</source>
<translation>Ripristina tutte le opzioni del client alle predefinite.</translation>
</message>
@@ -1263,7 +1319,7 @@ Indirizzo: %4
<translation>&amp;Ripristina Opzioni</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="-323"/>
<source>&amp;Network</source>
<translation>Rete</translation>
</message>
@@ -1278,32 +1334,17 @@ Indirizzo: %4
<translation>Mappa le porte tramite l&apos;&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>Connettiti alla rete Bitcon attraverso un proxy SOCKS (ad esempio quando ci si collega via Tor)</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>&amp;Connect through SOCKS proxy:</source>
- <translation>&amp;Collegati tramite SOCKS proxy:</translation>
- </message>
- <message>
- <location line="+9"/>
+ <location line="+19"/>
<source>Proxy &amp;IP:</source>
<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>Indirizzo IP del proxy (ad esempio 127.0.0.1)</translation>
- </message>
- <message>
- <location line="+7"/>
+ <location line="+32"/>
<source>&amp;Port:</source>
<translation>&amp;Porta:</translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+25"/>
<source>Port of the proxy (e.g. 9050)</source>
<translation>Porta del proxy (es. 9050)</translation>
</message>
@@ -1365,7 +1406,7 @@ Indirizzo: %4
<message>
<location line="+13"/>
<source>Choose the default subdivision unit to show in the interface and when sending coins.</source>
- <translation>Scegli l&apos;unità di suddivisione di default per l&apos;interfaccia e per l&apos;invio di monete</translation>
+ <translation>Scegli l&apos;unità di suddivisione predefinita per l&apos;interfaccia e per l&apos;invio di monete</translation>
</message>
<message>
<location line="+9"/>
@@ -1380,7 +1421,7 @@ Indirizzo: %4
<message>
<location line="+7"/>
<source>Whether to show coin control features or not.</source>
- <translation type="unfinished"/>
+ <translation>Mostrare/non mostrare le funzionalita&apos; di controllo della moneta.</translation>
</message>
<message>
<location line="+3"/>
@@ -1388,7 +1429,7 @@ Indirizzo: %4
<translation>Mostrare funzionalità coin &amp;control (solo per esperti)</translation>
</message>
<message>
- <location line="+71"/>
+ <location line="+136"/>
<source>&amp;OK</source>
<translation>&amp;OK</translation>
</message>
@@ -1398,44 +1439,38 @@ Indirizzo: %4
<translation>&amp;Cancella</translation>
</message>
<message>
- <location line="+10"/>
- <source>&amp;Apply</source>
- <translation>&amp;Applica</translation>
+ <location filename="../optionsdialog.cpp" line="+67"/>
+ <source>default</source>
+ <translation>predefinito</translation>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+63"/>
- <source>default</source>
- <translation>default</translation>
+ <location line="+57"/>
+ <source>none</source>
+ <translation>nessuno</translation>
</message>
<message>
- <location line="+131"/>
+ <location line="+75"/>
<source>Confirm options reset</source>
<translation>Conferma ripristino opzioni</translation>
</message>
<message>
<location line="+1"/>
- <source>Some settings may require a client restart to take effect.</source>
- <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>Vuoi procedere?</translation>
+ <location line="+29"/>
+ <source>Client restart required to activate changes.</source>
+ <translation>Riavvio del client richiesto per attivare cambiamenti.</translation>
</message>
<message>
- <location line="+42"/>
- <location line="+9"/>
- <source>Warning</source>
- <translation>Attenzione</translation>
+ <location line="-29"/>
+ <source>Client will be shutdown, do you want to proceed?</source>
+ <translation>Il client si spegnerà, vuoi procedere?</translation>
</message>
<message>
- <location line="-9"/>
- <location line="+9"/>
- <source>This setting will take effect after restarting Bitcoin.</source>
- <translation>L&apos;impostazione avrà effetto dopo il riavvio di Bitcoin.</translation>
+ <location line="+33"/>
+ <source>This change would require a client restart.</source>
+ <translation>Questo cambiamento richiede un riavvio del client.</translation>
</message>
<message>
- <location line="+29"/>
+ <location line="+34"/>
<source>The supplied proxy address is invalid.</source>
<translation>L&apos;indirizzo proxy che hai fornito è invalido.</translation>
</message>
@@ -1449,22 +1484,22 @@ Indirizzo: %4
</message>
<message>
<location line="+50"/>
- <location line="+214"/>
+ <location line="+231"/>
<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="-140"/>
+ <location line="-155"/>
<source>Unconfirmed:</source>
<translation>Non confermato:</translation>
</message>
<message>
- <location line="-81"/>
+ <location line="-83"/>
<source>Wallet</source>
<translation>Portamonete</translation>
</message>
<message>
- <location line="+49"/>
+ <location line="+51"/>
<source>Confirmed:</source>
<translation>Confermato:</translation>
</message>
@@ -1499,7 +1534,7 @@ Indirizzo: %4
<translation>Saldo totale attuale</translation>
</message>
<message>
- <location line="+56"/>
+ <location line="+71"/>
<source>&lt;b&gt;Recent transactions&lt;/b&gt;</source>
<translation>&lt;b&gt;Transazioni recenti&lt;/b&gt;</translation>
</message>
@@ -1513,7 +1548,8 @@ Indirizzo: %4
<context>
<name>PaymentServer</name>
<message>
- <location filename="../paymentserver.cpp" line="+397"/>
+ <location filename="../paymentserver.cpp" line="+403"/>
+ <location line="+13"/>
<source>URI handling</source>
<translation>Gestione URI</translation>
</message>
@@ -1523,26 +1559,54 @@ Indirizzo: %4
<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="+91"/>
+ <location line="+96"/>
<source>Requested payment amount of %1 is too small (considered dust).</source>
- <translation>L&apos;importo di pagamento richiesto di %1 è troppo piccolo (considerato polvere).</translation>
+ <translation>L&apos;importo di pagamento richiesto di %1 è troppo basso (ed e&apos; quindi trascurabile).</translation>
</message>
<message>
- <location line="-204"/>
- <location line="+195"/>
+ <location line="-221"/>
+ <location line="+212"/>
<location line="+13"/>
+ <location line="+95"/>
+ <location line="+18"/>
+ <location line="+16"/>
<source>Payment request error</source>
<translation>Errore di richiesta di pagamento</translation>
</message>
<message>
- <location line="-207"/>
+ <location line="-353"/>
<source>Cannot start bitcoin: click-to-pay handler</source>
<translation>Impossibile avviare bitcoin: gestore click-to-pay</translation>
</message>
<message>
- <location line="+195"/>
+ <location line="+58"/>
+ <source>Net manager warning</source>
+ <translation>Avviso Net manager</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Your active proxy doesn&apos;t support SOCKS5, which is required for payment requests via proxy.</source>
+ <translation>Il tuo proxy attivo non supporta SOCKS5, il quale è necessario per richieste di pagamento via proxy.</translation>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>Payment request fetch URL is invalid: %1</source>
+ <translation>Richiesta di pagamento per recuperare URL non valida: %1</translation>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Payment request file handling</source>
+ <translation>Gestione del file di richiesta del pagamento</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Payment request file can not be read or processed! This can be caused by an invalid payment request file.</source>
+ <translation>Il file di richiesta del pagamento non puo&apos; essere letto o elaborato! Il file in questione potrebbe essere danneggiato.</translation>
+ </message>
+ <message>
+ <location line="+73"/>
<source>Unverified payment requests to custom payment scripts are unsupported.</source>
- <translation type="unfinished"/>
+ <translation>Le richieste di pagamento non verificate verso script di pagamento personalizzati non sono supportate.</translation>
</message>
<message>
<location line="+59"/>
@@ -1550,24 +1614,27 @@ Indirizzo: %4
<translation>Rimborso da %1</translation>
</message>
<message>
- <location line="+42"/>
+ <location line="+43"/>
<source>Error communicating with %1: %2</source>
<translation>Errore di comunicazione con %1: %2</translation>
</message>
<message>
- <location line="+28"/>
+ <location line="+24"/>
+ <source>Payment request can not be parsed or processed!</source>
+ <translation>La richiesta di pagamento non può essere analizzata e processata!</translation>
+ </message>
+ <message>
+ <location line="+11"/>
<source>Bad response from server %1</source>
<translation>Risposta sbagliata dal server %1</translation>
</message>
<message>
- <location line="+32"/>
+ <location line="+33"/>
<source>Payment acknowledged</source>
<translation>Pagamento riconosciuto</translation>
</message>
<message>
- <location line="-55"/>
- <location line="+27"/>
- <location line="+17"/>
+ <location line="-11"/>
<source>Network request error</source>
<translation>Errore di richiesta di rete</translation>
</message>
@@ -1575,18 +1642,18 @@ Indirizzo: %4
<context>
<name>QObject</name>
<message>
- <location filename="../bitcoin.cpp" line="+119"/>
- <location line="+5"/>
+ <location filename="../bitcoin.cpp" line="+71"/>
+ <location line="+11"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-4"/>
+ <location line="+1"/>
<source>Error: Specified data directory &quot;%1&quot; does not exist.</source>
<translation>Errore: La cartella dati &quot;%1&quot; specificata non esiste.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="-12"/>
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation>Errore: combinazione di -regtest e -testnet non valida.</translation>
</message>
@@ -1628,15 +1695,16 @@ Indirizzo: %4
<location line="+23"/>
<location line="+23"/>
<location line="+36"/>
- <location line="+53"/>
<location line="+23"/>
+ <location line="+36"/>
<location line="+23"/>
- <location filename="../rpcconsole.cpp" line="+360"/>
+ <location line="+23"/>
+ <location filename="../rpcconsole.cpp" line="+359"/>
<source>N/A</source>
<translation>N/D</translation>
</message>
<message>
- <location line="-217"/>
+ <location line="-223"/>
<source>Client version</source>
<translation>Versione client</translation>
</message>
@@ -1651,7 +1719,12 @@ Indirizzo: %4
<translation>Finestra di debug</translation>
</message>
<message>
- <location line="+78"/>
+ <location line="+25"/>
+ <source>General</source>
+ <translation>Generale</translation>
+ </message>
+ <message>
+ <location line="+53"/>
<source>Using OpenSSL version</source>
<translation>Versione OpenSSL in uso</translation>
</message>
@@ -1667,16 +1740,16 @@ Indirizzo: %4
</message>
<message>
<location line="+7"/>
- <source>Number of connections</source>
- <translation>Numero connessioni</translation>
+ <source>Name</source>
+ <translation>Nome</translation>
</message>
<message>
<location line="+23"/>
- <source>On testnet</source>
- <translation>Nel testnet</translation>
+ <source>Number of connections</source>
+ <translation>Numero connessioni</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+29"/>
<source>Block chain</source>
<translation>Block chain</translation>
</message>
@@ -1701,16 +1774,6 @@ Indirizzo: %4
<translation>&amp;Apri</translation>
</message>
<message>
- <location line="+16"/>
- <source>Command-line options</source>
- <translation>opzioni riga di comando</translation>
- </message>
- <message>
- <location line="+10"/>
- <source>&amp;Show</source>
- <translation>&amp;Mostra</translation>
- </message>
- <message>
<location line="+24"/>
<source>&amp;Console</source>
<translation>&amp;Console</translation>
@@ -1741,17 +1804,12 @@ Indirizzo: %4
<translation>Uscita:</translation>
</message>
<message>
- <location line="-541"/>
+ <location line="-521"/>
<source>Build date</source>
<translation>Data di creazione</translation>
</message>
<message>
- <location line="-79"/>
- <source>Bitcoin Core</source>
- <translation>Nucleo di Bitcoin</translation>
- </message>
- <message>
- <location line="+279"/>
+ <location line="+206"/>
<source>Debug log file</source>
<translation>File log del Debug</translation>
</message>
@@ -1761,11 +1819,6 @@ Indirizzo: %4
<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="+26"/>
- <source>Show the Bitcoin-Core help message to get a list with possible Bitcoin command-line options.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location line="+76"/>
<source>Clear console</source>
<translation>Svuota console</translation>
@@ -1786,7 +1839,7 @@ Indirizzo: %4
<translation>Scrivi &lt;b&gt;help&lt;/b&gt; per un riassunto dei comandi disponibili</translation>
</message>
<message>
- <location line="+128"/>
+ <location line="+122"/>
<source>%1 B</source>
<translation>%1 B</translation>
</message>
@@ -1829,12 +1882,7 @@ Indirizzo: %4
<translation>&amp;Importo:</translation>
</message>
<message>
- <location line="+19"/>
- <source>The amount to request</source>
- <translation>L&apos;importo da richiedere</translation>
- </message>
- <message>
- <location line="-32"/>
+ <location line="-13"/>
<source>&amp;Label:</source>
<translation>&amp;Etichetta</translation>
</message>
@@ -1844,12 +1892,7 @@ Indirizzo: %4
<translation>&amp;Messaggio:</translation>
</message>
<message>
- <location line="+20"/>
- <source>The message to attach to payment request</source>
- <translation>Il messaggio da allegare alla richiesta di pagamento</translation>
- </message>
- <message>
- <location line="-37"/>
+ <location line="-17"/>
<source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation>Riutilizza un indirizzo di ricezione già usato. Riutilizzare indirizza non è sicuro. Non usare senza rigenerare una richiesta di pagamanto.</translation>
</message>
@@ -1860,16 +1903,26 @@ Indirizzo: %4
</message>
<message>
<location line="+27"/>
- <source>The label to associate with the new receiving address</source>
- <translation>L&apos;etichetta da associare al nuovo indirizzo ricevente</translation>
+ <source>An optional label to associate with the new receiving address</source>
+ <translation>Un&apos;etichetta facoltativa da associare al nuovo indirizzo ricevente</translation>
</message>
<message>
- <location line="+14"/>
- <source>Use this form to request payments. All fields are optional.</source>
- <translation>Usa questo modulo per richiedere pagamenti. Tutti i campi sono opzionali.</translation>
+ <location line="+7"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
+ <translation>Un messaggio facoltativo da allegare alla richiesta di pagamento, il quale sarà mostrato quando la richiesta è aperta. Nota: Il messaggio non verrà inviato con il pagamento attraverso il network Bitcoin.</translation>
</message>
<message>
- <location line="+56"/>
+ <location line="+7"/>
+ <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
+ <translation>Usa questo modulo per richiedere pagamenti. Tutti i campi sono &lt;b&gt;opzionali&lt;/b&gt;.</translation>
+ </message>
+ <message>
+ <location line="+39"/>
+ <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
+ <translation>Un importo facoltativo da richiedere. Lasciare vuoto o a zero per non richiedere un importo specifico.</translation>
+ </message>
+ <message>
+ <location line="+17"/>
<source>Clear all fields of the form.</source>
<translation>Cancellare tutti i campi del modulo.</translation>
</message>
@@ -1885,13 +1938,13 @@ Indirizzo: %4
</message>
<message>
<location line="+47"/>
- <source>Previously requested payments</source>
- <translation>Pagamenti richiesti precedentemente</translation>
+ <source>Requested payments</source>
+ <translation>Pagamenti richiesti</translation>
</message>
<message>
- <location line="+12"/>
+ <location line="+16"/>
<source>Show the selected request (does the same as double clicking an entry)</source>
- <translation type="unfinished"/>
+ <translation>Mostra la richiesta selezionata (fa la stessa cosa che il doppio click sul campo)</translation>
</message>
<message>
<location line="+3"/>
@@ -1980,7 +2033,7 @@ Indirizzo: %4
<context>
<name>RecentRequestsTableModel</name>
<message>
- <location filename="../recentrequeststablemodel.cpp" line="+14"/>
+ <location filename="../recentrequeststablemodel.cpp" line="+24"/>
<source>Date</source>
<translation>Data</translation>
</message>
@@ -2000,7 +2053,7 @@ Indirizzo: %4
<translation>Importo</translation>
</message>
<message>
- <location line="+36"/>
+ <location line="+38"/>
<source>(no label)</source>
<translation>(nessuna etichetta)</translation>
</message>
@@ -2015,7 +2068,7 @@ Indirizzo: %4
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
<location filename="../sendcoinsdialog.cpp" line="+381"/>
- <location line="+81"/>
+ <location line="+80"/>
<source>Send Coins</source>
<translation>Spedisci Bitcoin</translation>
</message>
@@ -2027,7 +2080,7 @@ Indirizzo: %4
<message>
<location line="+20"/>
<source>Inputs...</source>
- <translation type="unfinished"/>
+ <translation>Input...</translation>
</message>
<message>
<location line="+7"/>
@@ -2067,7 +2120,7 @@ Indirizzo: %4
<message>
<location line="+32"/>
<source>Low Output:</source>
- <translation type="unfinished"/>
+ <translation>Low Output:</translation>
</message>
<message>
<location line="+48"/>
@@ -2082,7 +2135,7 @@ Indirizzo: %4
<message>
<location line="+44"/>
<source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source>
- <translation type="unfinished"/>
+ <translation>Se questo e&apos; abilitato e l&apos;indirizzo per il resto e&apos; vuoto o invalido, il resto verra&apos; inviato a un nuovo indirizzo bitcoin generato per lo scopo.</translation>
</message>
<message>
<location line="+3"/>
@@ -2125,7 +2178,7 @@ Indirizzo: %4
<translation>&amp;Spedisci</translation>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-229"/>
+ <location filename="../sendcoinsdialog.cpp" line="-228"/>
<source>Confirm send coins</source>
<translation>Conferma la spedizione di bitcoin</translation>
</message>
@@ -2175,7 +2228,7 @@ Indirizzo: %4
<message>
<location line="+1"/>
<source>Copy low output</source>
- <translation type="unfinished"/>
+ <translation>Copia low output</translation>
</message>
<message>
<location line="+1"/>
@@ -2225,25 +2278,25 @@ Indirizzo: %4
<message>
<location line="+4"/>
<source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
- <translation type="unfinished"/>
+ <translation>La transazione e&apos; stata rifiutata! Questo puo&apos; accadere se alcune delle monete nel tuo portafoglio sono gia&apos; state spese, per esempio se hai fatto una copia di un file wallet.dat le quali monete eran gia&apos; state spese, ma non marcate come tali nel file.</translation>
</message>
<message>
- <location line="+113"/>
+ <location line="+112"/>
<source>Warning: Invalid Bitcoin address</source>
<translation>Attenzione: Indirizzo Bitcoin non valido</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+21"/>
<source>(no label)</source>
<translation>(nessuna etichetta)</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="-11"/>
<source>Warning: Unknown change address</source>
<translation>Attenzione: Indirizzo di ritorno sconosciuto</translation>
</message>
<message>
- <location line="-378"/>
+ <location line="-366"/>
<source>Are you sure you want to send?</source>
<translation>Sei sicuro di voler inviare?</translation>
</message>
@@ -2267,13 +2320,13 @@ Indirizzo: %4
<name>SendCoinsEntry</name>
<message>
<location filename="../forms/sendcoinsentry.ui" line="+131"/>
- <location line="+501"/>
+ <location line="+521"/>
<location line="+536"/>
<source>A&amp;mount:</source>
<translation>&amp;Importo:</translation>
</message>
<message>
- <location line="-1132"/>
+ <location line="-1152"/>
<source>Pay &amp;To:</source>
<translation>Paga &amp;a:</translation>
</message>
@@ -2319,23 +2372,33 @@ Indirizzo: %4
</message>
<message>
<location line="+7"/>
- <location line="+504"/>
+ <location line="+524"/>
<location line="+536"/>
<source>Remove this entry</source>
<translation>Rimuovi questa voce</translation>
</message>
<message>
- <location line="-40"/>
+ <location line="-1008"/>
+ <source>Message:</source>
+ <translation>Messaggio:</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation>Messaggio che era incluso nel Bitcoin URI che sarà memorizzato con la transazione per vostro riferimento. Nota: Questo messaggio non sarà inviato attraverso la rete Bitcoin.</translation>
+ </message>
+ <message>
+ <location line="+958"/>
<source>This is a verified payment request.</source>
<translation>Questa è una richiesta di pagamento verificata.</translation>
</message>
<message>
- <location line="-971"/>
+ <location line="-991"/>
<source>Enter a label for this address to add it to the list of used addresses</source>
<translation>Inserisci un&apos;etichetta per questo indirizzo per aggiungerlo nella rubrica</translation>
</message>
<message>
- <location line="+439"/>
+ <location line="+459"/>
<source>This is an unverified payment request.</source>
<translation>Questa è una richiesta di pagamento non verificata.</translation>
</message>
@@ -2358,6 +2421,19 @@ Indirizzo: %4
</message>
</context>
<context>
+ <name>ShutdownWindow</name>
+ <message>
+ <location filename="../utilitydialog.cpp" line="+48"/>
+ <source>Bitcoin Core is shutting down...</source>
+ <translation>Bitcoin Core si sta spegnendo...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Do not shut down the computer until this window disappears.</source>
+ <translation>Non spegnere il computer fintanto che non sparisce questa finestra.</translation>
+ </message>
+</context>
+<context>
<name>SignVerifyMessageDialog</name>
<message>
<location filename="../forms/signverifymessagedialog.ui" line="+14"/>
@@ -2365,7 +2441,7 @@ Indirizzo: %4
<translation>Firme - Firma / Verifica un messaggio</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+10"/>
<source>&amp;Sign Message</source>
<translation>&amp;Firma il messaggio</translation>
</message>
@@ -2553,9 +2629,9 @@ Indirizzo: %4
<context>
<name>SplashScreen</name>
<message>
- <location filename="../splashscreen.cpp" line="+26"/>
+ <location filename="../splashscreen.cpp" line="+28"/>
<source>Bitcoin Core</source>
- <translation>Nucleo di Bitcoin</translation>
+ <translation>Bitcoin Core</translation>
</message>
<message>
<location line="+2"/>
@@ -2652,12 +2728,12 @@ Indirizzo: %4
<location line="+12"/>
<location line="+45"/>
<location line="+17"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Credit</source>
<translation>Credito</translation>
</message>
<message numerus="yes">
- <location line="-120"/>
+ <location line="-125"/>
<source>matures in %n more block(s)</source>
<translation><numerusform>matura in %n ulteriore blocco</numerusform><numerusform>matura in altri %n blocchi</numerusform></translation>
</message>
@@ -2670,12 +2746,12 @@ Indirizzo: %4
<location line="+44"/>
<location line="+8"/>
<location line="+15"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Debit</source>
<translation>Debito</translation>
</message>
<message>
- <location line="-57"/>
+ <location line="-62"/>
<source>Transaction fee</source>
<translation>Commissione transazione</translation>
</message>
@@ -2686,11 +2762,12 @@ Indirizzo: %4
</message>
<message>
<location line="+6"/>
+ <location line="+9"/>
<source>Message</source>
<translation>Messaggio</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="-7"/>
<source>Comment</source>
<translation>Commento</translation>
</message>
@@ -2700,7 +2777,7 @@ Indirizzo: %4
<translation>ID della transazione</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+18"/>
<source>Merchant</source>
<translation>Mercante</translation>
</message>
@@ -2740,7 +2817,7 @@ Indirizzo: %4
<translation>falso</translation>
</message>
<message>
- <location line="-227"/>
+ <location line="-232"/>
<source>, has not been successfully broadcast yet</source>
<translation>, non è stato ancora trasmesso con successo</translation>
</message>
@@ -2790,8 +2867,13 @@ Indirizzo: %4
<source>Amount</source>
<translation>Importo</translation>
</message>
+ <message>
+ <location line="+59"/>
+ <source>Immature (%1 confirmations, will be available after %2)</source>
+ <translation>Immaturo (%1 conferme, sarà disponibile fra %2)</translation>
+ </message>
<message numerus="yes">
- <location line="+57"/>
+ <location line="+16"/>
<source>Open for %n more block(s)</source>
<translation><numerusform>Aperto per %n altro blocco</numerusform><numerusform>Aperto per altri %n blocchi</numerusform></translation>
</message>
@@ -2811,17 +2893,13 @@ Indirizzo: %4
<translation>Non confermati (%1 su %2 conferme)</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="-22"/>
+ <location line="+25"/>
<source>Confirmed (%1 confirmations)</source>
<translation>Confermato (%1 conferme)</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>Il saldo generato sarà disponibile quando maturerà in %n altro blocco</numerusform><numerusform>Il saldo generato sarà disponibile quando maturerà in altri %n blocchi</numerusform></translation>
- </message>
<message>
- <location line="+5"/>
+ <location line="-22"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation>Questo blocco non è stato ricevuto da altri nodi e probabilmente non sarà accettato!</translation>
</message>
@@ -2831,7 +2909,7 @@ Indirizzo: %4
<translation>Generati, ma non accettati</translation>
</message>
<message>
- <location line="+43"/>
+ <location line="+62"/>
<source>Received with</source>
<translation>Ricevuto tramite</translation>
</message>
@@ -3002,7 +3080,7 @@ Indirizzo: %4
<message>
<location line="+0"/>
<source>There was an error trying to save the transaction history to %1.</source>
- <translation type="unfinished"/>
+ <translation>C&apos;è stato un errore tentanto di salvare la storia della transazione in %1.</translation>
</message>
<message>
<location line="+4"/>
@@ -3012,7 +3090,7 @@ Indirizzo: %4
<message>
<location line="+0"/>
<source>The transaction history was successfully saved to %1.</source>
- <translation type="unfinished"/>
+ <translation>Lo storico delle transazioni e&apos; stato salvato con successo in %1.</translation>
</message>
<message>
<location line="-22"/>
@@ -3111,7 +3189,7 @@ Indirizzo: %4
<message>
<location line="+0"/>
<source>There was an error trying to save the wallet data to %1.</source>
- <translation type="unfinished"/>
+ <translation>C&apos;è stato un errore tentanto di salvare i dati del portamonete in %1.</translation>
</message>
<message>
<location line="+4"/>
@@ -3127,7 +3205,7 @@ Indirizzo: %4
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+217"/>
+ <location filename="../bitcoinstrings.cpp" line="+221"/>
<source>Usage:</source>
<translation>Utilizzo:</translation>
</message>
@@ -3150,16 +3228,14 @@ Indirizzo: %4
</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+22"/>
<source>Specify configuration file (default: bitcoin.conf)</source>
- <translation>Specifica il file di configurazione (di default: bitcoin.conf)
-</translation>
+ <translation>Specifica il file di configurazione (predefinito: bitcoin.conf)</translation>
</message>
<message>
<location line="+3"/>
<source>Specify pid file (default: bitcoind.pid)</source>
- <translation>Specifica il file pid (default: bitcoind.pid)
-</translation>
+ <translation>Specifica il file pid (predefinito: bitcoind.pid)</translation>
</message>
<message>
<location line="-1"/>
@@ -3170,20 +3246,20 @@ Indirizzo: %4
<message>
<location line="-9"/>
<source>Set database cache size in megabytes (default: 25)</source>
- <translation>Imposta la dimensione cache del database in megabyte (default: 25)</translation>
+ <translation>Imposta la dimensione cache del database in megabyte (predefinita: 25)</translation>
</message>
<message>
- <location line="-27"/>
+ <location line="-26"/>
<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>
+ <translation>Ascolta le connessioni JSON-RPC su &lt;porta&gt; (predefinita: 8333 o testnet: 18333)</translation>
</message>
<message>
<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>
+ <translation>Mantieni al massimo &lt;n&gt; connessioni ai peer (predefinite: 125)</translation>
</message>
<message>
- <location line="-50"/>
+ <location line="-51"/>
<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>
@@ -3193,24 +3269,24 @@ Indirizzo: %4
<translation>Specifica il tuo indirizzo pubblico</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
- <translation>Soglia di disconnessione dei peer di cattiva qualità (default: 100)</translation>
+ <translation>Soglia di disconnessione dei peer di cattiva qualità (predefinita: 100)</translation>
</message>
<message>
- <location line="-147"/>
+ <location line="-148"/>
<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>
+ <translation>Numero di secondi di sospensione che i peer di cattiva qualità devono trascorrere prima di riconnettersi (predefiniti: 86400)</translation>
</message>
<message>
- <location line="-33"/>
+ <location line="-36"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
<translation>Errore riscontrato durante l&apos;impostazione della porta RPC %u per l&apos;ascolto su IPv4: %s</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<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>
+ <translation>Attendi le connessioni JSON-RPC su &lt;porta&gt; (predefinita: 8332 or testnet: 18332)</translation>
</message>
<message>
<location line="+45"/>
@@ -3219,7 +3295,7 @@ Indirizzo: %4
</translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>Esegui in background come demone e accetta i comandi
</translation>
@@ -3231,12 +3307,12 @@ Indirizzo: %4
</translation>
</message>
<message>
- <location line="-117"/>
+ <location line="-118"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
- <translation>Accetta connessioni dall&apos;esterno (default: 1 se no -proxy o -connect)</translation>
+ <translation>Accetta connessioni dall&apos;esterno (predefinito: 1 se no -proxy o -connect)</translation>
</message>
<message>
- <location line="-92"/>
+ <location line="-95"/>
<source>%s, you must set a rpcpassword in the configuration file:
%s
It is recommended you use the following random password:
@@ -3263,7 +3339,7 @@ per esempio: alertnotify=echo %%s | mail -s &quot;Allarme Bitcoin&quot; admin@fo
<message>
<location line="+12"/>
<source>Acceptable ciphers (default: TLSv1.2+HIGH:TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!3DES:@STRENGTH)</source>
- <translation>Cifrature accettabili (default: TLSv1.2+HIGH:TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!3DES:@STRENGTH)</translation>
+ <translation>Cifrature accettabili (predefinito: TLSv1.2+HIGH:TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!3DES:@STRENGTH)</translation>
</message>
<message>
<location line="+5"/>
@@ -3287,6 +3363,11 @@ per esempio: alertnotify=echo %%s | mail -s &quot;Allarme Bitcoin&quot; admin@fo
</message>
<message>
<location line="+4"/>
+ <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</source>
+ <translation>Entra in modalità di test di regressione, la quale usa una speciale catena in cui i blocchi possono essere risolti istantaneamente.</translation>
+ </message>
+ <message>
+ <location line="+3"/>
<source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
<translation>Errore: la transazione è stata rifiutata. Ciò accade se alcuni bitcoin nel portamonete sono stati già spesi, ad esempio se è stata usata una copia del file wallet.dat e i bitcoin sono stati spesi dalla copia ma non segnati come spesi qui.</translation>
</message>
@@ -3308,7 +3389,7 @@ per esempio: alertnotify=echo %%s | mail -s &quot;Allarme Bitcoin&quot; admin@fo
<message>
<location line="+5"/>
<source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source>
- <translation type="unfinished"/>
+ <translation>Usa un SOCKS5 proxy separato per raggiungere servizi nascosti di Tor (predefinito: -proxy)</translation>
</message>
<message>
<location line="+3"/>
@@ -3378,7 +3459,7 @@ per esempio: alertnotify=echo %%s | mail -s &quot;Allarme Bitcoin&quot; admin@fo
<message>
<location line="+1"/>
<source>Connect to JSON-RPC on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
- <translation>Connetti al JSON-RPC su &lt;port&gt; (default: 8332 o testnet: 18332)</translation>
+ <translation>Connetti al JSON-RPC su &lt;port&gt; (predefinita: 8332 o testnet: 18332)</translation>
</message>
<message>
<location line="+2"/>
@@ -3388,7 +3469,12 @@ per esempio: alertnotify=echo %%s | mail -s &quot;Allarme Bitcoin&quot; admin@fo
<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>
+ <translation>Scopri proprio indirizzo IP (predefinito: 1 se in ascolto e no -externalip)</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Do not load the wallet and disable wallet RPC calls</source>
+ <translation>Non caricare il portamonete e disabilita le chiamate RPC al portamonete</translation>
</message>
<message>
<location line="+1"/>
@@ -3498,7 +3584,7 @@ per esempio: alertnotify=echo %%s | mail -s &quot;Allarme Bitcoin&quot; admin@fo
<message>
<location line="+1"/>
<source>Generate coins (default: 0)</source>
- <translation>Genera Bitcoin (default: 0)</translation>
+ <translation>Genera Bitcoin (predefinito: 0)</translation>
</message>
<message>
<location line="+2"/>
@@ -3508,12 +3594,12 @@ per esempio: alertnotify=echo %%s | mail -s &quot;Allarme Bitcoin&quot; admin@fo
<message>
<location line="+1"/>
<source>How thorough the block verification is (0-4, default: 3)</source>
- <translation>Quanto è precisa la verifica del blocco (0-4, default: 3)</translation>
+ <translation>Quanto è precisa la verifica del blocco (0-4, predefinito: 3)</translation>
</message>
<message>
<location line="+1"/>
<source>If &lt;category&gt; is not supplied, output all debugging information.</source>
- <translation type="unfinished"/>
+ <translation>Se &lt;category&gt; non e&apos; specificata, mostra tutte le informazioni di debug.</translation>
</message>
<message>
<location line="+2"/>
@@ -3533,7 +3619,7 @@ per esempio: alertnotify=echo %%s | mail -s &quot;Allarme Bitcoin&quot; admin@fo
<message>
<location line="+5"/>
<source>Prepend debug output with timestamp (default: 1)</source>
- <translation type="unfinished"/>
+ <translation>Pretendi output di debug con timestamp (predefinito: 1)</translation>
</message>
<message>
<location line="+1"/>
@@ -3548,7 +3634,7 @@ per esempio: alertnotify=echo %%s | mail -s &quot;Allarme Bitcoin&quot; admin@fo
<message>
<location line="+5"/>
<source>Select SOCKS version for -proxy (4 or 5, default: 5)</source>
- <translation>Selezionare la versione SOCKS per -proxy (4 o 5, default: 5)</translation>
+ <translation>Selezionare la versione SOCKS per -proxy (4 o 5, predefinito: 5)</translation>
</message>
<message>
<location line="+1"/>
@@ -3556,14 +3642,14 @@ per esempio: alertnotify=echo %%s | mail -s &quot;Allarme Bitcoin&quot; admin@fo
<translation>Invia comando al server Bitcoin</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+7"/>
<source>Set maximum block size in bytes (default: %d)</source>
- <translation>Impostare la dimensione massima del blocco in byte (default: %d)</translation>
+ <translation>Impostare la dimensione massima del blocco in byte (predefinita: %d)</translation>
</message>
<message>
<location line="+2"/>
<source>Set the number of threads to service RPC calls (default: 4)</source>
- <translation>Specifica il numero massimo di richieste RPC in parallelo (di default: 4)</translation>
+ <translation>Specifica il numero massimo di richieste RPC in parallelo (predefinito: 4)</translation>
</message>
<message>
<location line="+7"/>
@@ -3576,7 +3662,12 @@ per esempio: alertnotify=echo %%s | mail -s &quot;Allarme Bitcoin&quot; admin@fo
<translation>Avvia server Bitcoin</translation>
</message>
<message>
- <location line="+12"/>
+ <location line="+3"/>
+ <source>This is intended for regression testing tools and app development.</source>
+ <translation>Questo </translation>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Usage (deprecated, use bitcoin-cli):</source>
<translation>Usage (deprecato, usare bitcoin-cli):</translation>
</message>
@@ -3601,9 +3692,14 @@ per esempio: alertnotify=echo %%s | mail -s &quot;Allarme Bitcoin&quot; admin@fo
<translation>Il portafoglio %s si trova fuori dalla cartella dati %s</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="+2"/>
+ <source>Wallet options:</source>
+ <translation>Opzioni portamonete:</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source>
- <translation type="unfinished"/>
+ <translation>Attenzione: Argomento deprecato -debugnet ignorato, usa -debug=net</translation>
</message>
<message>
<location line="+2"/>
@@ -3611,32 +3707,32 @@ per esempio: alertnotify=echo %%s | mail -s &quot;Allarme Bitcoin&quot; admin@fo
<translation>Serve ricostruire il database usando -reindex per cambiare -txindex</translation>
</message>
<message>
- <location line="-78"/>
+ <location line="-79"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation>Importa blocchi da un file blk000??.dat esterno</translation>
</message>
<message>
- <location line="-104"/>
+ <location line="-105"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation>Eseguire comando quando un rilevante allarme viene ricevuto o vediamo una fork veramente lunga (%s in cmd è sostituito dal messaggio)</translation>
</message>
<message>
<location line="+14"/>
<source>Output debugging information (default: 0, supplying &lt;category&gt; is optional)</source>
- <translation type="unfinished"/>
+ <translation>Informazione di debug in output (predefinito: 0, fornire &lt;category&gt; è opzionale)</translation>
</message>
<message>
<location line="+2"/>
<source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
- <translation type="unfinished"/>
+ <translation>Imposta la dimensione massima delle transazioni di priorità-alta/basse-commissioni in byte (predefinita: %d)</translation>
</message>
<message>
<location line="+2"/>
<source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
- <translation>Imposta il numero di thread di verifica script (fino a 16, 0 = auto, &lt;0 = lascia il maggior numero di core liberi, default: 0)</translation>
+ <translation>Imposta il numero di thread di verifica script (fino a 16, 0 = auto, &lt;0 = lascia il maggior numero di core liberi, predefinito: 0)</translation>
</message>
<message>
- <location line="+88"/>
+ <location line="+89"/>
<source>Information</source>
<translation>Informazioni</translation>
</message>
@@ -3653,22 +3749,22 @@ per esempio: alertnotify=echo %%s | mail -s &quot;Allarme Bitcoin&quot; admin@fo
<message>
<location line="+8"/>
<source>Maintain a full transaction index (default: 0)</source>
- <translation>Mantieni un indice di transazione completo (default: 0)</translation>
+ <translation>Mantieni un indice di transazione completo (predefinito: 0)</translation>
</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>
+ <translation>Buffer di ricezione massimo per connessione, &lt;n&gt;*1000 byte (predefinito: 5000)</translation>
</message>
<message>
<location line="+1"/>
<source>Maximum per-connection send buffer, &lt;n&gt;*1000 bytes (default: 1000)</source>
- <translation>Buffer di invio massimo per connessione, &lt;n&gt;*1000 byte (default: 1000)</translation>
+ <translation>Buffer di invio massimo per connessione, &lt;n&gt;*1000 byte (predefinito: 1000)</translation>
</message>
<message>
<location line="+2"/>
<source>Only accept block chain matching built-in checkpoints (default: 1)</source>
- <translation>Accetta solo una catena di blocchi che corrisponde ai checkpoint predefiniti (default: 1)</translation>
+ <translation>Accetta solo una catena di blocchi che corrisponde ai checkpoint predefiniti (predefinito: 1)</translation>
</message>
<message>
<location line="+1"/>
@@ -3686,14 +3782,9 @@ per esempio: alertnotify=echo %%s | mail -s &quot;Allarme Bitcoin&quot; admin@fo
<translation>Invia le informazioni di trace/debug alla console invece che al file debug.log</translation>
</message>
<message>
- <location line="+1"/>
- <source>Send trace/debug info to debugger</source>
- <translation>Invia le informazioni di trace/debug al debugger</translation>
- </message>
- <message>
<location line="+6"/>
<source>Set minimum block size in bytes (default: 0)</source>
- <translation>Imposta dimensione minima del blocco in bytes (predefinito: 0)</translation>
+ <translation>Imposta dimensione minima del blocco in bytes (predefinita: 0)</translation>
</message>
<message>
<location line="+2"/>
@@ -3708,7 +3799,7 @@ per esempio: alertnotify=echo %%s | mail -s &quot;Allarme Bitcoin&quot; admin@fo
<message>
<location line="+2"/>
<source>Specify connection timeout in milliseconds (default: 5000)</source>
- <translation>Specifica il timeout di connessione in millisecondi (default: 5000)</translation>
+ <translation>Specifica il timeout di connessione in millisecondi (predefinito: 5000)</translation>
</message>
<message>
<location line="+6"/>
@@ -3716,7 +3807,7 @@ per esempio: alertnotify=echo %%s | mail -s &quot;Allarme Bitcoin&quot; admin@fo
<translation>Errore di sistema:</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Transaction amount too small</source>
<translation>Importo transazione troppo piccolo</translation>
</message>
@@ -3733,12 +3824,12 @@ per esempio: alertnotify=echo %%s | mail -s &quot;Allarme Bitcoin&quot; admin@fo
<message>
<location line="+8"/>
<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>
+ <translation>Usa UPnP per mappare la porta in ascolto (predefinito: 0)</translation>
</message>
<message>
<location line="+1"/>
<source>Use UPnP to map the listening port (default: 1 when listening)</source>
- <translation>UPnP-használat engedélyezése a figyelő port feltérképezésénél (default: 1 when listening)</translation>
+ <translation>Usa UPnP per mappare la porta in ascolto (predefinito: 1 when listening)</translation>
</message>
<message>
<location line="+2"/>
@@ -3747,7 +3838,7 @@ per esempio: alertnotify=echo %%s | mail -s &quot;Allarme Bitcoin&quot; admin@fo
</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Warning</source>
<translation>Attenzione</translation>
</message>
@@ -3767,41 +3858,39 @@ per esempio: alertnotify=echo %%s | mail -s &quot;Allarme Bitcoin&quot; admin@fo
<translation>wallet.dat corrotto, salvataggio fallito</translation>
</message>
<message>
- <location line="-57"/>
+ <location line="-58"/>
<source>Password for JSON-RPC connections</source>
<translation>Password per connessioni JSON-RPC
</translation>
</message>
<message>
- <location line="-69"/>
+ <location line="-70"/>
<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="+79"/>
+ <location line="+80"/>
<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>
+ <translation>Inviare comandi al nodo in esecuzione su &lt;ip&gt; (predefinito: 127.0.0.1)</translation>
</message>
<message>
- <location line="-131"/>
+ <location line="-132"/>
<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="+160"/>
+ <location line="+161"/>
<source>Upgrade wallet to latest format</source>
<translation>Aggiorna il wallet all&apos;ultimo formato</translation>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<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>
+ <translation>Impostare la quantità di chiavi di riserva a &lt;n&gt; (predefinita: 100)</translation>
</message>
<message>
- <location line="-12"/>
+ <location line="-11"/>
<source>Rescan the block chain for missing wallet transactions</source>
<translation>Ripeti analisi della catena dei blocchi per cercare le transazioni mancanti dal portamonete
</translation>
@@ -3813,16 +3902,14 @@ per esempio: alertnotify=echo %%s | mail -s &quot;Allarme Bitcoin&quot; admin@fo
</translation>
</message>
<message>
- <location line="-29"/>
+ <location line="-30"/>
<source>Server certificate file (default: server.cert)</source>
- <translation>File certificato del server (default: server.cert)
-</translation>
+ <translation>File certificato del server (predefinito: server.cert)</translation>
</message>
<message>
<location line="+1"/>
<source>Server private key (default: server.pem)</source>
- <translation>Chiave privata del server (default: server.pem)
-</translation>
+ <translation>Chiave privata del server (predefinito: server.pem)</translation>
</message>
<message>
<location line="+16"/>
@@ -3831,18 +3918,18 @@ per esempio: alertnotify=echo %%s | mail -s &quot;Allarme Bitcoin&quot; admin@fo
</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Unable to bind to %s on this computer (bind returned error %d, %s)</source>
<translation>Impossibile collegarsi alla %s su questo computer (bind returned error %d, %s)</translation>
</message>
<message>
- <location line="-106"/>
+ <location line="-107"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation>Consenti ricerche DNS per aggiungere nodi e collegare
</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+60"/>
<source>Loading addresses...</source>
<translation>Caricamento indirizzi...</translation>
</message>
@@ -3882,7 +3969,7 @@ per esempio: alertnotify=echo %%s | mail -s &quot;Allarme Bitcoin&quot; admin@fo
<translation>Versione -socks proxy sconosciuta richiesta: %i</translation>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation>Impossibile risolvere -bind address: &apos;%s&apos;</translation>
</message>
@@ -3892,7 +3979,7 @@ per esempio: alertnotify=echo %%s | mail -s &quot;Allarme Bitcoin&quot; admin@fo
<translation>Impossibile risolvere indirizzo -externalip: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+47"/>
+ <location line="+48"/>
<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>
@@ -3912,7 +3999,7 @@ per esempio: alertnotify=echo %%s | mail -s &quot;Allarme Bitcoin&quot; admin@fo
<translation>Caricamento dell&apos;indice del blocco...</translation>
</message>
<message>
- <location line="-61"/>
+ <location line="-62"/>
<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>
@@ -3922,22 +4009,22 @@ per esempio: alertnotify=echo %%s | mail -s &quot;Allarme Bitcoin&quot; admin@fo
<translation>Impossibile collegarsi alla %s su questo computer. Probabilmente Bitcoin è già in esecuzione.</translation>
</message>
<message>
- <location line="+94"/>
+ <location line="+95"/>
<source>Loading wallet...</source>
<translation>Caricamento portamonete...</translation>
</message>
<message>
- <location line="-55"/>
+ <location line="-56"/>
<source>Cannot downgrade wallet</source>
<translation>Non è possibile retrocedere il wallet</translation>
</message>
<message>
<location line="+3"/>
<source>Cannot write default address</source>
- <translation>Non è possibile scrivere l&apos;indirizzo di default</translation>
+ <translation>Non è possibile scrivere l&apos;indirizzo predefinito</translation>
</message>
<message>
- <location line="+66"/>
+ <location line="+67"/>
<source>Rescanning...</source>
<translation>Ripetere la scansione...</translation>
</message>
@@ -3957,7 +4044,7 @@ per esempio: alertnotify=echo %%s | mail -s &quot;Allarme Bitcoin&quot; admin@fo
<translation>Errore</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-35"/>
<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 bc5d2e3715..216f23c46e 100644
--- a/src/qt/locale/bitcoin_ja.ts
+++ b/src/qt/locale/bitcoin_ja.ts
@@ -3,13 +3,13 @@
<name>AboutDialog</name>
<message>
<location filename="../forms/aboutdialog.ui" line="+14"/>
- <source>About Bitcoin</source>
- <translation>Bitcoin ã«ã¤ã„ã¦</translation>
+ <source>About Bitcoin Core</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+39"/>
- <source>&lt;b&gt;Bitcoin&lt;/b&gt; version</source>
- <translation>&lt;b&gt;Bitcoin&lt;/b&gt; ãƒãƒ¼ã‚¸ãƒ§ãƒ³</translation>
+ <source>&lt;b&gt;Bitcoin Core&lt;/b&gt; version</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+57"/>
@@ -27,14 +27,14 @@ MIT/X11 ソフトウェア ライセンスã®ä¸‹ã§é…布ã•ã‚Œã¦ã„ã¾ã™ã€‚è©
ã“ã®è£½å“㯠OpenSSL Toolkit (http://www.openssl.org/) ã«ç”¨ã„られる Eric Young (eay@cryptsoft.com) ãŒé–‹ç™ºã—ãŸæš—å·åŒ–ソフトウェア㨠Thomas Bernard ãŒé–‹ç™ºã—㟠UPnP ソフトウェアをå«ã‚“ã§ã„ã¾ã™ã€‚</translation>
</message>
<message>
- <location filename="../aboutdialog.cpp" line="+14"/>
+ <location filename="../utilitydialog.cpp" line="+29"/>
<source>Copyright</source>
<translation>Copyright</translation>
</message>
<message>
<location line="+0"/>
- <source>The Bitcoin developers</source>
- <translation>The Bitcoin developers</translation>
+ <source>The Bitcoin Core developers</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -70,7 +70,7 @@ MIT/X11 ソフトウェア ライセンスã®ä¸‹ã§é…布ã•ã‚Œã¦ã„ã¾ã™ã€‚è©
<translation type="unfinished"/>
</message>
<message>
- <location filename="../addressbookpage.cpp" line="+72"/>
+ <location filename="../addressbookpage.cpp" line="+74"/>
<source>&amp;Copy Address</source>
<translation>アドレスをコピー (&amp;C)</translation>
</message>
@@ -112,12 +112,12 @@ MIT/X11 ソフトウェア ライセンスã®ä¸‹ã§é…布ã•ã‚Œã¦ã„ã¾ã™ã€‚è©
<message>
<location line="+6"/>
<source>Sending addresses</source>
- <translation type="unfinished"/>
+ <translation>アドレスé€ä¿¡ä¸­</translation>
</message>
<message>
<location line="+1"/>
<source>Receiving addresses</source>
- <translation type="unfinished"/>
+ <translation>アドレスå—信中</translation>
</message>
<message>
<location line="+7"/>
@@ -140,7 +140,7 @@ MIT/X11 ソフトウェア ライセンスã®ä¸‹ã§é…布ã•ã‚Œã¦ã„ã¾ã™ã€‚è©
<translation>編集 (&amp;E)</translation>
</message>
<message>
- <location line="+197"/>
+ <location line="+194"/>
<source>Export Address List</source>
<translation type="unfinished"/>
</message>
@@ -151,19 +151,19 @@ MIT/X11 ソフトウェア ライセンスã®ä¸‹ã§é…布ã•ã‚Œã¦ã„ã¾ã™ã€‚è©
</message>
<message>
<location line="+13"/>
- <source>Error exporting</source>
- <translation>エクスãƒãƒ¼ãƒˆã‚¨ãƒ©ãƒ¼</translation>
+ <source>Exporting Failed</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation>%1ã®ãƒ•ã‚¡ã‚¤ãƒ«ã«æ›¸ãè¾¼ã‚ã¾ã›ã‚“ã§ã—ãŸã€‚</translation>
+ <location line="+1"/>
+ <source>There was an error trying to save the address list to %1.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<name>AddressTableModel</name>
<message>
- <location filename="../addresstablemodel.cpp" line="+164"/>
+ <location filename="../addresstablemodel.cpp" line="+168"/>
<source>Label</source>
<translation>ラベル</translation>
</message>
@@ -201,7 +201,7 @@ MIT/X11 ソフトウェア ライセンスã®ä¸‹ã§é…布ã•ã‚Œã¦ã„ã¾ã™ã€‚è©
<translation>æ–°ã—ã„パスフレーズをもã†ä¸€åº¦</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="+34"/>
+ <location filename="../askpassphrasedialog.cpp" line="+40"/>
<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;8個以上ã®å˜èªžã‹10個以上ã®ãƒ©ãƒ³ãƒ€ãƒ ãªæ–‡å­—&lt;/b&gt;を使ã£ã¦ãã ã•ã„。</translation>
</message>
@@ -322,22 +322,27 @@ MIT/X11 ソフトウェア ライセンスã®ä¸‹ã§é…布ã•ã‚Œã¦ã„ã¾ã™ã€‚è©
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+250"/>
+ <location filename="../bitcoingui.cpp" line="+295"/>
<source>Sign &amp;message...</source>
<translation>メッセージã®ç½²å... (&amp;m)</translation>
</message>
<message>
- <location line="+254"/>
+ <location line="+335"/>
<source>Synchronizing with network...</source>
<translation>ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã«åŒæœŸä¸­â€¦â€¦</translation>
</message>
<message>
- <location line="-324"/>
+ <location line="-407"/>
<source>&amp;Overview</source>
<translation>概è¦(&amp;O)</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="-137"/>
+ <source>Node</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+138"/>
<source>Show general overview of wallet</source>
<translation>ウォレットã®æ¦‚è¦ã‚’見る</translation>
</message>
@@ -352,7 +357,7 @@ MIT/X11 ソフトウェア ライセンスã®ä¸‹ã§é…布ã•ã‚Œã¦ã„ã¾ã™ã€‚è©
<translation>å–引履歴を閲覧</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>E&amp;xit</source>
<translation>終了(&amp;E)</translation>
</message>
@@ -398,7 +403,22 @@ MIT/X11 ソフトウェア ライセンスã®ä¸‹ã§é…布ã•ã‚Œã¦ã„ã¾ã™ã€‚è©
<translation>パスフレーズã®å¤‰æ›´... (&amp;C)</translation>
</message>
<message>
- <location line="+259"/>
+ <location line="+10"/>
+ <source>&amp;Sending addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Receiving addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open &amp;URI...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+325"/>
<source>Importing blocks from disk...</source>
<translation>ディスクã‹ã‚‰ãƒ–ロックをインãƒãƒ¼ãƒˆã—ã¦ã„ã¾ã™...</translation>
</message>
@@ -408,12 +428,12 @@ MIT/X11 ソフトウェア ライセンスã®ä¸‹ã§é…布ã•ã‚Œã¦ã„ã¾ã™ã€‚è©
<translation>ディスク上ã®ãƒ–ロックã®ã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹ã‚’å†ä½œæˆä¸­...</translation>
</message>
<message>
- <location line="-322"/>
+ <location line="-405"/>
<source>Send coins to a Bitcoin address</source>
<translation>Bitcoin アドレスã«ã‚³ã‚¤ãƒ³ã‚’é€ã‚‹</translation>
</message>
<message>
- <location line="+47"/>
+ <location line="+49"/>
<source>Modify configuration options for Bitcoin</source>
<translation>Bitcoin ã®è¨­å®šã‚’変更ã™ã‚‹</translation>
</message>
@@ -443,20 +463,17 @@ MIT/X11 ソフトウェア ライセンスã®ä¸‹ã§é…布ã•ã‚Œã¦ã„ã¾ã™ã€‚è©
<translation>メッセージã®æ¤œè¨¼... (&amp;V)</translation>
</message>
<message>
- <location line="-180"/>
- <location line="+6"/>
- <location line="+513"/>
+ <location line="+430"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-519"/>
- <location line="+6"/>
+ <location line="-643"/>
<source>Wallet</source>
<translation>ウォレット</translation>
</message>
<message>
- <location line="+109"/>
+ <location line="+146"/>
<source>&amp;Send</source>
<translation>é€ã‚‹ (&amp;S)</translation>
</message>
@@ -466,13 +483,7 @@ MIT/X11 ソフトウェア ライセンスã®ä¸‹ã§é…布ã•ã‚Œã¦ã„ã¾ã™ã€‚è©
<translation>å—ä¿¡ (&amp;R)</translation>
</message>
<message>
- <location line="+28"/>
- <location line="+2"/>
- <source>&amp;About Bitcoin</source>
- <translation>Bitcoin ã«ã¤ã„㦠(&amp;A)</translation>
- </message>
- <message>
- <location line="+14"/>
+ <location line="+46"/>
<location line="+2"/>
<source>&amp;Show / Hide</source>
<translation>見る/隠㙠(&amp;S)</translation>
@@ -498,64 +509,80 @@ MIT/X11 ソフトウェア ライセンスã®ä¸‹ã§é…布ã•ã‚Œã¦ã„ã¾ã™ã€‚è©
<translation>指定ã•ã‚ŒãŸ Bitcoin アドレスã§ç½²åã•ã‚ŒãŸã“ã¨ã‚’確èªã™ã‚‹ãŸã‚ã«ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’検証ã—ã¾ã™</translation>
</message>
<message>
- <location line="+35"/>
+ <location line="+48"/>
<source>&amp;File</source>
<translation>ファイル(&amp;F)</translation>
</message>
<message>
- <location line="+10"/>
+ <location line="+14"/>
<source>&amp;Settings</source>
<translation>設定(&amp;S)</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>&amp;Help</source>
<translation>ヘルプ(&amp;H)</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+15"/>
<source>Tabs toolbar</source>
<translation>タブツールãƒãƒ¼</translation>
</message>
<message>
- <location line="-235"/>
- <location line="+294"/>
+ <location line="-284"/>
+ <location line="+376"/>
<source>[testnet]</source>
<translation>[testnet]</translation>
</message>
<message>
- <location line="-177"/>
+ <location line="-401"/>
+ <source>Bitcoin Core</source>
+ <translation>Bitcoin ã®ã‚³ã‚¢</translation>
+ </message>
+ <message>
+ <location line="+163"/>
<source>Request payments (generates QR codes and bitcoin: URIs)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+63"/>
- <source>&amp;Used sending addresses...</source>
+ <location line="+29"/>
+ <location line="+2"/>
+ <source>&amp;About Bitcoin Core</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="+35"/>
<source>Show the list of used sending addresses and labels</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Used &amp;receiving addresses...</source>
+ <location line="+2"/>
+ <source>Show the list of used receiving addresses and labels</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open a bitcoin: URI or payment request</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Command-line options</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
- <source>Show the list of used receiving addresses and labels</source>
+ <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+106"/>
+ <location line="+159"/>
<location line="+5"/>
<source>Bitcoin client</source>
<translation>Bitcoin クライアント</translation>
</message>
<message numerus="yes">
- <location line="+120"/>
+ <location line="+142"/>
<source>%n active connection(s) to Bitcoin network</source>
<translation><numerusform>%n ã® Bitcoin ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã¸ã®ã‚¢ã‚¯ãƒ†ã‚£ãƒ–ãªæŽ¥ç¶š</numerusform></translation>
</message>
@@ -575,7 +602,7 @@ MIT/X11 ソフトウェア ライセンスã®ä¸‹ã§é…布ã•ã‚Œã¦ã„ã¾ã™ã€‚è©
<translation>å–引履歴㮠%1 ブロックを処ç†ã—ã¾ã—ãŸã€‚</translation>
</message>
<message numerus="yes">
- <location line="+20"/>
+ <location line="+23"/>
<source>%n hour(s)</source>
<translation><numerusform>%n 時間</numerusform></translation>
</message>
@@ -595,7 +622,7 @@ MIT/X11 ソフトウェア ライセンスã®ä¸‹ã§é…布ã•ã‚Œã¦ã„ã¾ã™ã€‚è©
<translation>%1 é…延</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="+21"/>
<source>Last received block was generated %1 ago.</source>
<translation>最後ã«å—ä¿¡ã•ã‚ŒãŸãƒ–ロック㯠%1 å‰ã«ç”Ÿæˆã•ã‚Œã¾ã—ãŸã€‚</translation>
</message>
@@ -620,27 +647,17 @@ MIT/X11 ソフトウェア ライセンスã®ä¸‹ã§é…布ã•ã‚Œã¦ã„ã¾ã™ã€‚è©
<translation>情報</translation>
</message>
<message>
- <location line="+77"/>
- <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="-152"/>
+ <location line="-85"/>
<source>Up to date</source>
<translation>ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã¯æœ€æ–°ã§ã™</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Catching up...</source>
<translation>追跡中...</translation>
</message>
<message>
- <location line="+124"/>
- <source>Confirm transaction fee</source>
- <translation>å–引手数料を確èª</translation>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+130"/>
<source>Sent transaction</source>
<translation>é€é‡‘å–引</translation>
</message>
@@ -662,18 +679,7 @@ Address: %4
アドレス: %4</translation>
</message>
<message>
- <location line="+34"/>
- <source>URI handling</source>
- <translation>URI ã®æ“作</translation>
- </message>
- <message>
- <location line="+0"/>
- <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>
- <message>
- <location line="+45"/>
+ <location line="+69"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation>ウォレットã¯&lt;b&gt;æš—å·åŒ–ã•ã‚Œã¦ã€ã‚¢ãƒ³ãƒ­ãƒƒã‚¯ã•ã‚Œã¦ã„ã¾ã™&lt;/b&gt;</translation>
</message>
@@ -683,7 +689,7 @@ Address: %4
<translation>ウォレットã¯&lt;b&gt;æš—å·åŒ–ã•ã‚Œã¦ã€ãƒ­ãƒƒã‚¯ã•ã‚Œã¦ã„ã¾ã™&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+110"/>
+ <location filename="../bitcoin.cpp" line="+438"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation>致命的ãªã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚Bitcoin ã¯å®‰å…¨ã«ç¶™ç¶šã™ã‚‹ã“ã¨ãŒã§ããšçµ‚了ã™ã‚‹ã§ã—ょã†ã€‚
</translation>
@@ -692,12 +698,304 @@ Address: %4
<context>
<name>ClientModel</name>
<message>
- <location filename="../clientmodel.cpp" line="+115"/>
+ <location filename="../clientmodel.cpp" line="+119"/>
<source>Network Alert</source>
<translation>ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯è­¦å‘Š</translation>
</message>
</context>
<context>
+ <name>CoinControlDialog</name>
+ <message>
+ <location filename="../forms/coincontroldialog.ui" line="+14"/>
+ <source>Coin Control Address Selection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>Quantity:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Bytes:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>Amount:</source>
+ <translation>ç·é¡:</translation>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Priority:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Low Output:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>After Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Change:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+63"/>
+ <source>(un)select all</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Tree mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>List mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>Amount</source>
+ <translation>ç·é¡</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Address</source>
+ <translation>アドレス</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Date</source>
+ <translation>日付</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Confirmations</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Confirmed</source>
+ <translation>検証済ã¿</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../coincontroldialog.cpp" line="+42"/>
+ <source>Copy address</source>
+ <translation>アドレスをコピーã™ã‚‹</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy label</source>
+ <translation>ラベルをコピーã™ã‚‹</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+26"/>
+ <source>Copy amount</source>
+ <translation>ç·é¡ã®ã‚³ãƒ”ー</translation>
+ </message>
+ <message>
+ <location line="-25"/>
+ <source>Copy transaction ID</source>
+ <translation>å–引 ID をコピー</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Lock unspent</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Unlock unspent</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+22"/>
+ <source>Copy quantity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Copy fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy after fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy bytes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy low output</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy change</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+323"/>
+ <source>highest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>higher</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>high</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>medium-high</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>medium</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>low-medium</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>low</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>lower</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>lowest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>(%1 locked)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+140"/>
+ <source>Dust</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>yes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>no</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>This label turns red, if the transaction size is greater than 1000 bytes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+5"/>
+ <source>This means a fee of at least %1 per kB is required.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-4"/>
+ <source>Can vary +/- 1 byte per input.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Transactions with higher priority are more likely to get included into a block.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>This label turns red, if the priority is smaller than &quot;medium&quot;.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>This label turns red, if any recipient receives an amount smaller than %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+4"/>
+ <source>This means a fee of at least %1 is required.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-3"/>
+ <source>Amounts below 0.546 times the minimum relay fee are shown as dust.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>This label turns red, if the change is smaller than %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
+ <location line="+66"/>
+ <source>(no label)</source>
+ <translation>(ラベル無ã—)</translation>
+ </message>
+ <message>
+ <location line="-9"/>
+ <source>change from %1 (%2)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>(change)</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>EditAddressDialog</name>
<message>
<location filename="../forms/editaddressdialog.ui" line="+14"/>
@@ -725,7 +1023,7 @@ Address: %4
<translation>アドレス帳 (&amp;A)</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+21"/>
+ <location filename="../editaddressdialog.cpp" line="+28"/>
<source>New receiving address</source>
<translation>æ–°ã—ã„å—信アドレス</translation>
</message>
@@ -768,7 +1066,7 @@ Address: %4
<context>
<name>FreespaceChecker</name>
<message>
- <location filename="../intro.cpp" line="+61"/>
+ <location filename="../intro.cpp" line="+65"/>
<source>A new data directory will be created.</source>
<translation>æ–°ã—ã„データ ディレクトリãŒä½œæˆã•ã‚Œã¾ã™ã€‚</translation>
</message>
@@ -794,15 +1092,19 @@ Address: %4
</message>
</context>
<context>
- <name>GUIUtil::HelpMessageBox</name>
+ <name>HelpMessageDialog</name>
<message>
- <location filename="../guiutil.cpp" line="+558"/>
- <location line="+13"/>
- <source>Bitcoin-Qt</source>
- <translation>Bitcoin-Qt</translation>
+ <location filename="../forms/helpmessagedialog.ui" line="+19"/>
+ <source>Bitcoin Core - Command-line options</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="-13"/>
+ <location filename="../utilitydialog.cpp" line="+38"/>
+ <source>Bitcoin Core</source>
+ <translation>Bitcoin ã®ã‚³ã‚¢</translation>
+ </message>
+ <message>
+ <location line="+0"/>
<source>version</source>
<translation>ãƒãƒ¼ã‚¸ãƒ§ãƒ³</translation>
</message>
@@ -851,18 +1153,18 @@ Address: %4
</message>
<message>
<location line="+9"/>
- <source>Welcome to Bitcoin-Qt.</source>
- <translation>Bitcoin-Qt ã¸ã‚ˆã†ã“ã。</translation>
+ <source>Welcome to Bitcoin Core.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+26"/>
- <source>As this is the first time the program is launched, you can choose where Bitcoin-Qt will store its data.</source>
- <translation>プログラムãŒåˆã‚ã¦èµ·å‹•ã•ã‚Œã‚‹ã®ã§ Bitcoin-Qt ãŒãƒ‡ãƒ¼ã‚¿ã‚’ä¿å­˜ã™ã‚‹å ´æ‰€ã‚’é¸ã¶ã“ã¨ãŒã§ãã¾ã™ã€‚</translation>
+ <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+10"/>
- <source>Bitcoin-Qt will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
- <translation>Bitcoin-Qt ã¯ãƒ–ロック ãƒã‚§ãƒ¼ãƒ³ã®ã‚³ãƒ”ーをダウンロードã—ã¦ä¿å­˜ã—ã¾ã™ã€‚å°‘ãªãã¨ã‚‚ %1GB ã®ãƒ‡ãƒ¼ã‚¿ãŒã“ã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã«ä¿å­˜ã•ã‚Œã€æ™‚é–“ã¨ã¨ã‚‚ã«å¢—ãˆã¦ã„ãã¾ã™ã€‚ウォレットもã“ã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã«ä¿å­˜ã•ã‚Œã¾ã™ã€‚</translation>
+ <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+10"/>
@@ -875,7 +1177,17 @@ Address: %4
<translation>ä»»æ„ã®ãƒ‡ãƒ¼ã‚¿ ディレクトリを使用:</translation>
</message>
<message>
- <location filename="../intro.cpp" line="+105"/>
+ <location filename="../intro.cpp" line="+85"/>
+ <source>Bitcoin</source>
+ <translation>Bitcoin</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error: Specified data directory &quot;%1&quot; can not be created.</source>
+ <translation>エラー: 指定ã®ãƒ‡ãƒ¼ã‚¿ ディレクトリ &quot;%1&quot; を作æˆã§ãã¾ã›ã‚“。</translation>
+ </message>
+ <message>
+ <location line="+19"/>
<source>Error</source>
<translation>エラー</translation>
</message>
@@ -891,6 +1203,34 @@ Address: %4
</message>
</context>
<context>
+ <name>OpenURIDialog</name>
+ <message>
+ <location filename="../forms/openuridialog.ui" line="+14"/>
+ <source>Open URI</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Open payment request from URI or file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>URI:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Select payment request file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../openuridialog.cpp" line="+47"/>
+ <source>Select payment request file to open</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OptionsDialog</name>
<message>
<location filename="../forms/optionsdialog.ui" line="+14"/>
@@ -898,7 +1238,7 @@ Address: %4
<translation>設定</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+13"/>
<source>&amp;Main</source>
<translation>メイン (&amp;M)</translation>
</message>
@@ -923,7 +1263,52 @@ Address: %4
<translation>システムã«ãƒ­ã‚°ã‚¤ãƒ³ã—ãŸæ™‚ã« Bitcoin ã‚’èµ·å‹• (&amp;S)</translation>
</message>
<message>
- <location line="+35"/>
+ <location line="+9"/>
+ <source>Size of &amp;database cache</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set database cache size in megabytes (default: 25)</source>
+ <translation>データベースã®ã‚­ãƒ£ãƒƒã‚·ãƒ¥ã‚µã‚¤ã‚ºã‚’メガãƒã‚¤ãƒˆã§è¨­å®š (åˆæœŸå€¤: 25)</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>MB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Number of script &amp;verification threads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
+ <translation>スクリプト検証スレッドを設定 (最大 16, 0 = 自動, &lt;0 = ãŸãã•ã‚“ã®ã‚³ã‚¢ã‚’自由ã«ã—ã¦ãŠã, åˆæœŸå€¤: 0)</translation>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Connect to the Bitcoin network through a SOCKS proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Connect through SOCKS proxy (default proxy):</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+224"/>
+ <source>Active command-line options that override above options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
<source>Reset all client options to default.</source>
<translation>ã™ã¹ã¦ã®ã‚ªãƒ—ションをåˆæœŸå€¤ã«æˆ»ã—ã¾ã™ã€‚</translation>
</message>
@@ -933,7 +1318,7 @@ Address: %4
<translation>オプションをリセット (&amp;R)</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="-323"/>
<source>&amp;Network</source>
<translation>ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ (&amp;N)</translation>
</message>
@@ -948,32 +1333,17 @@ Address: %4
<translation>UPnP を使ã£ã¦ãƒãƒ¼ãƒˆã‚’割り当ã¦ã‚‹ (&amp;U)</translation>
</message>
<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>
- </message>
- <message>
- <location line="+3"/>
- <source>&amp;Connect through SOCKS proxy:</source>
- <translation>SOCKS プロキシã§æŽ¥ç¶š (&amp;C) : </translation>
- </message>
- <message>
- <location line="+9"/>
+ <location line="+19"/>
<source>Proxy &amp;IP:</source>
<translation>プロキシ㮠IP (&amp;I) :</translation>
</message>
<message>
- <location line="+19"/>
- <source>IP address of the proxy (e.g. 127.0.0.1)</source>
- <translation>プロキシ㮠IP アドレス (例 127.0.0.1)</translation>
- </message>
- <message>
- <location line="+7"/>
+ <location line="+32"/>
<source>&amp;Port:</source>
<translation>ãƒãƒ¼ãƒˆ (&amp;P) :</translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+25"/>
<source>Port of the proxy (e.g. 9050)</source>
<translation>プロキシã®ãƒãƒ¼ãƒˆç•ªå· (例 9050)</translation>
</message>
@@ -1048,7 +1418,17 @@ Address: %4
<translation>å–引履歴ã«ã‚¢ãƒ‰ãƒ¬ã‚¹ã‚’表示 (&amp;D)</translation>
</message>
<message>
- <location line="+71"/>
+ <location line="+7"/>
+ <source>Whether to show coin control features or not.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Display coin &amp;control features (experts only)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+136"/>
<source>&amp;OK</source>
<translation>&amp;OK</translation>
</message>
@@ -1058,44 +1438,38 @@ Address: %4
<translation>キャンセル (&amp;C)</translation>
</message>
<message>
- <location line="+10"/>
- <source>&amp;Apply</source>
- <translation>é©ç”¨ (&amp;A)</translation>
- </message>
- <message>
- <location filename="../optionsdialog.cpp" line="+58"/>
+ <location filename="../optionsdialog.cpp" line="+67"/>
<source>default</source>
<translation>åˆæœŸå€¤</translation>
</message>
<message>
- <location line="+130"/>
+ <location line="+57"/>
+ <source>none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+75"/>
<source>Confirm options reset</source>
<translation>オプションã®ãƒªã‚»ãƒƒãƒˆã®ç¢ºèª</translation>
</message>
<message>
<location line="+1"/>
- <source>Some settings may require a client restart to take effect.</source>
- <translation>ã„ãã¤ã‹ã®è¨­å®šã¯ã‚¯ãƒ©ã‚¤ã‚¢ãƒ³ãƒˆã‚’å†èµ·å‹•ã—ãŸã‚ã¨ã«æœ‰åŠ¹ã«ãªã‚Šã¾ã™ã€‚</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Do you want to proceed?</source>
- <translation>続行ã—ã¾ã™ã‹?</translation>
+ <location line="+29"/>
+ <source>Client restart required to activate changes.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
- <location line="+9"/>
- <source>Warning</source>
- <translation>警告</translation>
+ <location line="-29"/>
+ <source>Client will be shutdown, do you want to proceed?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="-9"/>
- <location line="+9"/>
- <source>This setting will take effect after restarting Bitcoin.</source>
- <translation>ã“ã®è¨­å®šã‚’å映ã™ã‚‹ã«ã¯ Bitcoin ã‚’å†èµ·å‹•ã—ã¾ã™ã€‚</translation>
+ <location line="+33"/>
+ <source>This change would require a client restart.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+29"/>
+ <location line="+34"/>
<source>The supplied proxy address is invalid.</source>
<translation>プロキシアドレスãŒç„¡åŠ¹ã§ã™ã€‚</translation>
</message>
@@ -1109,22 +1483,22 @@ Address: %4
</message>
<message>
<location line="+50"/>
- <location line="+202"/>
+ <location line="+231"/>
<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="-131"/>
+ <location line="-155"/>
<source>Unconfirmed:</source>
<translation>未確èªï¼š</translation>
</message>
<message>
- <location line="-78"/>
+ <location line="-83"/>
<source>Wallet</source>
<translation>ウォレット</translation>
</message>
<message>
- <location line="+49"/>
+ <location line="+51"/>
<source>Confirmed:</source>
<translation>確èªæ¸ˆã¿:</translation>
</message>
@@ -1134,12 +1508,12 @@ Address: %4
<translation>ã‚ãªãŸã®åˆ©ç”¨å¯èƒ½æ®‹é«˜</translation>
</message>
<message>
- <location line="+29"/>
+ <location line="+32"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation>未検証ã®å–引ã§åˆ©ç”¨å¯èƒ½æ®‹é«˜ã«å映ã•ã‚Œã¦ã„ãªã„æ•°</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+16"/>
<source>Immature:</source>
<translation>未完æˆ:</translation>
</message>
@@ -1149,7 +1523,7 @@ Address: %4
<translation>完æˆã—ã¦ã„ãªã„採掘ã•ã‚ŒãŸæ®‹é«˜</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+16"/>
<source>Total:</source>
<translation>åˆè¨ˆ:</translation>
</message>
@@ -1159,12 +1533,12 @@ Address: %4
<translation>ã‚ãªãŸã®ç¾åœ¨ã®æ®‹é«˜</translation>
</message>
<message>
- <location line="+53"/>
+ <location line="+71"/>
<source>&lt;b&gt;Recent transactions&lt;/b&gt;</source>
<translation>&lt;b&gt;最近ã®å–引&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../overviewpage.cpp" line="+116"/>
+ <location filename="../overviewpage.cpp" line="+120"/>
<location line="+1"/>
<source>out of sync</source>
<translation>åŒæœŸã—ã¦ã„ãªã„</translation>
@@ -1173,7 +1547,8 @@ Address: %4
<context>
<name>PaymentServer</name>
<message>
- <location filename="../paymentserver.cpp" line="+392"/>
+ <location filename="../paymentserver.cpp" line="+403"/>
+ <location line="+13"/>
<source>URI handling</source>
<translation>URI ã®æ“作</translation>
</message>
@@ -1184,45 +1559,82 @@ Address: %4
</translation>
</message>
<message>
- <location line="+69"/>
+ <location line="+96"/>
<source>Requested payment amount of %1 is too small (considered dust).</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
- <location line="+37"/>
+ <location line="-221"/>
+ <location line="+212"/>
+ <location line="+13"/>
+ <location line="+95"/>
+ <location line="+18"/>
+ <location line="+16"/>
<source>Payment request error</source>
<translation>支払ã„ã®ãƒªã‚¯ã‚¨ã‚¹ãƒˆã®ã‚¨ãƒ©ãƒ¼ã§ã™</translation>
</message>
<message>
+ <location line="-353"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
+ <translation>Bitcoin ã‚’èµ·å‹•ã§ãã¾ã›ã‚“: click-to-pay handler</translation>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Net manager warning</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+1"/>
- <source>Insecure requests to custom payment scripts unsupported</source>
- <translation>カスタム支払ã„ã®ã‚¹ã‚¯ãƒªãƒ—トã«å®‰å…¨ã§ãªã„ã®ãƒªã‚¯ã‚¨ã‚¹ãƒˆã¯æ”¯æŒã•ã‚Œã¦ã„ãªã„</translation>
+ <source>Your active proxy doesn&apos;t support SOCKS5, which is required for payment requests via proxy.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+38"/>
+ <location line="+52"/>
+ <source>Payment request fetch URL is invalid: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Payment request file handling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Payment request file can not be read or processed! This can be caused by an invalid payment request file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+73"/>
+ <source>Unverified payment requests to custom payment scripts are unsupported.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+59"/>
<source>Refund from %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
+ <location line="+43"/>
<source>Error communicating with %1: %2</source>
<translation>%1: %2ã¨ã‚³ãƒŸãƒ¥ãƒ‹ã‚±ãƒ¼ã‚·ãƒ§ãƒ³ãƒ»ã‚¨ãƒ©ãƒ¼ã§ã™</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+24"/>
+ <source>Payment request can not be parsed or processed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
<source>Bad response from server %1</source>
<translation>サーãƒãƒ¼ã®è¿”事ã¯ç„¡åŠ¹ %1</translation>
</message>
<message>
- <location line="+32"/>
+ <location line="+33"/>
<source>Payment acknowledged</source>
<translation>支払ã„ã¯ç¢ºèªã—ã¾ã—ãŸ</translation>
</message>
<message>
- <location line="-58"/>
- <location line="+30"/>
- <location line="+17"/>
+ <location line="-11"/>
<source>Network request error</source>
<translation>ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ãƒ»ãƒªã‚¯ã‚¨ã‚¹ãƒˆã®ã‚¨ãƒ©ãƒ¼ã§ã™</translation>
</message>
@@ -1230,32 +1642,26 @@ Address: %4
<context>
<name>QObject</name>
<message>
- <location filename="../bitcoin.cpp" line="+114"/>
- <location line="+5"/>
- <location filename="../intro.cpp" line="-32"/>
+ <location filename="../bitcoin.cpp" line="+71"/>
+ <location line="+11"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-4"/>
+ <location line="+1"/>
<source>Error: Specified data directory &quot;%1&quot; does not exist.</source>
<translation>エラー: 指定ã®ãƒ‡ãƒ¼ã‚¿ ディレクトリ &quot;%1&quot; ã¯å­˜åœ¨ã—ã¾ã›ã‚“。</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="-12"/>
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation>エラー: -regtestã¨-testnetã¯ä¸€ç·’ã«ã™ã‚‹ã®ã¯ç„¡åŠ¹ã§ã™ã€‚</translation>
</message>
- <message>
- <location filename="../intro.cpp" line="+1"/>
- <source>Error: Specified data directory &quot;%1&quot; can not be created.</source>
- <translation>エラー: 指定ã®ãƒ‡ãƒ¼ã‚¿ ディレクトリ &quot;%1&quot; を作æˆã§ãã¾ã›ã‚“。</translation>
- </message>
</context>
<context>
<name>QRImageWidget</name>
<message>
- <location filename="../receiverequestdialog.cpp" line="+32"/>
+ <location filename="../receiverequestdialog.cpp" line="+36"/>
<source>&amp;Save Image...</source>
<translation type="unfinished"/>
</message>
@@ -1271,8 +1677,8 @@ Address: %4
</message>
<message>
<location line="+0"/>
- <source>PNG Images (*.png)</source>
- <translation>PNG ç”»åƒ (*.png)</translation>
+ <source>PNG Image (*.png)</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1289,15 +1695,16 @@ Address: %4
<location line="+23"/>
<location line="+23"/>
<location line="+36"/>
- <location line="+53"/>
+ <location line="+23"/>
+ <location line="+36"/>
<location line="+23"/>
<location line="+23"/>
- <location filename="../rpcconsole.cpp" line="+352"/>
+ <location filename="../rpcconsole.cpp" line="+359"/>
<source>N/A</source>
<translation>N/A</translation>
</message>
<message>
- <location line="-217"/>
+ <location line="-223"/>
<source>Client version</source>
<translation>クライアントã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³</translation>
</message>
@@ -1307,7 +1714,17 @@ Address: %4
<translation>情報 (&amp;I)</translation>
</message>
<message>
- <location line="+68"/>
+ <location line="-10"/>
+ <source>Debug window</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+25"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+53"/>
<source>Using OpenSSL version</source>
<translation>使用中㮠OpenSSL ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³</translation>
</message>
@@ -1323,16 +1740,16 @@ Address: %4
</message>
<message>
<location line="+7"/>
- <source>Number of connections</source>
- <translation>接続数</translation>
+ <source>Name</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+23"/>
- <source>On testnet</source>
- <translation>testnet 機能</translation>
+ <source>Number of connections</source>
+ <translation>接続数</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+29"/>
<source>Block chain</source>
<translation>ブロック ãƒã‚§ãƒ¼ãƒ³</translation>
</message>
@@ -1357,21 +1774,6 @@ Address: %4
<translation>é–‹ã (&amp;O)</translation>
</message>
<message>
- <location line="+16"/>
- <source>Command-line options</source>
- <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>有効㪠Bitcoin ã®ã‚³ãƒžãƒ³ãƒ‰ãƒ©ã‚¤ãƒ³ オプションを見るãŸã‚ã« Bitcoin-Qt ã®ãƒ˜ãƒ«ãƒ—メッセージを表示ã—ã¾ã™ã€‚</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>&amp;Show</source>
- <translation>表示ã™ã‚‹ (&amp;S)</translation>
- </message>
- <message>
<location line="+24"/>
<source>&amp;Console</source>
<translation>コンソール (&amp;C)</translation>
@@ -1402,22 +1804,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-541"/>
+ <location line="-521"/>
<source>Build date</source>
<translation>ビルドã®æ—¥ä»˜</translation>
</message>
<message>
- <location line="-104"/>
- <source>Bitcoin - Debug window</source>
- <translation>Bitcoin - デãƒãƒƒã‚° ウインドウ</translation>
- </message>
- <message>
- <location line="+25"/>
- <source>Bitcoin Core</source>
- <translation>Bitcoin ã®ã‚³ã‚¢</translation>
- </message>
- <message>
- <location line="+279"/>
+ <location line="+206"/>
<source>Debug log file</source>
<translation>デãƒãƒƒã‚°ç”¨ãƒ­ã‚°ãƒ•ã‚¡ã‚¤ãƒ«</translation>
</message>
@@ -1427,7 +1819,7 @@ Address: %4
<translation>ç¾åœ¨ã®ãƒ‡ãƒ¼ã‚¿ ディレクトリã‹ã‚‰ Bitcoin ã®ãƒ‡ãƒãƒƒã‚°ç”¨ãƒ­ã‚°ãƒ•ã‚¡ã‚¤ãƒ«ã‚’é–‹ãã¾ã™ã€‚ログファイルãŒå¤§è¦æ¨¡ãªå ´åˆã«ã¯æ•°ç§’ã‹ã‹ã‚‹ã“ã¨ãŒã‚ã‚Šã¾ã™ã€‚</translation>
</message>
<message>
- <location line="+102"/>
+ <location line="+76"/>
<source>Clear console</source>
<translation>コンソールをクリア</translation>
</message>
@@ -1447,7 +1839,7 @@ Address: %4
<translation>使用å¯èƒ½ãªã‚³ãƒžãƒ³ãƒ‰ã‚’見るã«ã¯ &lt;b&gt;help&lt;/b&gt; ã¨å…¥åŠ›ã—ã¾ã™ã€‚</translation>
</message>
<message>
- <location line="+128"/>
+ <location line="+122"/>
<source>%1 B</source>
<translation type="unfinished"/>
</message>
@@ -1485,48 +1877,48 @@ Address: %4
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+22"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
<source>&amp;Amount:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
- <source>The amount to request</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+7"/>
+ <location line="-13"/>
<source>&amp;Label:</source>
<translation>ラベル(&amp;L):</translation>
</message>
<message>
- <location line="+10"/>
- <source>The label to associate with the receiving address</source>
+ <location line="-34"/>
+ <source>&amp;Message:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>&amp;Message:</source>
+ <location line="-17"/>
+ <source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>The message to attach to payment request</source>
+ <location line="+3"/>
+ <source>R&amp;euse an existing receiving address (not recommended)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
- <source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
+ <location line="+27"/>
+ <source>An optional label to associate with the new receiving address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>R&amp;euse an existing receiving address (not recommended)</source>
+ <location line="+7"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+7"/>
- <source>Use this form to request payments. All fields are optional.</source>
+ <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+39"/>
+ <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1537,20 +1929,45 @@ Address: %4
<message>
<location line="+3"/>
<source>Clear</source>
- <translation type="unfinished"/>
+ <translation>クリア</translation>
</message>
<message>
<location line="+36"/>
<source>&amp;Request payment</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+47"/>
+ <source>Requested payments</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Show the selected request (does the same as double clicking an entry)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Show</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Remove the selected entries from the list</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Remove</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
<message>
<location filename="../forms/receiverequestdialog.ui" line="+29"/>
<source>QR Code</source>
- <translation type="unfinished"/>
+ <translation>QR コード</translation>
</message>
<message>
<location line="+46"/>
@@ -1564,23 +1981,18 @@ Address: %4
</message>
<message>
<location line="+7"/>
- <source>&amp;Copy Image</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+7"/>
<source>&amp;Save Image...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../receiverequestdialog.cpp" line="+58"/>
+ <location filename="../receiverequestdialog.cpp" line="+56"/>
<source>Request payment to %1</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+6"/>
<source>Payment information</source>
- <translation type="unfinished"/>
+ <translation>支払ã„情報</translation>
</message>
<message>
<location line="+1"/>
@@ -1619,16 +2031,119 @@ Address: %4
</message>
</context>
<context>
+ <name>RecentRequestsTableModel</name>
+ <message>
+ <location filename="../recentrequeststablemodel.cpp" line="+24"/>
+ <source>Date</source>
+ <translation>日付</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Label</source>
+ <translation>ラベル</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Message</source>
+ <translation>メッセージ</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Amount</source>
+ <translation>ç·é¡</translation>
+ </message>
+ <message>
+ <location line="+38"/>
+ <source>(no label)</source>
+ <translation>(ラベル無ã—)</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>(no message)</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+140"/>
- <location line="+213"/>
+ <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location line="+80"/>
<source>Send Coins</source>
<translation>コインをé€ã‚‹</translation>
</message>
<message>
- <location line="+50"/>
+ <location line="+76"/>
+ <source>Coin Control Features</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Inputs...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>automatically selected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Insufficient funds!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+89"/>
+ <source>Quantity:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+35"/>
+ <source>Bytes:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Amount:</source>
+ <translation>ç·é¡:</translation>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Priority:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Low Output:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>After Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Change:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+44"/>
+ <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Custom change address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+115"/>
<source>Send to multiple recipients at once</source>
<translation>一度ã«è¤‡æ•°ã®äººã«é€ã‚‹</translation>
</message>
@@ -1653,12 +2168,7 @@ Address: %4
<translation>残高:</translation>
</message>
<message>
- <location line="+10"/>
- <source>123.456 BTC</source>
- <translation>123.456 BTC</translation>
- </message>
- <message>
- <location line="+31"/>
+ <location line="+41"/>
<source>Confirm the send action</source>
<translation>é€ã‚‹æ“作を確èªã™ã‚‹</translation>
</message>
@@ -1668,49 +2178,125 @@ Address: %4
<translation>é€ã‚‹ (&amp;e)</translation>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-154"/>
+ <location filename="../sendcoinsdialog.cpp" line="-228"/>
<source>Confirm send coins</source>
<translation>コインをé€ã‚‹ç¢ºèª</translation>
</message>
<message>
- <location line="-90"/>
+ <location line="-74"/>
<location line="+5"/>
<location line="+5"/>
+ <location line="+4"/>
<source>%1 to %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+26"/>
+ <location line="-136"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation>Bitcoin アドレスを入力ã—ã¾ã™ (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Copy quantity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation>ç·é¡ã®ã‚³ãƒ”ー</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy after fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy bytes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy low output</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy change</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+170"/>
+ <source>Total Amount %1 (= %2)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>or</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+202"/>
<source>The recipient address is not valid, please recheck.</source>
<translation>å—å–人ã®ã‚¢ãƒ‰ãƒ¬ã‚¹ãŒä¸æ­£ã§ã™ã€‚å†ç¢ºèªã—ã¦ãã ã•ã„。</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The amount to pay must be larger than 0.</source>
<translation>支払é¡ã¯0より大ãããªã„ã¨ã„ã‘ã¾ã›ã‚“。</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The amount exceeds your balance.</source>
<translation>é¡ãŒæ®‹é«˜ã‚’超ãˆã¦ã„ã¾ã™ã€‚</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The total exceeds your balance when the %1 transaction fee is included.</source>
<translation>%1 ã®å–引手数料をå«ã‚ã‚‹ã¨é¡ãŒæ®‹é«˜ã‚’超ãˆã¦ã„ã¾ã™ã€‚</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+3"/>
<source>Duplicate address found, can only send to each address once per send operation.</source>
<translation>é‡è¤‡ã—ã¦ã„るアドレスãŒè¦‹ã¤ã‹ã‚Šã¾ã—ãŸã€‚1回ã®é€ä¿¡ã§åŒã˜ã‚¢ãƒ‰ãƒ¬ã‚¹ã«é€ã‚‹ã“ã¨ã¯å‡ºæ¥ã¾ã›ã‚“。</translation>
</message>
<message>
+ <location line="+3"/>
+ <source>Transaction creation failed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+4"/>
- <source>Error: Transaction creation failed!</source>
- <translation>エラー: トラザクションã®ä½œæˆã«å¤±æ•—ã—ã¾ã—ãŸ!</translation>
+ <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+15"/>
+ <location line="+112"/>
+ <source>Warning: Invalid Bitcoin address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+21"/>
+ <source>(no label)</source>
+ <translation>(ラベル無ã—)</translation>
+ </message>
+ <message>
+ <location line="-11"/>
+ <source>Warning: Unknown change address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-366"/>
<source>Are you sure you want to send?</source>
<translation>é€ã£ã¦ã‚ˆã‚ã—ã„ã§ã™ã‹ï¼Ÿ</translation>
</message>
@@ -1720,17 +2306,7 @@ Address: %4
<translation>å–引手数料ã¨ã—ã¦è¿½åŠ ã•ã‚ŒãŸ</translation>
</message>
<message>
- <location line="+6"/>
- <source>Total Amount %1</source>
- <translation>åˆè¨ˆï¼šã€€%1</translation>
- </message>
- <message>
- <location line="+20"/>
- <source>Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
- <translation>エラー: å–引ã¯æ‹’å¦ã•ã‚Œã¾ã—ãŸã€‚wallet.dat ã®ã‚³ãƒ”ーを使ã„ã€ãã—ã¦ã‚³ãƒ”ーã—ãŸã‚¦ã‚©ãƒ¬ãƒƒãƒˆã‹ã‚‰ã‚³ã‚¤ãƒ³ã‚’使用ã—ãŸã“ã¨ãŒãƒžãƒ¼ã‚¯ã•ã‚Œãªã‹ã£ãŸã¨ããªã©ã€ã‚¦ã‚©ãƒ¬ãƒƒãƒˆã®ã„ãã¤ã‹ã®ã‚³ã‚¤ãƒ³ãŒã™ã§ã«ä½¿ç”¨ã•ã‚Œã¦ã„ã‚‹å ´åˆã«ã€ã“ã®ã‚¨ãƒ©ãƒ¼ã¯èµ·ã“ã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。</translation>
- </message>
- <message>
- <location line="+144"/>
+ <location line="+170"/>
<source>Payment request expired</source>
<translation>支払ã„ã®ãƒªã‚¯ã‚¨ã‚¹ãƒˆã¯æœŸé™åˆ‡ã‚Œã§ã™</translation>
</message>
@@ -1743,39 +2319,44 @@ Address: %4
<context>
<name>SendCoinsEntry</name>
<message>
- <location filename="../forms/sendcoinsentry.ui" line="+33"/>
- <location line="+585"/>
+ <location filename="../forms/sendcoinsentry.ui" line="+131"/>
+ <location line="+521"/>
+ <location line="+536"/>
<source>A&amp;mount:</source>
<translation>金é¡(&amp;A):</translation>
</message>
<message>
- <location line="-572"/>
- <location line="+585"/>
+ <location line="-1152"/>
<source>Pay &amp;To:</source>
<translation>é€ã‚Šå…ˆ(&amp;T):</translation>
</message>
<message>
- <location line="-551"/>
+ <location line="+18"/>
<source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>支払ã„é€ä¿¡ã™ã‚‹ã‚¢ãƒ‰ãƒ¬ã‚¹ (例 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location filename="../sendcoinsentry.cpp" line="+28"/>
+ <location filename="../sendcoinsentry.cpp" line="+30"/>
<source>Enter a label for this address to add it to your address book</source>
<translation>アドレス帳ã«è¿½åŠ ã™ã‚‹ã«ã¯ã€ã“ã®ã‚¢ãƒ‰ãƒ¬ã‚¹ã®ãƒ©ãƒ™ãƒ«ã‚’入力ã—ã¾ã™</translation>
</message>
<message>
- <location filename="../forms/sendcoinsentry.ui" line="-18"/>
+ <location filename="../forms/sendcoinsentry.ui" line="+57"/>
<source>&amp;Label:</source>
<translation>ラベル(&amp;L):</translation>
</message>
<message>
- <location line="+28"/>
+ <location line="-50"/>
<source>Choose previously used address</source>
+ <translation>å‰ã«ä½¿ç”¨ã—ãŸã‚¢ãƒ‰ãƒ¬ã‚¹ã‚’é¸ã¶</translation>
+ </message>
+ <message>
+ <location line="-40"/>
+ <source>This is a normal payment.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
+ <location line="+50"/>
<source>Alt+A</source>
<translation>Alt+A</translation>
</message>
@@ -1791,16 +2372,45 @@ Address: %4
</message>
<message>
<location line="+7"/>
- <source>Remove this recipient</source>
- <translation>ã“ã®å—å–人を削除ã™ã‚‹</translation>
+ <location line="+524"/>
+ <location line="+536"/>
+ <source>Remove this entry</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="-1008"/>
+ <source>Message:</source>
+ <translation>メッセージ:</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+958"/>
+ <source>This is a verified payment request.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-991"/>
<source>Enter a label for this address to add it to the list of used addresses</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+465"/>
+ <location line="+459"/>
+ <source>This is an unverified payment request.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+18"/>
+ <location line="+532"/>
+ <source>Pay To:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-498"/>
+ <location line="+536"/>
<source>Memo:</source>
<translation>メモ:</translation>
</message>
@@ -1811,6 +2421,19 @@ Address: %4
</message>
</context>
<context>
+ <name>ShutdownWindow</name>
+ <message>
+ <location filename="../utilitydialog.cpp" line="+48"/>
+ <source>Bitcoin Core is shutting down...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Do not shut down the computer until this window disappears.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>SignVerifyMessageDialog</name>
<message>
<location filename="../forms/signverifymessagedialog.ui" line="+14"/>
@@ -1818,7 +2441,7 @@ Address: %4
<translation>ç½²å - メッセージã®ç½²å/検証</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+10"/>
<source>&amp;Sign Message</source>
<translation>メッセージã®ç½²å (&amp;S)</translation>
</message>
@@ -1836,7 +2459,7 @@ Address: %4
<location line="+10"/>
<location line="+213"/>
<source>Choose previously used address</source>
- <translation type="unfinished"/>
+ <translation>å‰ã«ä½¿ç”¨ã—ãŸã‚¢ãƒ‰ãƒ¬ã‚¹ã‚’é¸ã¶</translation>
</message>
<message>
<location line="-203"/>
@@ -1921,7 +2544,7 @@ Address: %4
<translation>入力項目ã®å†…容をã™ã¹ã¦æ¶ˆåŽ»ã—ã¾ã™</translation>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+27"/>
+ <location filename="../signverifymessagedialog.cpp" line="+29"/>
<location line="+3"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>Bitcoin アドレスを入力ã—ã¾ã™ (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
@@ -1937,7 +2560,7 @@ Address: %4
<translation>Bitcoin ç½²åを入力</translation>
</message>
<message>
- <location line="+85"/>
+ <location line="+84"/>
<location line="+81"/>
<source>The entered address is invalid.</source>
<translation>ä¸æ­£ãªã‚¢ãƒ‰ãƒ¬ã‚¹ãŒå…¥åŠ›ã•ã‚Œã¾ã—ãŸã€‚</translation>
@@ -2006,9 +2629,14 @@ Address: %4
<context>
<name>SplashScreen</name>
<message>
- <location filename="../splashscreen.cpp" line="+23"/>
- <source>The Bitcoin developers</source>
- <translation>The Bitcoin developers</translation>
+ <location filename="../splashscreen.cpp" line="+28"/>
+ <source>Bitcoin Core</source>
+ <translation>Bitcoin ã®ã‚³ã‚¢</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>The Bitcoin Core developers</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
@@ -2019,7 +2647,7 @@ Address: %4
<context>
<name>TrafficGraphWidget</name>
<message>
- <location filename="../trafficgraphwidget.cpp" line="+75"/>
+ <location filename="../trafficgraphwidget.cpp" line="+79"/>
<source>KB/s</source>
<translation type="unfinished"/>
</message>
@@ -2027,7 +2655,7 @@ Address: %4
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="+22"/>
+ <location filename="../transactiondesc.cpp" line="+28"/>
<source>Open until %1</source>
<translation>ユニット %1 ã‚’é–‹ã</translation>
</message>
@@ -2100,12 +2728,12 @@ Address: %4
<location line="+12"/>
<location line="+45"/>
<location line="+17"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Credit</source>
<translation>クレジット</translation>
</message>
<message numerus="yes">
- <location line="-120"/>
+ <location line="-125"/>
<source>matures in %n more block(s)</source>
<translation><numerusform>%n 以上ã®ãƒ–ロックãŒæº€æœŸ</numerusform></translation>
</message>
@@ -2118,12 +2746,12 @@ Address: %4
<location line="+44"/>
<location line="+8"/>
<location line="+15"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Debit</source>
<translation>引ãè½ã¨ã—é¡</translation>
</message>
<message>
- <location line="-57"/>
+ <location line="-62"/>
<source>Transaction fee</source>
<translation>å–引手数料</translation>
</message>
@@ -2134,11 +2762,12 @@ Address: %4
</message>
<message>
<location line="+6"/>
+ <location line="+9"/>
<source>Message</source>
<translation>メッセージ</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="-7"/>
<source>Comment</source>
<translation>コメント</translation>
</message>
@@ -2148,7 +2777,7 @@ Address: %4
<translation>å–引 ID</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+18"/>
<source>Merchant</source>
<translation>商人</translation>
</message>
@@ -2188,7 +2817,7 @@ Address: %4
<translation>æ­£ã—ããªã„</translation>
</message>
<message>
- <location line="-227"/>
+ <location line="-232"/>
<source>, has not been successfully broadcast yet</source>
<translation>ã¾ã ãƒ–ロードキャストãŒæˆåŠŸã—ã¦ã„ã¾ã›ã‚“</translation>
</message>
@@ -2219,7 +2848,7 @@ Address: %4
<context>
<name>TransactionTableModel</name>
<message>
- <location filename="../transactiontablemodel.cpp" line="+227"/>
+ <location filename="../transactiontablemodel.cpp" line="+234"/>
<source>Date</source>
<translation>日付</translation>
</message>
@@ -2238,8 +2867,13 @@ Address: %4
<source>Amount</source>
<translation>ç·é¡</translation>
</message>
+ <message>
+ <location line="+59"/>
+ <source>Immature (%1 confirmations, will be available after %2)</source>
+ <translation type="unfinished"/>
+ </message>
<message numerus="yes">
- <location line="+57"/>
+ <location line="+16"/>
<source>Open for %n more block(s)</source>
<translation><numerusform>%n 以上ã®ãƒ–ロックを開ã</numerusform></translation>
</message>
@@ -2259,17 +2893,13 @@ Address: %4
<translation>検証済㿠(%2) 未検証 (%1)</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="-22"/>
+ <location line="+25"/>
<source>Confirmed (%1 confirmations)</source>
<translation>検証ã•ã‚Œã¾ã—㟠(%1 検証済ã¿)</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>採掘ã•ã‚ŒãŸæ®‹é«˜ã¯ %n 以上ã®ãƒ–ロックãŒå®Œæˆã—ãŸã¨ãã«åˆ©ç”¨ã§ãã¾ã™</numerusform></translation>
- </message>
<message>
- <location line="+5"/>
+ <location line="-22"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation>ã“ã®ãƒ–ロックã¯ä»–ã®ã©ã®ãƒŽãƒ¼ãƒ‰ã«ã‚ˆã£ã¦ã‚‚å—ã‘å–られãªã„ã§ã€å¤šåˆ†å—ã‘入れられãªã„ã§ã—ょã†ï¼</translation>
</message>
@@ -2279,7 +2909,7 @@ Address: %4
<translation>生æˆã•ã‚Œã¾ã—ãŸãŒæ‰¿èªã•ã‚Œã¾ã›ã‚“ã§ã—ãŸ</translation>
</message>
<message>
- <location line="+43"/>
+ <location line="+62"/>
<source>Received with</source>
<translation>å—ä¿¡å…ƒ</translation>
</message>
@@ -2337,7 +2967,7 @@ Address: %4
<context>
<name>TransactionView</name>
<message>
- <location filename="../transactionview.cpp" line="+52"/>
+ <location filename="../transactionview.cpp" line="+57"/>
<location line="+16"/>
<source>All</source>
<translation>ã™ã¹ã¦</translation>
@@ -2398,12 +3028,12 @@ Address: %4
<translation>ãã®ä»–</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+6"/>
<source>Enter address or label to search</source>
<translation>検索ã™ã‚‹ã‚¢ãƒ‰ãƒ¬ã‚¹ã¾ãŸã¯ãƒ©ãƒ™ãƒ«ã‚’入力</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+6"/>
<source>Min amount</source>
<translation>最å°ã®é¡</translation>
</message>
@@ -2438,17 +3068,37 @@ Address: %4
<translation>å–引ã®è©³ç´°ã‚’表示</translation>
</message>
<message>
- <location line="+143"/>
- <source>Export Transaction Data</source>
- <translation>å–引データをエクスãƒãƒ¼ãƒˆ</translation>
+ <location line="+142"/>
+ <source>Export Transaction History</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="+19"/>
+ <source>Exporting Failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>There was an error trying to save the transaction history to %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Exporting Successful</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The transaction history was successfully saved to %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-22"/>
<source>Comma separated file (*.csv)</source>
<translation>テキスト CSV (*.csv)</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+9"/>
<source>Confirmed</source>
<translation>検証済ã¿</translation>
</message>
@@ -2483,17 +3133,7 @@ Address: %4
<translation>ID</translation>
</message>
<message>
- <location line="+4"/>
- <source>Error exporting</source>
- <translation>エラー輸出</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation>%1ã®ãƒ•ã‚¡ã‚¤ãƒ«ã«æ›¸ãè¾¼ã‚ã¾ã›ã‚“ã§ã—ãŸã€‚</translation>
- </message>
- <message>
- <location line="+100"/>
+ <location line="+107"/>
<source>Range:</source>
<translation>期間:</translation>
</message>
@@ -2504,9 +3144,17 @@ Address: %4
</message>
</context>
<context>
+ <name>WalletFrame</name>
+ <message>
+ <location filename="../walletframe.cpp" line="+26"/>
+ <source>No wallet has been loaded.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>WalletModel</name>
<message>
- <location filename="../walletmodel.cpp" line="+218"/>
+ <location filename="../walletmodel.cpp" line="+245"/>
<source>Send Coins</source>
<translation>コインをé€ã‚‹</translation>
</message>
@@ -2514,7 +3162,7 @@ Address: %4
<context>
<name>WalletView</name>
<message>
- <location filename="../walletview.cpp" line="+46"/>
+ <location filename="../walletview.cpp" line="+43"/>
<source>&amp;Export</source>
<translation>エクスãƒãƒ¼ãƒˆ (&amp;E)</translation>
</message>
@@ -2524,65 +3172,60 @@ Address: %4
<translation>ファイルã«ç¾åœ¨ã®ã‚¿ãƒ–ã®ãƒ‡ãƒ¼ã‚¿ã‚’エクスãƒãƒ¼ãƒˆ</translation>
</message>
<message>
- <location line="+183"/>
+ <location line="+181"/>
<source>Backup Wallet</source>
<translation>ウォレットã®ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—</translation>
</message>
<message>
- <location line="+0"/>
+ <location line="+1"/>
<source>Wallet Data (*.dat)</source>
<translation>ウォレット データ (*.dat)</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="+6"/>
<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>
+ <source>There was an error trying to save the wallet data to %1.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+4"/>
- <source>Backup Successful</source>
- <translation>ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—æˆåŠŸ</translation>
+ <source>The wallet data was successfully saved to %1.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+0"/>
- <source>The wallet data was successfully saved to the new location.</source>
- <translation>ウォレット データã¯æ­£å¸¸ã«æ–°ã—ã„場所ã«ä¿å­˜ã•ã‚Œã¾ã—ãŸã€‚</translation>
+ <source>Backup Successful</source>
+ <translation>ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—æˆåŠŸ</translation>
</message>
</context>
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+102"/>
- <source>Bitcoin version</source>
- <translation>Bitcoin Bertsio</translation>
- </message>
- <message>
- <location line="+107"/>
+ <location filename="../bitcoinstrings.cpp" line="+221"/>
<source>Usage:</source>
<translation>使用法:</translation>
</message>
<message>
- <location line="-55"/>
+ <location line="-54"/>
<source>List commands</source>
<translation>コマンド一覧</translation>
</message>
<message>
- <location line="-13"/>
+ <location line="-14"/>
<source>Get help for a command</source>
<translation>コマンドã®ãƒ˜ãƒ«ãƒ—</translation>
</message>
<message>
- <location line="+25"/>
+ <location line="+26"/>
<source>Options:</source>
<translation>オプション:</translation>
</message>
<message>
- <location line="+24"/>
+ <location line="+22"/>
<source>Specify configuration file (default: bitcoin.conf)</source>
<translation>設定ファイルã®æŒ‡å®š (åˆæœŸå€¤: bitcoin.conf)</translation>
</message>
@@ -2602,7 +3245,7 @@ Address: %4
<translation>データベースã®ã‚­ãƒ£ãƒƒã‚·ãƒ¥ã‚µã‚¤ã‚ºã‚’メガãƒã‚¤ãƒˆã§è¨­å®š (åˆæœŸå€¤: 25)</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-26"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
<translation>接続ã®ãƒãƒ¼ãƒˆç•ªå· (åˆæœŸå€¤: 8333ã€testnet: 18333)</translation>
</message>
@@ -2612,7 +3255,7 @@ Address: %4
<translation>ピアã®æœ€å¤§æŽ¥ç¶šæ•° (åˆæœŸå€¤: 125)</translation>
</message>
<message>
- <location line="-49"/>
+ <location line="-51"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation>ピア アドレスをå–å¾—ã™ã‚‹ãŸã‚ã«ãƒŽãƒ¼ãƒ‰ã«æŽ¥ç¶šã—ã€ãã—ã¦åˆ‡æ–­ã—ã¾ã™</translation>
</message>
@@ -2622,37 +3265,37 @@ Address: %4
<translation>ã‚ãªãŸè‡ªèº«ã®ãƒ‘ブリックãªã‚¢ãƒ‰ãƒ¬ã‚¹ã‚’指定</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation>ä¸æ­£ãªãƒ”アを切断ã™ã‚‹ãŸã‚ã®ã—ãã„値 (åˆæœŸå€¤: 100)</translation>
</message>
<message>
- <location line="-142"/>
+ <location line="-148"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation>ä¸æ­£ãªãƒ”アをå†æŽ¥ç¶šã™ã‚‹ã¾ã§ã®ç§’æ•° (åˆæœŸå€¤: 86400)</translation>
</message>
<message>
- <location line="-33"/>
+ <location line="-36"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
<translation>IPv4 ã§ãƒªã‚¹ãƒ³ã™ã‚‹ RPC ãƒãƒ¼ãƒˆ %u ã®è¨­å®šä¸­ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸ: %s</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation>&lt;port&gt; 㧠JSON-RPC 接続をリスン (åˆæœŸå€¤: 8332ã€testnet 㯠18332)</translation>
</message>
<message>
- <location line="+40"/>
+ <location line="+45"/>
<source>Accept command line and JSON-RPC commands</source>
<translation>コマンドライン㨠JSON-RPC コマンドを許å¯</translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>デーモンã¨ã—ã¦ãƒãƒƒã‚¯ã‚°ãƒ©ãƒ³ãƒ‰ã§å®Ÿè¡Œã—コマンドを許å¯</translation>
</message>
<message>
- <location line="+40"/>
+ <location line="+39"/>
<source>Use the test network</source>
<translation>テストã®ãŸã‚ã®ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚’使用</translation>
</message>
@@ -2662,7 +3305,7 @@ Address: %4
<translation>外部ã‹ã‚‰ã®æŽ¥ç¶šã‚’è¨±å¯ (åˆæœŸå€¤: -proxy ã¾ãŸã¯ -connect を使用ã—ã¦ã„ãªã„å ´åˆã¯1)</translation>
</message>
<message>
- <location line="-87"/>
+ <location line="-95"/>
<source>%s, you must set a rpcpassword in the configuration file:
%s
It is recommended you use the following random password:
@@ -2712,6 +3355,11 @@ rpcpassword=%s
</message>
<message>
<location line="+4"/>
+ <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
<source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
<translation>エラー: å–引ã¯æ‹’å¦ã•ã‚Œã¾ã—ãŸã€‚wallet.dat ã®ã‚³ãƒ”ーを使ã„ã€ãã—ã¦ã‚³ãƒ”ーã—ãŸã‚¦ã‚©ãƒ¬ãƒƒãƒˆã‹ã‚‰ã‚³ã‚¤ãƒ³ã‚’使用ã—ãŸã“ã¨ãŒãƒžãƒ¼ã‚¯ã•ã‚Œãªã‹ã£ãŸã¨ããªã©ã€ã‚¦ã‚©ãƒ¬ãƒƒãƒˆã®ã„ãã¤ã‹ã®ã‚³ã‚¤ãƒ³ãŒã™ã§ã«ä½¿ç”¨ã•ã‚Œã¦ã„ã‚‹å ´åˆã«ã€ã“ã®ã‚¨ãƒ©ãƒ¼ã¯èµ·ã“ã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。</translation>
</message>
@@ -2726,17 +3374,17 @@ rpcpassword=%s
<translation>ウォレットã®å–引を変更ã™ã‚‹éš›ã«ã‚³ãƒžãƒ³ãƒ‰ã‚’実行 (cmd ã® %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="+6"/>
+ <location line="+18"/>
<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>
<message>
<location line="+5"/>
+ <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
<source>Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source>
<translation>警告: -paytxfee ãŒéžå¸¸ã«é«˜ã設定ã•ã‚Œã¦ã„ã¾ã™! ã“ã‚Œã¯å–引をé€ä¿¡ã™ã‚‹å ´åˆã«æ”¯æ‰•ã†å–引手数料ã§ã™ã€‚</translation>
</message>
@@ -2766,17 +3414,27 @@ rpcpassword=%s
<translation>警告: wallet.dat ãŒå£Šã‚ŒãŸã®ã§ãƒ‡ãƒ¼ã‚¿ã‚’復旧ã—ã¾ã—ãŸ! オリジナル㮠wallet.dat 㯠wallet.{timestamp}.bak ã¨ã—㦠%s ã«ä¿å­˜ã•ã‚Œã¾ã—ãŸ; ã‚‚ã—ã‚‚ã‚ãªãŸã®æ®‹é«˜ã‚„å–引ãŒæ­£ã—ããªã„ãªã‚‰ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—ã‹ã‚‰å¾©å…ƒã—ã¦ãã ã•ã„。</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="+9"/>
+ <source>&lt;category&gt; can be:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
<source>Attempt to recover private keys from a corrupt wallet.dat</source>
<translation>壊れ㟠wallet.dat ã‹ã‚‰ç§˜å¯†éµã‚’復旧ã™ã‚‹ã“ã¨ã‚’試ã™</translation>
</message>
<message>
<location line="+1"/>
+ <source>Bitcoin Core Daemon</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Bitcoin RPC client version</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
<source>Block creation options:</source>
<translation>ブロック作æˆã‚ªãƒ—ション:</translation>
</message>
@@ -2786,7 +3444,12 @@ rpcpassword=%s
<translation>指定ã—ãŸãƒŽãƒ¼ãƒ‰ã ã‘ã«æŽ¥ç¶š</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
+ <source>Connect through SOCKS proxy</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect to JSON-RPC on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation type="unfinished"/>
</message>
@@ -2803,6 +3466,11 @@ rpcpassword=%s
</message>
<message>
<location line="+1"/>
+ <source>Do not load the wallet and disable wallet RPC calls</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Do you want to rebuild the block database now?</source>
<translation>ブロック データベースを今ã™ãå†æ§‹ç¯‰ã—ã¾ã™ã‹?</translation>
</message>
@@ -2897,7 +3565,12 @@ rpcpassword=%s
<translation>å…ƒã¸æˆ»ã™ãƒ‡ãƒ¼ã‚¿ã®æ›¸ãè¾¼ã¿ã«å¤±æ•—ã—ã¾ã—ãŸ</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
+ <source>Fee per kB to add to transactions you send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Find peers using DNS lookup (default: 1 unless -connect)</source>
<translation>DNS ルックアップã§ãƒ”アを探㙠(åˆæœŸå€¤: -connect を使ã£ã¦ã„ãªã‘ã‚Œã°1)</translation>
</message>
@@ -2917,6 +3590,11 @@ rpcpassword=%s
<translation>ブロックã®æ¤œè¨¼ãƒ¬ãƒ™ãƒ« (0-4, åˆæœŸå€¤: 3)</translation>
</message>
<message>
+ <location line="+1"/>
+ <source>If &lt;category&gt; is not supplied, output all debugging information.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+2"/>
<source>Incorrect or no genesis block found. Wrong datadir for network?</source>
<translation>ä¸æ­£ãªãƒ–ロックã‚ã‚‹ã„ã¯ã€ç”Ÿæˆã•ã‚Œã¦ã„ãªã„ブロックãŒè¦‹ã¤ã‹ã‚Šã¾ã—ãŸã€‚ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã® datadir ãŒé–“é•ã£ã¦ã„ã¾ã›ã‚“ã‹?</translation>
@@ -2932,17 +3610,37 @@ rpcpassword=%s
<translation>使用å¯èƒ½ãªãƒ•ã‚¡ã‚¤ãƒ«ãƒ‡ã‚£ã‚¹ã‚¯ãƒªãƒ—ã‚¿ãŒä¸è¶³ã—ã¦ã„ã¾ã™ã€‚</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+5"/>
+ <source>Prepend debug output with timestamp (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>RPC client options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Rebuild block chain index from current blk000??.dat files</source>
<translation>ç¾åœ¨ã® blk000??.dat ファイルã‹ã‚‰ãƒ–ロック ãƒã‚§ãƒ¼ãƒ³ã®ã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹ã‚’å†æ§‹ç¯‰</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+5"/>
+ <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Send command to Bitcoin server</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
+ <location line="+7"/>
+ <source>Set maximum block size in bytes (default: %d)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Set the number of threads to service RPC calls (default: 4)</source>
<translation>RPC サービスã®ã‚¹ãƒ¬ãƒƒãƒ‰æ•°ã‚’設定 (åˆæœŸå€¤: 4)</translation>
</message>
@@ -2954,15 +3652,20 @@ rpcpassword=%s
<message>
<location line="+2"/>
<source>Start Bitcoin server</source>
+ <translation>Bitcoinサーãƒãƒ¼ã‚’始ã‚ã‚‹</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>This is intended for regression testing tools and app development.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+12"/>
+ <location line="+10"/>
<source>Usage (deprecated, use bitcoin-cli):</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+8"/>
+ <location line="+7"/>
<source>Verifying blocks...</source>
<translation>ブロックã®æ¤œè¨¼ä¸­...</translation>
</message>
@@ -2973,31 +3676,56 @@ rpcpassword=%s
</message>
<message>
<location line="+1"/>
+ <source>Wait for RPC server to start</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Wallet %s resides outside data directory %s</source>
<translation>財布 %s ã¯ãƒ‡ãƒ¼ã‚¿ãƒ»ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒª%sã®å¤–ã«ã‚ã‚Šã¾ã™</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+2"/>
+ <source>Wallet options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>You need to rebuild the database using -reindex to change -txindex</source>
<translation>-txindex を変更ã™ã‚‹ã«ã¯ -reindex を使用ã—ã¦ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã‚’å†æ§‹ç¯‰ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™</translation>
</message>
<message>
- <location line="-78"/>
+ <location line="-79"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation>外部㮠blk000??.dat ファイルã‹ã‚‰ãƒ–ロックをインãƒãƒ¼ãƒˆ</translation>
</message>
<message>
- <location line="-98"/>
+ <location line="-105"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation>関連ã®ã‚¢ãƒ©ãƒ¼ãƒˆã‚’もらã£ã¦ã‚‚ã™ã”ãé•·ã„ã®ãƒ•ã‚©ãƒ¼ã‚¯ã‚’見ã¦ã‚‚コマンドを実行 (コマンドã®ä¸­ã«ã‚ã‚‹ã®%sã¯ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‹ã‚‰ç½®ãæ›ãˆã•ã›ã‚‹)</translation>
</message>
<message>
- <location line="+17"/>
+ <location line="+14"/>
+ <source>Output debugging information (default: 0, supplying &lt;category&gt; is optional)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
<translation>スクリプト検証スレッドを設定 (最大 16, 0 = 自動, &lt;0 = ãŸãã•ã‚“ã®ã‚³ã‚¢ã‚’自由ã«ã—ã¦ãŠã, åˆæœŸå€¤: 0)</translation>
</message>
<message>
- <location line="+83"/>
+ <location line="+89"/>
<source>Information</source>
<translation>情報</translation>
</message>
@@ -3037,47 +3765,17 @@ rpcpassword=%s
<translation>&lt;net&gt; (IPv4, IPv6, Tor) ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯å†…ã®ãƒŽãƒ¼ãƒ‰ã ã‘ã«æŽ¥ç¶šã™ã‚‹</translation>
</message>
<message>
- <location line="+2"/>
- <source>Output extra debugging information. Implies all other -debug* options</source>
- <translation>追加ã®ãƒ‡ãƒãƒƒã‚°æƒ…報を出力ã™ã‚‹ã€‚ ä»–ã®ã™ã¹ã¦ã® -debug* オプションをæ„味ã—ã¾ã™</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Output extra network debugging information</source>
- <translation>ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã«é–¢ã™ã‚‹è¿½åŠ ã®ãƒ‡ãƒãƒƒã‚°æƒ…報を出力</translation>
- </message>
- <message>
- <location line="+2"/>
- <source>Prepend debug output with timestamp</source>
- <translation>デãƒãƒƒã‚°å‡ºåŠ›ã«ã‚¿ã‚¤ãƒ ã‚¹ã‚¿ãƒ³ãƒ—を付ã‘ã‚‹</translation>
- </message>
- <message>
- <location line="+5"/>
+ <location line="+9"/>
<source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
<translation>SSL オプション: (SSLã®ã‚»ãƒƒãƒˆã‚¢ãƒƒãƒ—手順㯠Bitcoin Wiki ã‚’ã”覧下ã•ã„)</translation>
</message>
<message>
- <location line="+1"/>
- <source>Select the version of socks proxy to use (4-5, default: 5)</source>
- <translation>socks プロキシã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³(4-5)ã‚’é¸æŠž (åˆæœŸå€¤: 5)</translation>
- </message>
- <message>
- <location line="+3"/>
+ <location line="+4"/>
<source>Send trace/debug info to console instead of debug.log file</source>
<translation>トレース/デãƒãƒƒã‚°æƒ…報を debug.log ファイルã®ä»£ã‚ã‚Šã«ã‚³ãƒ³ã‚½ãƒ¼ãƒ«ã¸é€ã‚‹</translation>
</message>
<message>
- <location line="+1"/>
- <source>Send trace/debug info to debugger</source>
- <translation>トレース/デãƒãƒƒã‚°æƒ…報をデãƒãƒƒã‚¬ãƒ¼ã«é€ã‚‹</translation>
- </message>
- <message>
- <location line="+5"/>
- <source>Set maximum block size in bytes (default: 250000)</source>
- <translation>最大ブロックサイズをãƒã‚¤ãƒˆã§è¨­å®š (åˆæœŸå€¤: 250000)</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+6"/>
<source>Set minimum block size in bytes (default: 0)</source>
<translation>最å°ãƒ–ロックサイズをãƒã‚¤ãƒˆã§è¨­å®š (åˆæœŸå€¤: 0)</translation>
</message>
@@ -3102,7 +3800,7 @@ rpcpassword=%s
<translation>システム エラー:</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Transaction amount too small</source>
<translation>å–引ã®é¡ãŒå°ã•éŽãŽã¾ã™</translation>
</message>
@@ -3127,32 +3825,32 @@ rpcpassword=%s
<translation>リスン ãƒãƒ¼ãƒˆã®å‰²å½“ã« UPnP を使用 (åˆæœŸå€¤: リスン中ã¯1)</translation>
</message>
<message>
- <location line="+1"/>
- <source>Use proxy to reach tor hidden services (default: same as -proxy)</source>
- <translation>Tor hidden service ã«åˆ°é”ã™ã‚‹ãŸã‚ã«ãƒ—ロキシを使用 (åˆæœŸå€¤: -proxy ã¨åŒã˜)</translation>
- </message>
- <message>
<location line="+2"/>
<source>Username for JSON-RPC connections</source>
<translation>JSON-RPC 接続ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼å</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+7"/>
<source>Warning</source>
<translation>警告</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Warning: This version is obsolete, upgrade required!</source>
<translation>警告: ã“ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã¯å¤ã„ã®ã§ã‚¢ãƒƒãƒ—グレードãŒå¿…è¦ã§ã™!</translation>
</message>
<message>
<location line="+2"/>
+ <source>version</source>
+ <translation>ãƒãƒ¼ã‚¸ãƒ§ãƒ³</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>wallet.dat corrupt, salvage failed</source>
<translation>wallet.dat ãŒå£Šã‚Œã€å¾©æ—§ã«å¤±æ•—ã—ã¾ã—ãŸ</translation>
</message>
<message>
- <location line="-54"/>
+ <location line="-58"/>
<source>Password for JSON-RPC connections</source>
<translation>JSON-RPC 接続ã®ãƒ‘スワード</translation>
</message>
@@ -3162,27 +3860,27 @@ rpcpassword=%s
<translation>指定ã—㟠IP アドレスã‹ã‚‰ã® JSON-RPC 接続を許å¯</translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<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="-126"/>
+ <location line="-132"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation>最良ã®ãƒ–ロックã«å¤‰æ›´ã™ã‚‹éš›ã«ã‚³ãƒžãƒ³ãƒ‰ã‚’実行 (cmd ã® %s ã¯ãƒ–ロック ãƒãƒƒã‚·ãƒ¥ã«ç½®æ›ã•ã‚Œã‚‹)</translation>
</message>
<message>
- <location line="+155"/>
+ <location line="+161"/>
<source>Upgrade wallet to latest format</source>
<translation>ウォレットを最新ã®ãƒ•ã‚©ãƒ¼ãƒžãƒƒãƒˆã«ã‚¢ãƒƒãƒ—グレード</translation>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation>key pool ã®ã‚µã‚¤ã‚ºã‚’ &lt;n&gt; (åˆæœŸå€¤: 100) ã«ã‚»ãƒƒãƒˆ</translation>
</message>
<message>
- <location line="-12"/>
+ <location line="-11"/>
<source>Rescan the block chain for missing wallet transactions</source>
<translation>失ã£ãŸã‚¦ã‚©ãƒ¬ãƒƒãƒˆã®å–引ã®ãƒ–ロック ãƒã‚§ãƒ¼ãƒ³ã‚’å†ã‚¹ã‚­ãƒ£ãƒ³</translation>
</message>
@@ -3192,7 +3890,7 @@ rpcpassword=%s
<translation>JSON-RPC 接続㫠OpenSSL (https) を使用</translation>
</message>
<message>
- <location line="-29"/>
+ <location line="-30"/>
<source>Server certificate file (default: server.cert)</source>
<translation>サーãƒè¨¼æ˜Žæ›¸ãƒ•ã‚¡ã‚¤ãƒ« (åˆæœŸå€¤: server.cert)</translation>
</message>
@@ -3207,27 +3905,22 @@ rpcpassword=%s
<translation>ã“ã®ãƒ˜ãƒ«ãƒ— メッセージ</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Unable to bind to %s on this computer (bind returned error %d, %s)</source>
<translation>ã“ã®ã‚³ãƒ³ãƒ”ュータ㮠%s ã«ãƒã‚¤ãƒ³ãƒ‰ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“ (ãƒã‚¤ãƒ³ãƒ‰ãŒè¿”ã—ãŸã‚¨ãƒ©ãƒ¼ã¯ %d, %s)</translation>
</message>
<message>
- <location line="-95"/>
- <source>Connect through socks proxy</source>
- <translation>SOCKS プロキシã§æŽ¥ç¶šã™ã‚‹</translation>
- </message>
- <message>
- <location line="-11"/>
+ <location line="-107"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation>-addnode, -seednode 㨠-connect 㧠DNS ルックアップを許å¯ã™ã‚‹</translation>
</message>
<message>
- <location line="+58"/>
+ <location line="+60"/>
<source>Loading addresses...</source>
<translation>アドレスを読ã¿è¾¼ã‚“ã§ã„ã¾ã™...</translation>
</message>
<message>
- <location line="-36"/>
+ <location line="-37"/>
<source>Error loading wallet.dat: Wallet corrupted</source>
<translation>wallet.dat 読ã¿è¾¼ã¿ã‚¨ãƒ©ãƒ¼: ウォレットãŒå£Šã‚Œã¾ã—ãŸ</translation>
</message>
@@ -3247,12 +3940,12 @@ rpcpassword=%s
<translation>wallet.dat 読ã¿è¾¼ã¿ã‚¨ãƒ©ãƒ¼</translation>
</message>
<message>
- <location line="+30"/>
+ <location line="+31"/>
<source>Invalid -proxy address: &apos;%s&apos;</source>
<translation>無効㪠-proxy アドレス: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+57"/>
+ <location line="+56"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation>-onlynet ã§æŒ‡å®šã•ã‚ŒãŸ &apos;%s&apos; ã¯æœªçŸ¥ã®ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã§ã™</translation>
</message>
@@ -3262,7 +3955,7 @@ rpcpassword=%s
<translation>-socks ã§æŒ‡å®šã•ã‚ŒãŸ %i ã¯æœªçŸ¥ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã§ã™</translation>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation>-bind ã®ã‚¢ãƒ‰ãƒ¬ã‚¹ &apos;%s&apos; を解決ã§ãã¾ã›ã‚“</translation>
</message>
@@ -3272,7 +3965,7 @@ rpcpassword=%s
<translation>-externalip ã®ã‚¢ãƒ‰ãƒ¬ã‚¹ &apos;%s&apos; を解決ã§ãã¾ã›ã‚“</translation>
</message>
<message>
- <location line="+46"/>
+ <location line="+48"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation>-paytxfee=&lt;amount&gt; ã®é¡ &apos;%s&apos; ãŒç„¡åŠ¹ã§ã™</translation>
</message>
@@ -3292,27 +3985,22 @@ rpcpassword=%s
<translation>ブロック インデックスを読ã¿è¾¼ã‚“ã§ã„ã¾ã™...</translation>
</message>
<message>
- <location line="-60"/>
+ <location line="-62"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation>接続ã™ã‚‹ãƒŽãƒ¼ãƒ‰ã‚’追加ã—接続をæŒç¶šã™ã‚‹ã‚ˆã†ã«è©¦ã—ã¾ã™</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-32"/>
<source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source>
<translation>ã“ã®ã‚³ãƒ³ãƒ”ュータ㮠%s ã«ãƒã‚¤ãƒ³ãƒ‰ã™ã‚‹ã“ã¨ãŒã§ãã¾ã›ã‚“。ãŠãらã Bitcoin ã¯æ—¢ã«å®Ÿè¡Œã•ã‚Œã¦ã„ã¾ã™ã€‚</translation>
</message>
<message>
- <location line="+69"/>
- <source>Fee per KB to add to transactions you send</source>
- <translation>é€ä¿¡ã™ã‚‹å–引㫠KB ã‚ãŸã‚Šã®æ‰‹æ•°æ–™ãŒåŠ ã‚ã‚Šã¾ã™</translation>
- </message>
- <message>
- <location line="+20"/>
+ <location line="+95"/>
<source>Loading wallet...</source>
<translation>ウォレットを読ã¿è¾¼ã‚“ã§ã„ã¾ã™...</translation>
</message>
<message>
- <location line="-54"/>
+ <location line="-56"/>
<source>Cannot downgrade wallet</source>
<translation>ウォレットã®ãƒ€ã‚¦ãƒ³ã‚°ãƒ¬ãƒ¼ãƒ‰ã¯ã§ãã¾ã›ã‚“</translation>
</message>
@@ -3322,7 +4010,7 @@ rpcpassword=%s
<translation>åˆæœŸå€¤ã®ã‚¢ãƒ‰ãƒ¬ã‚¹ã‚’書ã込むã“ã¨ãŒã§ãã¾ã›ã‚“</translation>
</message>
<message>
- <location line="+66"/>
+ <location line="+67"/>
<source>Rescanning...</source>
<translation>å†ã‚¹ã‚­ãƒ£ãƒ³ä¸­...</translation>
</message>
@@ -3342,7 +4030,7 @@ rpcpassword=%s
<translation>エラー</translation>
</message>
<message>
- <location line="-33"/>
+ <location line="-35"/>
<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_kk_KZ.ts b/src/qt/locale/bitcoin_kk_KZ.ts
index 7c41e7b05a..f1aa412469 100644
--- a/src/qt/locale/bitcoin_kk_KZ.ts
+++ b/src/qt/locale/bitcoin_kk_KZ.ts
@@ -3,13 +3,13 @@
<name>AboutDialog</name>
<message>
<location filename="../forms/aboutdialog.ui" line="+14"/>
- <source>About Bitcoin</source>
- <translation>Bitcoin туралы</translation>
+ <source>About Bitcoin Core</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+39"/>
- <source>&lt;b&gt;Bitcoin&lt;/b&gt; version</source>
- <translation>&lt;b&gt;Bitcoin&lt;/b&gt; верÑиÑÑÑ‹</translation>
+ <source>&lt;b&gt;Bitcoin Core&lt;/b&gt; version</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+57"/>
@@ -22,13 +22,13 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location filename="../aboutdialog.cpp" line="+14"/>
+ <location filename="../utilitydialog.cpp" line="+29"/>
<source>Copyright</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+0"/>
- <source>The Bitcoin developers</source>
+ <source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
</context>
@@ -65,7 +65,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location filename="../addressbookpage.cpp" line="+72"/>
+ <location filename="../addressbookpage.cpp" line="+74"/>
<source>&amp;Copy Address</source>
<translation type="unfinished"/>
</message>
@@ -135,7 +135,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+197"/>
+ <location line="+194"/>
<source>Export Address List</source>
<translation type="unfinished"/>
</message>
@@ -146,19 +146,19 @@ This product includes software developed by the OpenSSL Project for use in the O
</message>
<message>
<location line="+13"/>
- <source>Error exporting</source>
+ <source>Exporting Failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
+ <location line="+1"/>
+ <source>There was an error trying to save the address list to %1.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>AddressTableModel</name>
<message>
- <location filename="../addresstablemodel.cpp" line="+164"/>
+ <location filename="../addresstablemodel.cpp" line="+168"/>
<source>Label</source>
<translation type="unfinished"/>
</message>
@@ -196,7 +196,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="+34"/>
+ <location filename="../askpassphrasedialog.cpp" line="+40"/>
<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>
@@ -317,22 +317,27 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+250"/>
+ <location filename="../bitcoingui.cpp" line="+295"/>
<source>Sign &amp;message...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+254"/>
+ <location line="+335"/>
<source>Synchronizing with network...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-324"/>
+ <location line="-407"/>
<source>&amp;Overview</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="-137"/>
+ <source>Node</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+138"/>
<source>Show general overview of wallet</source>
<translation type="unfinished"/>
</message>
@@ -347,7 +352,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>E&amp;xit</source>
<translation type="unfinished"/>
</message>
@@ -393,7 +398,22 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+259"/>
+ <location line="+10"/>
+ <source>&amp;Sending addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Receiving addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open &amp;URI...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+325"/>
<source>Importing blocks from disk...</source>
<translation type="unfinished"/>
</message>
@@ -403,12 +423,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="-322"/>
+ <location line="-405"/>
<source>Send coins to a Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+47"/>
+ <location line="+49"/>
<source>Modify configuration options for Bitcoin</source>
<translation type="unfinished"/>
</message>
@@ -438,20 +458,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="-180"/>
- <location line="+6"/>
- <location line="+513"/>
+ <location line="+430"/>
<source>Bitcoin</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-519"/>
- <location line="+6"/>
+ <location line="-643"/>
<source>Wallet</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+109"/>
+ <location line="+146"/>
<source>&amp;Send</source>
<translation type="unfinished"/>
</message>
@@ -461,13 +478,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+28"/>
- <location line="+2"/>
- <source>&amp;About Bitcoin</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+14"/>
+ <location line="+46"/>
<location line="+2"/>
<source>&amp;Show / Hide</source>
<translation type="unfinished"/>
@@ -493,64 +504,80 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+35"/>
+ <location line="+48"/>
<source>&amp;File</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
+ <location line="+14"/>
<source>&amp;Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>&amp;Help</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+9"/>
+ <location line="+15"/>
<source>Tabs toolbar</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-235"/>
- <location line="+294"/>
+ <location line="-284"/>
+ <location line="+376"/>
<source>[testnet]</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-177"/>
+ <location line="-401"/>
+ <source>Bitcoin Core</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+163"/>
<source>Request payments (generates QR codes and bitcoin: URIs)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+63"/>
- <source>&amp;Used sending addresses...</source>
+ <location line="+29"/>
+ <location line="+2"/>
+ <source>&amp;About Bitcoin Core</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="+35"/>
<source>Show the list of used sending addresses and labels</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Used &amp;receiving addresses...</source>
+ <location line="+2"/>
+ <source>Show the list of used receiving addresses and labels</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open a bitcoin: URI or payment request</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Command-line options</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
- <source>Show the list of used receiving addresses and labels</source>
+ <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+106"/>
+ <location line="+159"/>
<location line="+5"/>
<source>Bitcoin client</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+120"/>
+ <location line="+142"/>
<source>%n active connection(s) to Bitcoin network</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
@@ -570,7 +597,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+20"/>
+ <location line="+23"/>
<source>%n hour(s)</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
@@ -590,7 +617,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
+ <location line="+21"/>
<source>Last received block was generated %1 ago.</source>
<translation type="unfinished"/>
</message>
@@ -615,27 +642,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+77"/>
- <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="-152"/>
+ <location line="-85"/>
<source>Up to date</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Catching up...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+124"/>
- <source>Confirm transaction fee</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+130"/>
<source>Sent transaction</source>
<translation type="unfinished"/>
</message>
@@ -654,17 +671,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+34"/>
- <source>URI handling</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+0"/>
- <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="+45"/>
+ <location line="+69"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation type="unfinished"/>
</message>
@@ -674,7 +681,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+110"/>
+ <location filename="../bitcoin.cpp" line="+438"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation type="unfinished"/>
</message>
@@ -682,12 +689,304 @@ Address: %4
<context>
<name>ClientModel</name>
<message>
- <location filename="../clientmodel.cpp" line="+115"/>
+ <location filename="../clientmodel.cpp" line="+119"/>
<source>Network Alert</source>
<translation type="unfinished"/>
</message>
</context>
<context>
+ <name>CoinControlDialog</name>
+ <message>
+ <location filename="../forms/coincontroldialog.ui" line="+14"/>
+ <source>Coin Control Address Selection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>Quantity:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Bytes:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>Amount:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Priority:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Low Output:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>After Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Change:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+63"/>
+ <source>(un)select all</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Tree mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>List mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>Amount</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Date</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Confirmations</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Confirmed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../coincontroldialog.cpp" line="+42"/>
+ <source>Copy address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy label</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+26"/>
+ <source>Copy amount</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-25"/>
+ <source>Copy transaction ID</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Lock unspent</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Unlock unspent</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+22"/>
+ <source>Copy quantity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Copy fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy after fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy bytes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy low output</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy change</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+323"/>
+ <source>highest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>higher</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>high</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>medium-high</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>medium</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>low-medium</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>low</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>lower</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>lowest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>(%1 locked)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+140"/>
+ <source>Dust</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>yes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>no</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>This label turns red, if the transaction size is greater than 1000 bytes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+5"/>
+ <source>This means a fee of at least %1 per kB is required.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-4"/>
+ <source>Can vary +/- 1 byte per input.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Transactions with higher priority are more likely to get included into a block.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>This label turns red, if the priority is smaller than &quot;medium&quot;.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>This label turns red, if any recipient receives an amount smaller than %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+4"/>
+ <source>This means a fee of at least %1 is required.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-3"/>
+ <source>Amounts below 0.546 times the minimum relay fee are shown as dust.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>This label turns red, if the change is smaller than %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
+ <location line="+66"/>
+ <source>(no label)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-9"/>
+ <source>change from %1 (%2)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>(change)</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>EditAddressDialog</name>
<message>
<location filename="../forms/editaddressdialog.ui" line="+14"/>
@@ -715,7 +1014,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+21"/>
+ <location filename="../editaddressdialog.cpp" line="+28"/>
<source>New receiving address</source>
<translation type="unfinished"/>
</message>
@@ -758,7 +1057,7 @@ Address: %4
<context>
<name>FreespaceChecker</name>
<message>
- <location filename="../intro.cpp" line="+61"/>
+ <location filename="../intro.cpp" line="+65"/>
<source>A new data directory will be created.</source>
<translation type="unfinished"/>
</message>
@@ -784,15 +1083,19 @@ Address: %4
</message>
</context>
<context>
- <name>GUIUtil::HelpMessageBox</name>
+ <name>HelpMessageDialog</name>
<message>
- <location filename="../guiutil.cpp" line="+558"/>
- <location line="+13"/>
- <source>Bitcoin-Qt</source>
+ <location filename="../forms/helpmessagedialog.ui" line="+19"/>
+ <source>Bitcoin Core - Command-line options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-13"/>
+ <location filename="../utilitydialog.cpp" line="+38"/>
+ <source>Bitcoin Core</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
<source>version</source>
<translation type="unfinished"/>
</message>
@@ -841,17 +1144,17 @@ Address: %4
</message>
<message>
<location line="+9"/>
- <source>Welcome to Bitcoin-Qt.</source>
+ <source>Welcome to Bitcoin Core.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+26"/>
- <source>As this is the first time the program is launched, you can choose where Bitcoin-Qt will store its data.</source>
+ <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+10"/>
- <source>Bitcoin-Qt will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
+ <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -865,7 +1168,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../intro.cpp" line="+105"/>
+ <location filename="../intro.cpp" line="+85"/>
+ <source>Bitcoin</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error: Specified data directory &quot;%1&quot; can not be created.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+19"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
@@ -881,6 +1194,34 @@ Address: %4
</message>
</context>
<context>
+ <name>OpenURIDialog</name>
+ <message>
+ <location filename="../forms/openuridialog.ui" line="+14"/>
+ <source>Open URI</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Open payment request from URI or file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>URI:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Select payment request file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../openuridialog.cpp" line="+47"/>
+ <source>Select payment request file to open</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OptionsDialog</name>
<message>
<location filename="../forms/optionsdialog.ui" line="+14"/>
@@ -888,7 +1229,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+13"/>
<source>&amp;Main</source>
<translation type="unfinished"/>
</message>
@@ -913,57 +1254,87 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+35"/>
- <source>Reset all client options to default.</source>
+ <location line="+9"/>
+ <source>Size of &amp;database cache</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>&amp;Reset Options</source>
+ <location line="+13"/>
+ <source>Set database cache size in megabytes (default: 25)</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+13"/>
- <source>&amp;Network</source>
+ <source>MB</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>
+ <location line="+27"/>
+ <source>Number of script &amp;verification threads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Connect to the Bitcoin network through a SOCKS proxy.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
- <source>Map port using &amp;UPnP</source>
+ <source>&amp;Connect through SOCKS proxy (default proxy):</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>
+ <location line="+34"/>
+ <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+224"/>
+ <source>Active command-line options that override above options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
+ <source>Reset all client options to default.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
- <source>&amp;Connect through SOCKS proxy:</source>
+ <source>&amp;Reset Options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+9"/>
- <source>Proxy &amp;IP:</source>
+ <location line="-323"/>
+ <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="+19"/>
- <source>IP address of the proxy (e.g. 127.0.0.1)</source>
+ <source>Proxy &amp;IP:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="+32"/>
<source>&amp;Port:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+19"/>
+ <location line="+25"/>
<source>Port of the proxy (e.g. 9050)</source>
<translation type="unfinished"/>
</message>
@@ -1038,7 +1409,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+71"/>
+ <location line="+7"/>
+ <source>Whether to show coin control features or not.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Display coin &amp;control features (experts only)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+136"/>
<source>&amp;OK</source>
<translation type="unfinished"/>
</message>
@@ -1048,44 +1429,38 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>&amp;Apply</source>
+ <location filename="../optionsdialog.cpp" line="+67"/>
+ <source>default</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+58"/>
- <source>default</source>
+ <location line="+57"/>
+ <source>none</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+130"/>
+ <location line="+75"/>
<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>
+ <location line="+29"/>
+ <source>Client restart required to activate changes.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
- <location line="+9"/>
- <source>Warning</source>
+ <location line="-29"/>
+ <source>Client will be shutdown, do you want to proceed?</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-9"/>
- <location line="+9"/>
- <source>This setting will take effect after restarting Bitcoin.</source>
+ <location line="+33"/>
+ <source>This change would require a client restart.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+29"/>
+ <location line="+34"/>
<source>The supplied proxy address is invalid.</source>
<translation type="unfinished"/>
</message>
@@ -1099,22 +1474,22 @@ Address: %4
</message>
<message>
<location line="+50"/>
- <location line="+202"/>
+ <location line="+231"/>
<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="-131"/>
+ <location line="-155"/>
<source>Unconfirmed:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-78"/>
+ <location line="-83"/>
<source>Wallet</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+49"/>
+ <location line="+51"/>
<source>Confirmed:</source>
<translation type="unfinished"/>
</message>
@@ -1124,12 +1499,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+29"/>
+ <location line="+32"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+16"/>
<source>Immature:</source>
<translation type="unfinished"/>
</message>
@@ -1139,7 +1514,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+16"/>
<source>Total:</source>
<translation type="unfinished"/>
</message>
@@ -1149,12 +1524,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+53"/>
+ <location line="+71"/>
<source>&lt;b&gt;Recent transactions&lt;/b&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../overviewpage.cpp" line="+116"/>
+ <location filename="../overviewpage.cpp" line="+120"/>
<location line="+1"/>
<source>out of sync</source>
<translation type="unfinished"/>
@@ -1163,7 +1538,8 @@ Address: %4
<context>
<name>PaymentServer</name>
<message>
- <location filename="../paymentserver.cpp" line="+392"/>
+ <location filename="../paymentserver.cpp" line="+403"/>
+ <location line="+13"/>
<source>URI handling</source>
<translation type="unfinished"/>
</message>
@@ -1173,45 +1549,82 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+69"/>
+ <location line="+96"/>
<source>Requested payment amount of %1 is too small (considered dust).</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
- <location line="+37"/>
+ <location line="-221"/>
+ <location line="+212"/>
+ <location line="+13"/>
+ <location line="+95"/>
+ <location line="+18"/>
+ <location line="+16"/>
<source>Payment request error</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="-353"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Net manager warning</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+1"/>
- <source>Insecure requests to custom payment scripts unsupported</source>
+ <source>Your active proxy doesn&apos;t support SOCKS5, which is required for payment requests via proxy.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+38"/>
+ <location line="+52"/>
+ <source>Payment request fetch URL is invalid: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Payment request file handling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Payment request file can not be read or processed! This can be caused by an invalid payment request file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+73"/>
+ <source>Unverified payment requests to custom payment scripts are unsupported.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+59"/>
<source>Refund from %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
+ <location line="+43"/>
<source>Error communicating with %1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+24"/>
+ <source>Payment request can not be parsed or processed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
<source>Bad response from server %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+32"/>
+ <location line="+33"/>
<source>Payment acknowledged</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-58"/>
- <location line="+30"/>
- <location line="+17"/>
+ <location line="-11"/>
<source>Network request error</source>
<translation type="unfinished"/>
</message>
@@ -1219,32 +1632,26 @@ Address: %4
<context>
<name>QObject</name>
<message>
- <location filename="../bitcoin.cpp" line="+114"/>
- <location line="+5"/>
- <location filename="../intro.cpp" line="-32"/>
+ <location filename="../bitcoin.cpp" line="+71"/>
+ <location line="+11"/>
<source>Bitcoin</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-4"/>
+ <location line="+1"/>
<source>Error: Specified data directory &quot;%1&quot; does not exist.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="-12"/>
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../intro.cpp" line="+1"/>
- <source>Error: Specified data directory &quot;%1&quot; can not be created.</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>QRImageWidget</name>
<message>
- <location filename="../receiverequestdialog.cpp" line="+32"/>
+ <location filename="../receiverequestdialog.cpp" line="+36"/>
<source>&amp;Save Image...</source>
<translation type="unfinished"/>
</message>
@@ -1260,7 +1667,7 @@ Address: %4
</message>
<message>
<location line="+0"/>
- <source>PNG Images (*.png)</source>
+ <source>PNG Image (*.png)</source>
<translation type="unfinished"/>
</message>
</context>
@@ -1278,15 +1685,16 @@ Address: %4
<location line="+23"/>
<location line="+23"/>
<location line="+36"/>
- <location line="+53"/>
+ <location line="+23"/>
+ <location line="+36"/>
<location line="+23"/>
<location line="+23"/>
- <location filename="../rpcconsole.cpp" line="+352"/>
+ <location filename="../rpcconsole.cpp" line="+359"/>
<source>N/A</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-217"/>
+ <location line="-223"/>
<source>Client version</source>
<translation type="unfinished"/>
</message>
@@ -1296,7 +1704,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+68"/>
+ <location line="-10"/>
+ <source>Debug window</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+25"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+53"/>
<source>Using OpenSSL version</source>
<translation type="unfinished"/>
</message>
@@ -1312,16 +1730,16 @@ Address: %4
</message>
<message>
<location line="+7"/>
- <source>Number of connections</source>
+ <source>Name</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+23"/>
- <source>On testnet</source>
+ <source>Number of connections</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+23"/>
+ <location line="+29"/>
<source>Block chain</source>
<translation type="unfinished"/>
</message>
@@ -1346,21 +1764,6 @@ Address: %4
<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"/>
@@ -1391,22 +1794,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-541"/>
+ <location line="-521"/>
<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"/>
+ <location line="+206"/>
<source>Debug log file</source>
<translation type="unfinished"/>
</message>
@@ -1416,7 +1809,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+102"/>
+ <location line="+76"/>
<source>Clear console</source>
<translation type="unfinished"/>
</message>
@@ -1436,7 +1829,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+128"/>
+ <location line="+122"/>
<source>%1 B</source>
<translation type="unfinished"/>
</message>
@@ -1474,48 +1867,48 @@ Address: %4
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+22"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
<source>&amp;Amount:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
- <source>The amount to request</source>
+ <location line="-13"/>
+ <source>&amp;Label:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>&amp;Label:</source>
+ <location line="-34"/>
+ <source>&amp;Message:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>The label to associate with the receiving address</source>
+ <location line="-17"/>
+ <source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>&amp;Message:</source>
+ <location line="+3"/>
+ <source>R&amp;euse an existing receiving address (not recommended)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>The message to attach to payment request</source>
+ <location line="+27"/>
+ <source>An optional label to associate with the new receiving address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
- <source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
+ <location line="+7"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>R&amp;euse an existing receiving address (not recommended)</source>
+ <location line="+7"/>
+ <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>Use this form to request payments. All fields are optional.</source>
+ <location line="+39"/>
+ <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1533,6 +1926,31 @@ Address: %4
<source>&amp;Request payment</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+47"/>
+ <source>Requested payments</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Show the selected request (does the same as double clicking an entry)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Show</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Remove the selected entries from the list</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Remove</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
@@ -1553,16 +1971,11 @@ Address: %4
</message>
<message>
<location line="+7"/>
- <source>&amp;Copy Image</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+7"/>
<source>&amp;Save Image...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../receiverequestdialog.cpp" line="+58"/>
+ <location filename="../receiverequestdialog.cpp" line="+56"/>
<source>Request payment to %1</source>
<translation type="unfinished"/>
</message>
@@ -1608,16 +2021,119 @@ Address: %4
</message>
</context>
<context>
+ <name>RecentRequestsTableModel</name>
+ <message>
+ <location filename="../recentrequeststablemodel.cpp" line="+24"/>
+ <source>Date</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Label</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Amount</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+38"/>
+ <source>(no label)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>(no message)</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+140"/>
- <location line="+213"/>
+ <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location line="+80"/>
<source>Send Coins</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+50"/>
+ <location line="+76"/>
+ <source>Coin Control Features</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Inputs...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>automatically selected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Insufficient funds!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+89"/>
+ <source>Quantity:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+35"/>
+ <source>Bytes:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Amount:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Priority:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Low Output:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>After Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Change:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+44"/>
+ <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Custom change address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+115"/>
<source>Send to multiple recipients at once</source>
<translation type="unfinished"/>
</message>
@@ -1642,12 +2158,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>123.456 BTC</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+31"/>
+ <location line="+41"/>
<source>Confirm the send action</source>
<translation type="unfinished"/>
</message>
@@ -1657,69 +2168,135 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-154"/>
+ <location filename="../sendcoinsdialog.cpp" line="-228"/>
<source>Confirm send coins</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-90"/>
+ <location line="-74"/>
<location line="+5"/>
<location line="+5"/>
+ <location line="+4"/>
<source>%1 to %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+26"/>
+ <location line="-136"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Copy quantity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy after fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy bytes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy low output</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy change</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+170"/>
+ <source>Total Amount %1 (= %2)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>or</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+202"/>
<source>The recipient address is not valid, please recheck.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The amount to pay must be larger than 0.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The amount exceeds your balance.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The total exceeds your balance when the %1 transaction fee is included.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+3"/>
<source>Duplicate address found, can only send to each address once per send operation.</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="+3"/>
+ <source>Transaction creation failed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+4"/>
- <source>Error: Transaction creation failed!</source>
+ <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+15"/>
- <source>Are you sure you want to send?</source>
+ <location line="+112"/>
+ <source>Warning: Invalid Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+9"/>
- <source>added as transaction fee</source>
+ <location line="+21"/>
+ <source>(no label)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
- <source>Total Amount %1</source>
+ <location line="-11"/>
+ <source>Warning: Unknown change address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+20"/>
- <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>
+ <location line="-366"/>
+ <source>Are you sure you want to send?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>added as transaction fee</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+144"/>
+ <location line="+170"/>
<source>Payment request expired</source>
<translation type="unfinished"/>
</message>
@@ -1732,39 +2309,44 @@ Address: %4
<context>
<name>SendCoinsEntry</name>
<message>
- <location filename="../forms/sendcoinsentry.ui" line="+33"/>
- <location line="+585"/>
+ <location filename="../forms/sendcoinsentry.ui" line="+131"/>
+ <location line="+521"/>
+ <location line="+536"/>
<source>A&amp;mount:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-572"/>
- <location line="+585"/>
+ <location line="-1152"/>
<source>Pay &amp;To:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-551"/>
+ <location line="+18"/>
<source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../sendcoinsentry.cpp" line="+28"/>
+ <location filename="../sendcoinsentry.cpp" line="+30"/>
<source>Enter a label for this address to add it to your address book</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../forms/sendcoinsentry.ui" line="-18"/>
+ <location filename="../forms/sendcoinsentry.ui" line="+57"/>
<source>&amp;Label:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+28"/>
+ <location line="-50"/>
<source>Choose previously used address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
+ <location line="-40"/>
+ <source>This is a normal payment.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+50"/>
<source>Alt+A</source>
<translation type="unfinished"/>
</message>
@@ -1780,16 +2362,45 @@ Address: %4
</message>
<message>
<location line="+7"/>
- <source>Remove this recipient</source>
+ <location line="+524"/>
+ <location line="+536"/>
+ <source>Remove this entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="-1008"/>
+ <source>Message:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+958"/>
+ <source>This is a verified payment request.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-991"/>
<source>Enter a label for this address to add it to the list of used addresses</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+465"/>
+ <location line="+459"/>
+ <source>This is an unverified payment request.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+18"/>
+ <location line="+532"/>
+ <source>Pay To:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-498"/>
+ <location line="+536"/>
<source>Memo:</source>
<translation type="unfinished"/>
</message>
@@ -1800,6 +2411,19 @@ Address: %4
</message>
</context>
<context>
+ <name>ShutdownWindow</name>
+ <message>
+ <location filename="../utilitydialog.cpp" line="+48"/>
+ <source>Bitcoin Core is shutting down...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Do not shut down the computer until this window disappears.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>SignVerifyMessageDialog</name>
<message>
<location filename="../forms/signverifymessagedialog.ui" line="+14"/>
@@ -1807,7 +2431,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+10"/>
<source>&amp;Sign Message</source>
<translation type="unfinished"/>
</message>
@@ -1910,7 +2534,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+27"/>
+ <location filename="../signverifymessagedialog.cpp" line="+29"/>
<location line="+3"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation type="unfinished"/>
@@ -1926,7 +2550,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+85"/>
+ <location line="+84"/>
<location line="+81"/>
<source>The entered address is invalid.</source>
<translation type="unfinished"/>
@@ -1995,8 +2619,13 @@ Address: %4
<context>
<name>SplashScreen</name>
<message>
- <location filename="../splashscreen.cpp" line="+23"/>
- <source>The Bitcoin developers</source>
+ <location filename="../splashscreen.cpp" line="+28"/>
+ <source>Bitcoin Core</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
<message>
@@ -2008,7 +2637,7 @@ Address: %4
<context>
<name>TrafficGraphWidget</name>
<message>
- <location filename="../trafficgraphwidget.cpp" line="+75"/>
+ <location filename="../trafficgraphwidget.cpp" line="+79"/>
<source>KB/s</source>
<translation type="unfinished"/>
</message>
@@ -2016,7 +2645,7 @@ Address: %4
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="+22"/>
+ <location filename="../transactiondesc.cpp" line="+28"/>
<source>Open until %1</source>
<translation type="unfinished"/>
</message>
@@ -2089,12 +2718,12 @@ Address: %4
<location line="+12"/>
<location line="+45"/>
<location line="+17"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Credit</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="-120"/>
+ <location line="-125"/>
<source>matures in %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
@@ -2107,12 +2736,12 @@ Address: %4
<location line="+44"/>
<location line="+8"/>
<location line="+15"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Debit</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-57"/>
+ <location line="-62"/>
<source>Transaction fee</source>
<translation type="unfinished"/>
</message>
@@ -2123,11 +2752,12 @@ Address: %4
</message>
<message>
<location line="+6"/>
+ <location line="+9"/>
<source>Message</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="-7"/>
<source>Comment</source>
<translation type="unfinished"/>
</message>
@@ -2137,7 +2767,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+18"/>
<source>Merchant</source>
<translation type="unfinished"/>
</message>
@@ -2177,7 +2807,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-227"/>
+ <location line="-232"/>
<source>, has not been successfully broadcast yet</source>
<translation type="unfinished"/>
</message>
@@ -2208,7 +2838,7 @@ Address: %4
<context>
<name>TransactionTableModel</name>
<message>
- <location filename="../transactiontablemodel.cpp" line="+227"/>
+ <location filename="../transactiontablemodel.cpp" line="+234"/>
<source>Date</source>
<translation type="unfinished"/>
</message>
@@ -2227,8 +2857,13 @@ Address: %4
<source>Amount</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+59"/>
+ <source>Immature (%1 confirmations, will be available after %2)</source>
+ <translation type="unfinished"/>
+ </message>
<message numerus="yes">
- <location line="+57"/>
+ <location line="+16"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
@@ -2248,17 +2883,13 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
+ <location line="-22"/>
+ <location line="+25"/>
<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></translation>
- </message>
<message>
- <location line="+5"/>
+ <location line="-22"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation type="unfinished"/>
</message>
@@ -2268,7 +2899,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+43"/>
+ <location line="+62"/>
<source>Received with</source>
<translation type="unfinished"/>
</message>
@@ -2326,7 +2957,7 @@ Address: %4
<context>
<name>TransactionView</name>
<message>
- <location filename="../transactionview.cpp" line="+52"/>
+ <location filename="../transactionview.cpp" line="+57"/>
<location line="+16"/>
<source>All</source>
<translation type="unfinished"/>
@@ -2387,12 +3018,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="+6"/>
<source>Enter address or label to search</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="+6"/>
<source>Min amount</source>
<translation type="unfinished"/>
</message>
@@ -2427,17 +3058,37 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+143"/>
- <source>Export Transaction Data</source>
+ <location line="+142"/>
+ <source>Export Transaction History</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="+19"/>
+ <source>Exporting Failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>There was an error trying to save the transaction history to %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Exporting Successful</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The transaction history was successfully saved to %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-22"/>
<source>Comma separated file (*.csv)</source>
<translation>Үтірмен бөлінген текÑÑ‚ (*.csv)</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+9"/>
<source>Confirmed</source>
<translation type="unfinished"/>
</message>
@@ -2472,17 +3123,7 @@ Address: %4
<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"/>
+ <location line="+107"/>
<source>Range:</source>
<translation type="unfinished"/>
</message>
@@ -2493,9 +3134,17 @@ Address: %4
</message>
</context>
<context>
+ <name>WalletFrame</name>
+ <message>
+ <location filename="../walletframe.cpp" line="+26"/>
+ <source>No wallet has been loaded.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>WalletModel</name>
<message>
- <location filename="../walletmodel.cpp" line="+218"/>
+ <location filename="../walletmodel.cpp" line="+245"/>
<source>Send Coins</source>
<translation type="unfinished"/>
</message>
@@ -2503,7 +3152,7 @@ Address: %4
<context>
<name>WalletView</name>
<message>
- <location filename="../walletview.cpp" line="+46"/>
+ <location filename="../walletview.cpp" line="+43"/>
<source>&amp;Export</source>
<translation type="unfinished"/>
</message>
@@ -2513,65 +3162,60 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+183"/>
+ <location line="+181"/>
<source>Backup Wallet</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
+ <location line="+1"/>
<source>Wallet Data (*.dat)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
+ <location line="+6"/>
<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>
+ <source>There was an error trying to save the wallet data to %1.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+4"/>
- <source>Backup Successful</source>
+ <source>The wallet data was successfully saved to %1.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+0"/>
- <source>The wallet data was successfully saved to the new location.</source>
+ <source>Backup Successful</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+102"/>
- <source>Bitcoin version</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+107"/>
+ <location filename="../bitcoinstrings.cpp" line="+221"/>
<source>Usage:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-55"/>
+ <location line="-54"/>
<source>List commands</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-13"/>
+ <location line="-14"/>
<source>Get help for a command</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+25"/>
+ <location line="+26"/>
<source>Options:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+24"/>
+ <location line="+22"/>
<source>Specify configuration file (default: bitcoin.conf)</source>
<translation type="unfinished"/>
</message>
@@ -2591,7 +3235,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-28"/>
+ <location line="-26"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
<translation type="unfinished"/>
</message>
@@ -2601,7 +3245,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-49"/>
+ <location line="-51"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation type="unfinished"/>
</message>
@@ -2611,37 +3255,37 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-142"/>
+ <location line="-148"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-33"/>
+ <location line="-36"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+40"/>
+ <location line="+45"/>
<source>Accept command line and JSON-RPC commands</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<source>Run in the background as a daemon and accept commands</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+40"/>
+ <location line="+39"/>
<source>Use the test network</source>
<translation type="unfinished"/>
</message>
@@ -2651,7 +3295,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-87"/>
+ <location line="-95"/>
<source>%s, you must set a rpcpassword in the configuration file:
%s
It is recommended you use the following random password:
@@ -2692,6 +3336,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+4"/>
+ <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</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>
@@ -2706,17 +3355,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+11"/>
- <source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source>
+ <location line="+18"/>
+ <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="+6"/>
- <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
+ <location line="+5"/>
+ <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+3"/>
<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>
@@ -2746,17 +3395,27 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
+ <location line="+9"/>
+ <source>&lt;category&gt; can be:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
<source>Attempt to recover private keys from a corrupt wallet.dat</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
+ <source>Bitcoin Core Daemon</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Bitcoin RPC client version</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
<source>Block creation options:</source>
<translation type="unfinished"/>
</message>
@@ -2766,7 +3425,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
+ <source>Connect through SOCKS proxy</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect to JSON-RPC on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation type="unfinished"/>
</message>
@@ -2782,6 +3446,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+1"/>
+ <source>Do not load the wallet and disable wallet RPC calls</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Do you want to rebuild the block database now?</source>
<translation type="unfinished"/>
</message>
@@ -2876,7 +3545,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
+ <source>Fee per kB to add to transactions you send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Find peers using DNS lookup (default: 1 unless -connect)</source>
<translation type="unfinished"/>
</message>
@@ -2896,6 +3570,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
+ <location line="+1"/>
+ <source>If &lt;category&gt; is not supplied, output all debugging information.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+2"/>
<source>Incorrect or no genesis block found. Wrong datadir for network?</source>
<translation type="unfinished"/>
@@ -2911,17 +3590,37 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+8"/>
+ <location line="+5"/>
+ <source>Prepend debug output with timestamp (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>RPC client options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Rebuild block chain index from current blk000??.dat files</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+5"/>
+ <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Send command to Bitcoin server</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
+ <location line="+7"/>
+ <source>Set maximum block size in bytes (default: %d)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Set the number of threads to service RPC calls (default: 4)</source>
<translation type="unfinished"/>
</message>
@@ -2936,12 +3635,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+12"/>
+ <location line="+3"/>
+ <source>This is intended for regression testing tools and app development.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Usage (deprecated, use bitcoin-cli):</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+8"/>
+ <location line="+7"/>
<source>Verifying blocks...</source>
<translation type="unfinished"/>
</message>
@@ -2952,31 +3656,56 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+1"/>
+ <source>Wait for RPC server to start</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Wallet %s resides outside data directory %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+2"/>
+ <source>Wallet options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>You need to rebuild the database using -reindex to change -txindex</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-78"/>
+ <location line="-79"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-98"/>
+ <location line="-105"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+17"/>
+ <location line="+14"/>
+ <source>Output debugging information (default: 0, supplying &lt;category&gt; is optional)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+83"/>
+ <location line="+89"/>
<source>Information</source>
<translation type="unfinished"/>
</message>
@@ -3016,47 +3745,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<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"/>
+ <location line="+9"/>
<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"/>
+ <location line="+4"/>
<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"/>
+ <location line="+6"/>
<source>Set minimum block size in bytes (default: 0)</source>
<translation type="unfinished"/>
</message>
@@ -3081,7 +3780,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Transaction amount too small</source>
<translation>Ð¢Ñ€Ð°Ð½Ð·Ð°ÐºÑ†Ð¸Ñ Ó©Ñ‚Ðµ кішкентай</translation>
</message>
@@ -3106,32 +3805,32 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<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="+5"/>
+ <location line="+7"/>
<source>Warning</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Warning: This version is obsolete, upgrade required!</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+2"/>
+ <source>version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>wallet.dat corrupt, salvage failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-54"/>
+ <location line="-58"/>
<source>Password for JSON-RPC connections</source>
<translation type="unfinished"/>
</message>
@@ -3141,27 +3840,27 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-126"/>
+ <location line="-132"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+155"/>
+ <location line="+161"/>
<source>Upgrade wallet to latest format</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-12"/>
+ <location line="-11"/>
<source>Rescan the block chain for missing wallet transactions</source>
<translation type="unfinished"/>
</message>
@@ -3171,7 +3870,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-29"/>
+ <location line="-30"/>
<source>Server certificate file (default: server.cert)</source>
<translation type="unfinished"/>
</message>
@@ -3186,27 +3885,22 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Unable to bind to %s on this computer (bind returned error %d, %s)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-95"/>
- <source>Connect through socks proxy</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="-11"/>
+ <location line="-107"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+58"/>
+ <location line="+60"/>
<source>Loading addresses...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-36"/>
+ <location line="-37"/>
<source>Error loading wallet.dat: Wallet corrupted</source>
<translation type="unfinished"/>
</message>
@@ -3226,12 +3920,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+30"/>
+ <location line="+31"/>
<source>Invalid -proxy address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+57"/>
+ <location line="+56"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3241,7 +3935,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3251,7 +3945,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+46"/>
+ <location line="+48"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3271,27 +3965,22 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-60"/>
+ <location line="-62"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-28"/>
+ <location line="-32"/>
<source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+69"/>
- <source>Fee per KB to add to transactions you send</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+20"/>
+ <location line="+95"/>
<source>Loading wallet...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-54"/>
+ <location line="-56"/>
<source>Cannot downgrade wallet</source>
<translation type="unfinished"/>
</message>
@@ -3301,7 +3990,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+66"/>
+ <location line="+67"/>
<source>Rescanning...</source>
<translation type="unfinished"/>
</message>
@@ -3321,7 +4010,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-33"/>
+ <location line="-35"/>
<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_ko_KR.ts b/src/qt/locale/bitcoin_ko_KR.ts
index 6123aa702b..804805a216 100644
--- a/src/qt/locale/bitcoin_ko_KR.ts
+++ b/src/qt/locale/bitcoin_ko_KR.ts
@@ -3,13 +3,13 @@
<name>AboutDialog</name>
<message>
<location filename="../forms/aboutdialog.ui" line="+14"/>
- <source>About Bitcoin</source>
- <translation>ë¹„íŠ¸ì½”ì¸ ì†Œê°œ</translation>
+ <source>About Bitcoin Core</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+39"/>
- <source>&lt;b&gt;Bitcoin&lt;/b&gt; version</source>
- <translation>&lt;b&gt;비트코ì¸&lt;/b&gt;버전</translation>
+ <source>&lt;b&gt;Bitcoin Core&lt;/b&gt; version</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+57"/>
@@ -19,16 +19,21 @@ 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>
+ì´ í”„ë¡œê·¸ëž¨ì€ ì‹œí—˜ìš©ìž…ë‹ˆë‹¤.
+
+MIT/X11 프로그램 ë¼ì´ì„ ìŠ¤ì— ë”°ë¼ ë°°í¬í•©ë‹ˆë‹¤. COPYING ë˜ëŠ” http://www.opensource.org/licenses/mit-license.php를 참조하십시오.
+
+ì´ í”„ë¡œê·¸ëž¨ì—는 OpenSSL 툴킷(http://www.openssl.org) 사용 목ì ìœ¼ë¡œ 개발한 OpenSSL 프로ì íŠ¸ë¥¼ í¬í•¨í•˜ê³  있으며, 암호화 í”„ë¡œê·¸ëž¨ì€ Eric Young(eay@cryptsoft.com)ì´, UPnP í”„ë¡œê·¸ëž¨ì€ Thomas Bernardê°€ 작성했습니다.</translation>
</message>
<message>
- <location filename="../aboutdialog.cpp" line="+14"/>
+ <location filename="../utilitydialog.cpp" line="+29"/>
<source>Copyright</source>
- <translation type="unfinished"/>
+ <translation>Copyright</translation>
</message>
<message>
<location line="+0"/>
- <source>The Bitcoin developers</source>
+ <source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
</context>
@@ -65,14 +70,14 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location filename="../addressbookpage.cpp" line="+72"/>
+ <location filename="../addressbookpage.cpp" line="+74"/>
<source>&amp;Copy Address</source>
- <translation type="unfinished"/>
+ <translation>계좌 복사(&amp;C)</translation>
</message>
<message>
<location filename="../forms/addressbookpage.ui" line="-41"/>
<source>Delete the currently selected address from the list</source>
- <translation type="unfinished"/>
+ <translation>현재 목ë¡ì— ì„ íƒí•œ 주소 ì‚­ì œ</translation>
</message>
<message>
<location line="+27"/>
@@ -127,15 +132,15 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+7"/>
<source>Copy &amp;Label</source>
- <translation type="unfinished"/>
+ <translation>ë ˆì´ë¸” 복사(&amp;L)</translation>
</message>
<message>
<location line="+1"/>
<source>&amp;Edit</source>
- <translation type="unfinished"/>
+ <translation>편집(&amp;E)</translation>
</message>
<message>
- <location line="+197"/>
+ <location line="+194"/>
<source>Export Address List</source>
<translation type="unfinished"/>
</message>
@@ -146,19 +151,19 @@ This product includes software developed by the OpenSSL Project for use in the O
</message>
<message>
<location line="+13"/>
- <source>Error exporting</source>
- <translation>ì—러 내보내기</translation>
+ <source>Exporting Failed</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation>파ì¼ì„ 저장 í•  수 없슴 %1.</translation>
+ <location line="+1"/>
+ <source>There was an error trying to save the address list to %1.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<name>AddressTableModel</name>
<message>
- <location filename="../addresstablemodel.cpp" line="+164"/>
+ <location filename="../addresstablemodel.cpp" line="+168"/>
<source>Label</source>
<translation>표</translation>
</message>
@@ -178,7 +183,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"/>
@@ -196,7 +201,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>새로운 패스프레ì´ì¦ˆ 반복</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="+34"/>
+ <location filename="../askpassphrasedialog.cpp" line="+40"/>
<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>새로운 패스프레ì´ì¦ˆë¥¼ ì§€ê°‘ì— ìž…ë ¥. 8ìžë³´ë‹¤ ë§Žì€ ë‹¨ì–´ë¥¼ 입력하거나 10 ìžë³´ë‹¤ ë§Žì€ ë¬´ìž‘ìœ„ ìºëž™í„°ë¥¼ 패스프레ì´ì¦ˆì— 사용하세요.</translation>
</message>
@@ -259,7 +264,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>경고: ìº¡ìŠ¤ë¡ í‚¤ê°€ 켜져있습니다!</translation>
</message>
<message>
<location line="-130"/>
@@ -270,7 +275,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>암호화 처리 ê³¼ì •ì„ ë내기 위해 비트코ì¸ì„ 닫겠습니다. 지갑 암호화는 ì»´í“¨í„°ë¡œì˜ ë©€ì›¨ì–´ ê°ì—¼ìœ¼ë¡œ ì¸í•œ ë¹„íŠ¸ì½”ì¸ ë„ë‚œì„ ì™„ì „ížˆ 막아주지 ëª»í•¨ì„ ê¸°ì–µí•˜ì‹­ì‹œì˜¤.</translation>
</message>
<message>
<location line="+13"/>
@@ -317,22 +322,27 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+250"/>
+ <location filename="../bitcoingui.cpp" line="+295"/>
<source>Sign &amp;message...</source>
- <translation type="unfinished"/>
+ <translation>메시지 서명(&amp;M)...</translation>
</message>
<message>
- <location line="+254"/>
+ <location line="+335"/>
<source>Synchronizing with network...</source>
<translation>네트워í¬ì™€ ë™ê¸°í™”중...</translation>
</message>
<message>
- <location line="-324"/>
+ <location line="-407"/>
<source>&amp;Overview</source>
<translation>&amp;개요</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="-137"/>
+ <source>Node</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+138"/>
<source>Show general overview of wallet</source>
<translation>ì§€ê°‘ì˜ ì¼ë°˜ì  개요를 ë³´ì—¬ ì¤ë‹ˆë‹¤.</translation>
</message>
@@ -347,9 +357,9 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>ê±°ëž˜ë‚´ì—­ì„ ê²€ìƒ‰í•©ë‹ˆë‹¤.</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>E&amp;xit</source>
- <translation type="unfinished"/>
+ <translation>나가기(&amp;X)</translation>
</message>
<message>
<location line="+1"/>
@@ -365,12 +375,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<location line="+3"/>
<location line="+2"/>
<source>About &amp;Qt</source>
- <translation type="unfinished"/>
+ <translation>Qt ì •ë³´(&amp;Q)</translation>
</message>
<message>
<location line="+2"/>
<source>Show information about Qt</source>
- <translation type="unfinished"/>
+ <translation>Qt 정보를 표시합니다</translation>
</message>
<message>
<location line="+2"/>
@@ -380,37 +390,52 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+9"/>
<source>&amp;Encrypt Wallet...</source>
- <translation type="unfinished"/>
+ <translation>지갑 암호화(&amp;E)...</translation>
</message>
<message>
<location line="+3"/>
<source>&amp;Backup Wallet...</source>
- <translation type="unfinished"/>
+ <translation>지갑 백업(&amp;B)...</translation>
</message>
<message>
<location line="+2"/>
<source>&amp;Change Passphrase...</source>
+ <translation>암호문 변경(&amp;C)...</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>&amp;Sending addresses...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+259"/>
- <source>Importing blocks from disk...</source>
+ <location line="+2"/>
+ <source>&amp;Receiving addresses...</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
- <source>Reindexing blocks on disk...</source>
+ <source>Open &amp;URI...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-322"/>
+ <location line="+325"/>
+ <source>Importing blocks from disk...</source>
+ <translation>디스í¬ì—ì„œ ë¸”ë¡ ê°€ì ¸ì˜¤ëŠ” 중...</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Reindexing blocks on disk...</source>
+ <translation>디스í¬ì—ì„œ ë¸”ë¡ ë‹¤ì‹œ 색ì¸ì¤‘...</translation>
+ </message>
+ <message>
+ <location line="-405"/>
<source>Send coins to a Bitcoin address</source>
- <translation type="unfinished"/>
+ <translation>ë¹„íŠ¸ì½”ì¸ ì£¼ì†Œë¡œ ì½”ì¸ ì „ì†¡</translation>
</message>
<message>
- <location line="+47"/>
+ <location line="+49"/>
<source>Modify configuration options for Bitcoin</source>
- <translation type="unfinished"/>
+ <translation>ë¹„íŠ¸ì½”ì¸ ì„¤ì • 옵션 수정</translation>
</message>
<message>
<location line="+12"/>
@@ -425,62 +450,53 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+6"/>
<source>&amp;Debug window</source>
- <translation type="unfinished"/>
+ <translation>디버그 창(&amp;D)</translation>
</message>
<message>
<location line="+1"/>
<source>Open debugging and diagnostic console</source>
- <translation type="unfinished"/>
+ <translation>디버깅 ë° ì§„ë‹¨ ì½˜ì†”ì„ ì—½ë‹ˆë‹¤</translation>
</message>
<message>
<location line="-4"/>
<source>&amp;Verify message...</source>
- <translation type="unfinished"/>
+ <translation>메시지 ê²€ì¦(&amp;V)...</translation>
</message>
<message>
- <location line="-180"/>
- <location line="+6"/>
- <location line="+513"/>
+ <location line="+430"/>
<source>Bitcoin</source>
- <translation type="unfinished"/>
+ <translation>비트코ì¸</translation>
</message>
<message>
- <location line="-519"/>
- <location line="+6"/>
+ <location line="-643"/>
<source>Wallet</source>
<translation>지갑</translation>
</message>
<message>
- <location line="+109"/>
+ <location line="+146"/>
<source>&amp;Send</source>
- <translation type="unfinished"/>
+ <translation>보내기(&amp;S)</translation>
</message>
<message>
<location line="+7"/>
<source>&amp;Receive</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+28"/>
- <location line="+2"/>
- <source>&amp;About Bitcoin</source>
- <translation type="unfinished"/>
+ <translation>받기(&amp;R)</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="+46"/>
<location line="+2"/>
<source>&amp;Show / Hide</source>
- <translation type="unfinished"/>
+ <translation>ë³´ì´ê¸°/숨기기(&amp;S)</translation>
</message>
<message>
<location line="+1"/>
<source>Show or hide the main Window</source>
- <translation type="unfinished"/>
+ <translation>주 ì°½ ë³´ì´ê¸° ë˜ëŠ” 숨기기</translation>
</message>
<message>
<location line="+3"/>
<source>Encrypt the private keys that belong to your wallet</source>
- <translation type="unfinished"/>
+ <translation>소유 지갑 ê°œì¸í‚¤ 암호화</translation>
</message>
<message>
<location line="+7"/>
@@ -493,64 +509,80 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+35"/>
+ <location line="+48"/>
<source>&amp;File</source>
<translation>&amp;파ì¼</translation>
</message>
<message>
- <location line="+10"/>
+ <location line="+14"/>
<source>&amp;Settings</source>
<translation>&amp;설정</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>&amp;Help</source>
<translation>&amp;ë„움ë§</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+15"/>
<source>Tabs toolbar</source>
<translation>툴바 색ì¸í‘œ</translation>
</message>
<message>
- <location line="-235"/>
- <location line="+294"/>
+ <location line="-284"/>
+ <location line="+376"/>
<source>[testnet]</source>
<translation>[테스트넷]</translation>
</message>
<message>
- <location line="-177"/>
+ <location line="-401"/>
+ <source>Bitcoin Core</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+163"/>
<source>Request payments (generates QR codes and bitcoin: URIs)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+63"/>
- <source>&amp;Used sending addresses...</source>
+ <location line="+29"/>
+ <location line="+2"/>
+ <source>&amp;About Bitcoin Core</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="+35"/>
<source>Show the list of used sending addresses and labels</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Used &amp;receiving addresses...</source>
+ <location line="+2"/>
+ <source>Show the list of used receiving addresses and labels</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open a bitcoin: URI or payment request</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Command-line options</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
- <source>Show the list of used receiving addresses and labels</source>
+ <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+106"/>
+ <location line="+159"/>
<location line="+5"/>
<source>Bitcoin client</source>
<translation>ë¹„íŠ¸ì½”ì¸ ê³ ê°</translation>
</message>
<message numerus="yes">
- <location line="+120"/>
+ <location line="+142"/>
<source>%n active connection(s) to Bitcoin network</source>
<translation><numerusform>ë¹„íŠ¸ì½”ì¸ ë„¤íŠ¸ì›Œí¬ì™€ %n ê°œì˜ í™œì„±ì—°ê²°</numerusform></translation>
</message>
@@ -562,7 +594,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+12"/>
<source>Processed %1 of %2 (estimated) blocks of transaction history.</source>
- <translation type="unfinished"/>
+ <translation>송금 ê¸°ë¡ %1/%2ê°œ ë¸”ë¡ (추산) 처리ë¨.</translation>
</message>
<message>
<location line="+4"/>
@@ -570,7 +602,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+20"/>
+ <location line="+23"/>
<source>%n hour(s)</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
@@ -590,7 +622,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
+ <location line="+21"/>
<source>Last received block was generated %1 ago.</source>
<translation type="unfinished"/>
</message>
@@ -602,40 +634,30 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+27"/>
<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"/>
- </message>
- <message>
- <location line="+77"/>
- <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
- <translation type="unfinished"/>
+ <translation>ì •ë³´</translation>
</message>
<message>
- <location line="-152"/>
+ <location line="-85"/>
<source>Up to date</source>
<translation>현재까지</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Catching up...</source>
<translation>ë”°ë¼ìž¡ê¸°...</translation>
</message>
<message>
- <location line="+124"/>
- <source>Confirm transaction fee</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+130"/>
<source>Sent transaction</source>
<translation>거래 보내기</translation>
</message>
@@ -651,20 +673,14 @@ Amount: %2
Type: %3
Address: %4
</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+34"/>
- <source>URI handling</source>
- <translation type="unfinished"/>
+ <translation>날짜: %1
+거래액: %2
+형ì‹: %3
+주소: %4
+</translation>
</message>
<message>
- <location line="+0"/>
- <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="+45"/>
+ <location line="+69"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation>ì§€ê°‘ì´ ì•”í˜¸í™” ë˜ì—ˆê³  현재 차단해제 ë˜ì—ˆìŠµë‹ˆë‹¤</translation>
</message>
@@ -674,16 +690,308 @@ Address: %4
<translation>ì§€ê°‘ì´ ì•”í˜¸í™” ë˜ì—ˆê³  현재 잠겨져 있습니다</translation>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+110"/>
+ <location filename="../bitcoin.cpp" line="+438"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
- <translation type="unfinished"/>
+ <translation>치명ì ì¸ 오류가 있습니다. 비트코ì¸ì„ ë”ì´ìƒ 안전하게 진행할 수 없어 빠져나갑니다.</translation>
</message>
</context>
<context>
<name>ClientModel</name>
<message>
- <location filename="../clientmodel.cpp" line="+115"/>
+ <location filename="../clientmodel.cpp" line="+119"/>
<source>Network Alert</source>
+ <translation>ë„¤íŠ¸ì›Œí¬ ê²½ê³ </translation>
+ </message>
+</context>
+<context>
+ <name>CoinControlDialog</name>
+ <message>
+ <location filename="../forms/coincontroldialog.ui" line="+14"/>
+ <source>Coin Control Address Selection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>Quantity:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Bytes:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>Amount:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Priority:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Low Output:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>After Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Change:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+63"/>
+ <source>(un)select all</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Tree mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>List mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>Amount</source>
+ <translation>거래량</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Address</source>
+ <translation>주소</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Date</source>
+ <translation>날짜</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Confirmations</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Confirmed</source>
+ <translation>확ì¸ë¨</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../coincontroldialog.cpp" line="+42"/>
+ <source>Copy address</source>
+ <translation>주소 복사하기</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy label</source>
+ <translation>ë¼ë²¨ 복사하기</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+26"/>
+ <source>Copy amount</source>
+ <translation>거래액 복사</translation>
+ </message>
+ <message>
+ <location line="-25"/>
+ <source>Copy transaction ID</source>
+ <translation>송금 ID 복사</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Lock unspent</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Unlock unspent</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+22"/>
+ <source>Copy quantity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Copy fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy after fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy bytes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy low output</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy change</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+323"/>
+ <source>highest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>higher</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>high</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>medium-high</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>medium</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>low-medium</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>low</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>lower</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>lowest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>(%1 locked)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+140"/>
+ <source>Dust</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>yes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>no</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>This label turns red, if the transaction size is greater than 1000 bytes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+5"/>
+ <source>This means a fee of at least %1 per kB is required.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-4"/>
+ <source>Can vary +/- 1 byte per input.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Transactions with higher priority are more likely to get included into a block.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>This label turns red, if the priority is smaller than &quot;medium&quot;.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>This label turns red, if any recipient receives an amount smaller than %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+4"/>
+ <source>This means a fee of at least %1 is required.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-3"/>
+ <source>Amounts below 0.546 times the minimum relay fee are shown as dust.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>This label turns red, if the change is smaller than %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
+ <location line="+66"/>
+ <source>(no label)</source>
+ <translation>(표 없슴)</translation>
+ </message>
+ <message>
+ <location line="-9"/>
+ <source>change from %1 (%2)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>(change)</source>
<translation type="unfinished"/>
</message>
</context>
@@ -715,7 +1023,7 @@ Address: %4
<translation>&amp;주소</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+21"/>
+ <location filename="../editaddressdialog.cpp" line="+28"/>
<source>New receiving address</source>
<translation>새로 받는 주소</translation>
</message>
@@ -742,7 +1050,7 @@ Address: %4
<message>
<location line="-5"/>
<source>The entered address &quot;%1&quot; is not a valid Bitcoin address.</source>
- <translation type="unfinished"/>
+ <translation>입력한 &quot;%1&quot; 주소는 올바른 ë¹„íŠ¸ì½”ì¸ ì£¼ì†Œê°€ 아닙니다.</translation>
</message>
<message>
<location line="+10"/>
@@ -758,7 +1066,7 @@ Address: %4
<context>
<name>FreespaceChecker</name>
<message>
- <location filename="../intro.cpp" line="+61"/>
+ <location filename="../intro.cpp" line="+65"/>
<source>A new data directory will be created.</source>
<translation type="unfinished"/>
</message>
@@ -784,47 +1092,51 @@ Address: %4
</message>
</context>
<context>
- <name>GUIUtil::HelpMessageBox</name>
+ <name>HelpMessageDialog</name>
<message>
- <location filename="../guiutil.cpp" line="+558"/>
- <location line="+13"/>
- <source>Bitcoin-Qt</source>
+ <location filename="../forms/helpmessagedialog.ui" line="+19"/>
+ <source>Bitcoin Core - Command-line options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-13"/>
- <source>version</source>
+ <location filename="../utilitydialog.cpp" line="+38"/>
+ <source>Bitcoin Core</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="+0"/>
+ <source>version</source>
+ <translation>버전</translation>
+ </message>
+ <message>
<location line="+2"/>
<source>Usage:</source>
- <translation type="unfinished"/>
+ <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>UI 옵션</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 type="unfinished"/>
+ <translation>최소화 ìƒíƒœì—ì„œ 시작</translation>
</message>
<message>
<location line="+1"/>
<source>Show splash screen on startup (default: 1)</source>
- <translation type="unfinished"/>
+ <translation>시작시 시작 화면 표시 (기본값: 1)</translation>
</message>
<message>
<location line="+1"/>
@@ -841,17 +1153,17 @@ Address: %4
</message>
<message>
<location line="+9"/>
- <source>Welcome to Bitcoin-Qt.</source>
+ <source>Welcome to Bitcoin Core.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+26"/>
- <source>As this is the first time the program is launched, you can choose where Bitcoin-Qt will store its data.</source>
+ <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+10"/>
- <source>Bitcoin-Qt will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
+ <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -865,11 +1177,21 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../intro.cpp" line="+105"/>
- <source>Error</source>
+ <location filename="../intro.cpp" line="+85"/>
+ <source>Bitcoin</source>
+ <translation>비트코ì¸</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error: Specified data directory &quot;%1&quot; can not be created.</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="+19"/>
+ <source>Error</source>
+ <translation>오류</translation>
+ </message>
+ <message>
<location line="+9"/>
<source>GB of free space available</source>
<translation type="unfinished"/>
@@ -881,6 +1203,34 @@ Address: %4
</message>
</context>
<context>
+ <name>OpenURIDialog</name>
+ <message>
+ <location filename="../forms/openuridialog.ui" line="+14"/>
+ <source>Open URI</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Open payment request from URI or file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>URI:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Select payment request file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../openuridialog.cpp" line="+47"/>
+ <source>Select payment request file to open</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OptionsDialog</name>
<message>
<location filename="../forms/optionsdialog.ui" line="+14"/>
@@ -888,9 +1238,9 @@ Address: %4
<translation>ì„ íƒë“¤</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+13"/>
<source>&amp;Main</source>
- <translation type="unfinished"/>
+ <translation>ë©”ì¸(&amp;M)</translation>
</message>
<message>
<location line="+6"/>
@@ -900,194 +1250,228 @@ Address: %4
<message>
<location line="+15"/>
<source>Pay transaction &amp;fee</source>
- <translation type="unfinished"/>
+ <translation>송금 수수료(&amp;F)</translation>
</message>
<message>
<location line="+31"/>
<source>Automatically start Bitcoin after logging in to the system.</source>
- <translation type="unfinished"/>
+ <translation>시스템 로그ì¸í›„ì— ë¹„íŠ¸ì½”ì¸ì„ ìžë™ìœ¼ë¡œ 시작합니다.</translation>
</message>
<message>
<location line="+3"/>
<source>&amp;Start Bitcoin on system login</source>
+ <translation>시스템 로그ì¸ì‹œ ë¹„íŠ¸ì½”ì¸ ì‹œìž‘(&amp;S)</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Size of &amp;database cache</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+35"/>
- <source>Reset all client options to default.</source>
+ <location line="+13"/>
+ <source>Set database cache size in megabytes (default: 25)</source>
+ <translation>ë°ì´í„°ë² ì´ìŠ¤ ìºì‹œ í¬ê¸°ë¥¼ 메가바ì´íŠ¸ë¡œ 지정(ë‚´ì •ê°’:25)</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>MB</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>&amp;Reset Options</source>
+ <location line="+27"/>
+ <source>Number of script &amp;verification threads</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+13"/>
- <source>&amp;Network</source>
+ <source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</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>
+ <location line="+58"/>
+ <source>Connect to the Bitcoin network through a SOCKS proxy.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
- <source>Map port using &amp;UPnP</source>
+ <source>&amp;Connect through SOCKS proxy (default proxy):</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>
+ <location line="+34"/>
+ <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>&amp;Connect through SOCKS proxy:</source>
+ <location line="+224"/>
+ <source>Active command-line options that override above options:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+9"/>
- <source>Proxy &amp;IP:</source>
- <translation type="unfinished"/>
+ <location line="+43"/>
+ <source>Reset all client options to default.</source>
+ <translation>모든 í´ë¼ì´ì–¸íŠ¸ ì˜µì…˜ì„ ê¸°ë³¸ê°’ìœ¼ë¡œ 재설정</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Reset Options</source>
+ <translation>옵션 재설정(&amp;R)</translation>
+ </message>
+ <message>
+ <location line="-323"/>
+ <source>&amp;Network</source>
+ <translation>네트워í¬(&amp;N)</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>ë¼ìš°í„°ì˜ ë¹„íŠ¸ì½”ì¸ í´ë¼ì´ì–¸íŠ¸ í¬íŠ¸ë¥¼ ìžë™ìœ¼ë¡œ 엽니다. ë¼ìš°í„°ì—ì„œ UPnP를 지ì›í•˜ê³  활성화 í–ˆì„ ê²½ìš°ì—만 ë™ìž‘합니다.</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Map port using &amp;UPnP</source>
+ <translation>ì‚¬ìš©ì¤‘ì¸ UPnP í¬íŠ¸ 매핑(&amp;U)</translation>
</message>
<message>
<location line="+19"/>
- <source>IP address of the proxy (e.g. 127.0.0.1)</source>
- <translation type="unfinished"/>
+ <source>Proxy &amp;IP:</source>
+ <translation>프ë¡ì‹œ IP(&amp;I):</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+32"/>
<source>&amp;Port:</source>
- <translation type="unfinished"/>
+ <translation>í¬íŠ¸(&amp;P):</translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+25"/>
<source>Port of the proxy (e.g. 9050)</source>
- <translation type="unfinished"/>
+ <translation>프ë¡ì‹œì˜ í¬íŠ¸ë²ˆí˜¸ìž…니다(예: 9050)</translation>
</message>
<message>
<location line="+7"/>
<source>SOCKS &amp;Version:</source>
- <translation type="unfinished"/>
+ <translation>SOCKS 버전(&amp;V):</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;W)</translation>
</message>
<message>
<location line="+6"/>
<source>Show only a tray icon after minimizing the window.</source>
- <translation type="unfinished"/>
+ <translation>ì°½ì„ ìµœì†Œí™” 하면 트레ì´ì— ì•„ì´ì½˜ë§Œ 표시합니다.</translation>
</message>
<message>
<location line="+3"/>
<source>&amp;Minimize to the tray instead of the taskbar</source>
- <translation type="unfinished"/>
+ <translation>ìž‘ì—… 표시줄 대신 트레ì´ë¡œ 최소화(&amp;M)</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>ì°½ì„ ë‹«ìœ¼ë©´ 프로그램ì—ì„œ 나가지 ì•Šê³  최소화합니다. ì´ ì˜µì…˜ì„ í™œì„±í™”í•˜ë©´, í”„ë¡œê·¸ëž¨ì€ ë©”ë‰´ì—ì„œ 나가기를 ì„ íƒí•œ 후ì—만 닫힙니다.</translation>
</message>
<message>
<location line="+3"/>
<source>M&amp;inimize on close</source>
- <translation type="unfinished"/>
+ <translation>ë‹«ì„ë•Œ 최소화(&amp;I)</translation>
</message>
<message>
<location line="+21"/>
<source>&amp;Display</source>
- <translation type="unfinished"/>
+ <translation>표시(&amp;D)</translation>
</message>
<message>
<location line="+8"/>
<source>User Interface &amp;language:</source>
- <translation type="unfinished"/>
+ <translation>ì‚¬ìš©ìž ì¸í„°íŽ˜ì´ìŠ¤ 언어(&amp;L):</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>ì‚¬ìš©ìž ì¸í„°íŽ˜ì´ìŠ¤ 언어를 여기서 설정할 수 있습니다. ì´ ì„¤ì •ì€ ë¹„íŠ¸ì½”ì¸ì„ 다시 시작할때 ì ìš©ë©ë‹ˆë‹¤.</translation>
</message>
<message>
<location line="+11"/>
<source>&amp;Unit to show amounts in:</source>
- <translation type="unfinished"/>
+ <translation>ê±°ëž˜ì•¡ì„ í‘œì‹œí•  단위(&amp;U):</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>ì¸í„°íŽ˜ì´ìŠ¤ì— 표시하고 ì½”ì¸ì„ 보낼때 사용할 기본 최소화 단위를 ì„ íƒí•˜ì‹­ì‹œì˜¤.</translation>
</message>
<message>
<location line="+9"/>
<source>Whether to show Bitcoin addresses in the transaction list or not.</source>
- <translation type="unfinished"/>
+ <translation>송금 목ë¡ì— ë¹„íŠ¸ì½”ì¸ ì£¼ì†Œë¥¼ í‘œì‹œí• ì§€ì˜ ì—¬ë¶€ìž…ë‹ˆë‹¤.</translation>
</message>
<message>
<location line="+3"/>
<source>&amp;Display addresses in transaction list</source>
+ <translation>송금 목ë¡ì— 주소 표시(&amp;D)</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Whether to show coin control features or not.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+71"/>
- <source>&amp;OK</source>
+ <location line="+3"/>
+ <source>Display coin &amp;control features (experts only)</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="+136"/>
+ <source>&amp;OK</source>
+ <translation>확ì¸(&amp;O)</translation>
+ </message>
+ <message>
<location line="+7"/>
<source>&amp;Cancel</source>
- <translation type="unfinished"/>
+ <translation>취소(&amp;C)</translation>
</message>
<message>
- <location line="+10"/>
- <source>&amp;Apply</source>
- <translation type="unfinished"/>
+ <location filename="../optionsdialog.cpp" line="+67"/>
+ <source>default</source>
+ <translation>기본값</translation>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+58"/>
- <source>default</source>
+ <location line="+57"/>
+ <source>none</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+130"/>
+ <location line="+75"/>
<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>
+ <location line="+29"/>
+ <source>Client restart required to activate changes.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
- <location line="+9"/>
- <source>Warning</source>
+ <location line="-29"/>
+ <source>Client will be shutdown, do you want to proceed?</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-9"/>
- <location line="+9"/>
- <source>This setting will take effect after restarting Bitcoin.</source>
+ <location line="+33"/>
+ <source>This change would require a client restart.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+29"/>
+ <location line="+34"/>
<source>The supplied proxy address is invalid.</source>
- <translation type="unfinished"/>
+ <translation>지정한 프ë¡ì‹œ 주소가 잘못ë˜ì—ˆìŠµë‹ˆë‹¤.</translation>
</message>
</context>
<context>
@@ -1099,22 +1483,22 @@ Address: %4
</message>
<message>
<location line="+50"/>
- <location line="+202"/>
+ <location line="+231"/>
<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>표시한 ì •ë³´ê°€ ì˜¤ëž˜ëœ ê²ƒ 같습니다. ë¹„íŠ¸ì½”ì¸ ë„¤íŠ¸ì›Œí¬ì— 연결하고 ë‚œ 다ìŒì— ì§€ê°‘ì„ ìžë™ìœ¼ë¡œ ë™ê¸°í™” 하지만, ì•„ì§ ê³¼ì •ì´ ë나지는 않았습니다.</translation>
</message>
<message>
- <location line="-131"/>
+ <location line="-155"/>
<source>Unconfirmed:</source>
<translation>미확ì¸:</translation>
</message>
<message>
- <location line="-78"/>
+ <location line="-83"/>
<source>Wallet</source>
<translation>지갑</translation>
</message>
<message>
- <location line="+49"/>
+ <location line="+51"/>
<source>Confirmed:</source>
<translation type="unfinished"/>
</message>
@@ -1124,12 +1508,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+29"/>
+ <location line="+32"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+16"/>
<source>Immature:</source>
<translation type="unfinished"/>
</message>
@@ -1139,7 +1523,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+16"/>
<source>Total:</source>
<translation type="unfinished"/>
</message>
@@ -1149,21 +1533,22 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+53"/>
+ <location line="+71"/>
<source>&lt;b&gt;Recent transactions&lt;/b&gt;</source>
<translation>&lt;b&gt;최근 거래내역&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../overviewpage.cpp" line="+116"/>
+ <location filename="../overviewpage.cpp" line="+120"/>
<location line="+1"/>
<source>out of sync</source>
- <translation type="unfinished"/>
+ <translation>오래ë¨</translation>
</message>
</context>
<context>
<name>PaymentServer</name>
<message>
- <location filename="../paymentserver.cpp" line="+392"/>
+ <location filename="../paymentserver.cpp" line="+403"/>
+ <location line="+13"/>
<source>URI handling</source>
<translation type="unfinished"/>
</message>
@@ -1173,45 +1558,82 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+69"/>
+ <location line="+96"/>
<source>Requested payment amount of %1 is too small (considered dust).</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
- <location line="+37"/>
+ <location line="-221"/>
+ <location line="+212"/>
+ <location line="+13"/>
+ <location line="+95"/>
+ <location line="+18"/>
+ <location line="+16"/>
<source>Payment request error</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="-353"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Net manager warning</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+1"/>
- <source>Insecure requests to custom payment scripts unsupported</source>
+ <source>Your active proxy doesn&apos;t support SOCKS5, which is required for payment requests via proxy.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+38"/>
+ <location line="+52"/>
+ <source>Payment request fetch URL is invalid: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Payment request file handling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Payment request file can not be read or processed! This can be caused by an invalid payment request file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+73"/>
+ <source>Unverified payment requests to custom payment scripts are unsupported.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+59"/>
<source>Refund from %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
+ <location line="+43"/>
<source>Error communicating with %1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+24"/>
+ <source>Payment request can not be parsed or processed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
<source>Bad response from server %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+32"/>
+ <location line="+33"/>
<source>Payment acknowledged</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-58"/>
- <location line="+30"/>
- <location line="+17"/>
+ <location line="-11"/>
<source>Network request error</source>
<translation type="unfinished"/>
</message>
@@ -1219,39 +1641,33 @@ Address: %4
<context>
<name>QObject</name>
<message>
- <location filename="../bitcoin.cpp" line="+114"/>
- <location line="+5"/>
- <location filename="../intro.cpp" line="-32"/>
+ <location filename="../bitcoin.cpp" line="+71"/>
+ <location line="+11"/>
<source>Bitcoin</source>
- <translation type="unfinished"/>
+ <translation>비트코ì¸</translation>
</message>
<message>
- <location line="-4"/>
+ <location line="+1"/>
<source>Error: Specified data directory &quot;%1&quot; does not exist.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="-12"/>
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../intro.cpp" line="+1"/>
- <source>Error: Specified data directory &quot;%1&quot; can not be created.</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>QRImageWidget</name>
<message>
- <location filename="../receiverequestdialog.cpp" line="+32"/>
+ <location filename="../receiverequestdialog.cpp" line="+36"/>
<source>&amp;Save Image...</source>
- <translation type="unfinished"/>
+ <translation>ì´ë¯¸ì§€ 저장(&amp;S)...</translation>
</message>
<message>
<location line="+3"/>
<source>&amp;Copy Image</source>
- <translation type="unfinished"/>
+ <translation>ì´ë¯¸ì§€ 복사(&amp;C)</translation>
</message>
<message>
<location line="+28"/>
@@ -1260,8 +1676,8 @@ Address: %4
</message>
<message>
<location line="+0"/>
- <source>PNG Images (*.png)</source>
- <translation>PNG ì˜ìƒë“¤(*.png)</translation>
+ <source>PNG Image (*.png)</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1278,32 +1694,43 @@ Address: %4
<location line="+23"/>
<location line="+23"/>
<location line="+36"/>
- <location line="+53"/>
+ <location line="+23"/>
+ <location line="+36"/>
<location line="+23"/>
<location line="+23"/>
- <location filename="../rpcconsole.cpp" line="+352"/>
+ <location filename="../rpcconsole.cpp" line="+359"/>
<source>N/A</source>
<translation>ì—†ìŒ</translation>
</message>
<message>
- <location line="-217"/>
+ <location line="-223"/>
<source>Client version</source>
<translation>í´ë¼ì´ì–¸íŠ¸ 버전</translation>
</message>
<message>
<location line="-45"/>
<source>&amp;Information</source>
+ <translation>ì •ë³´(&amp;I)</translation>
+ </message>
+ <message>
+ <location line="-10"/>
+ <source>Debug window</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+25"/>
+ <source>General</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+68"/>
+ <location line="+53"/>
<source>Using OpenSSL version</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+49"/>
<source>Startup time</source>
- <translation type="unfinished"/>
+ <translation>시작 시간</translation>
</message>
<message>
<location line="+29"/>
@@ -1312,16 +1739,16 @@ Address: %4
</message>
<message>
<location line="+7"/>
- <source>Number of connections</source>
- <translation>연결 수</translation>
+ <source>Name</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+23"/>
- <source>On testnet</source>
- <translation type="unfinished"/>
+ <source>Number of connections</source>
+ <translation>연결 수</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+29"/>
<source>Block chain</source>
<translation>블럭 ì²´ì¸</translation>
</message>
@@ -1343,27 +1770,12 @@ Address: %4
<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"/>
+ <translation>열기(&amp;O)</translation>
</message>
<message>
<location line="+24"/>
<source>&amp;Console</source>
- <translation type="unfinished"/>
+ <translation>콘솔(&amp;C)</translation>
</message>
<message>
<location line="+72"/>
@@ -1391,24 +1803,14 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-541"/>
+ <location line="-521"/>
<source>Build date</source>
<translation>빌드 날짜</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"/>
+ <location line="+206"/>
<source>Debug log file</source>
- <translation type="unfinished"/>
+ <translation>로그 íŒŒì¼ ë””ë²„ê·¸</translation>
</message>
<message>
<location line="+7"/>
@@ -1416,27 +1818,27 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+102"/>
+ <location line="+76"/>
<source>Clear console</source>
<translation>콘솔 초기화</translation>
</message>
<message>
<location filename="../rpcconsole.cpp" line="-30"/>
<source>Welcome to the Bitcoin RPC console.</source>
- <translation type="unfinished"/>
+ <translation>ë¹„íŠ¸ì½”ì¸ 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>
<message>
- <location line="+128"/>
+ <location line="+122"/>
<source>%1 B</source>
<translation type="unfinished"/>
</message>
@@ -1474,63 +1876,88 @@ Address: %4
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+22"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
<source>&amp;Amount:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
- <source>The amount to request</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+7"/>
+ <location line="-13"/>
<source>&amp;Label:</source>
<translation>표:</translation>
</message>
<message>
- <location line="+10"/>
- <source>The label to associate with the receiving address</source>
+ <location line="-34"/>
+ <source>&amp;Message:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>&amp;Message:</source>
+ <location line="-17"/>
+ <source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>The message to attach to payment request</source>
+ <location line="+3"/>
+ <source>R&amp;euse an existing receiving address (not recommended)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
- <source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
+ <location line="+27"/>
+ <source>An optional label to associate with the new receiving address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>R&amp;euse an existing receiving address (not recommended)</source>
+ <location line="+7"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+7"/>
- <source>Use this form to request payments. All fields are optional.</source>
+ <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+39"/>
+ <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+17"/>
<source>Clear all fields of the form.</source>
- <translation type="unfinished"/>
+ <translation>ì–‘ì‹ì˜ 모든 필드를 지ì›ë‹ˆë‹¤</translation>
</message>
<message>
<location line="+3"/>
<source>Clear</source>
- <translation type="unfinished"/>
+ <translation>지우기</translation>
</message>
<message>
<location line="+36"/>
<source>&amp;Request payment</source>
+ <translation>지불 요청(&amp;R)</translation>
+ </message>
+ <message>
+ <location line="+47"/>
+ <source>Requested payments</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Show the selected request (does the same as double clicking an entry)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Show</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Remove the selected entries from the list</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Remove</source>
<translation type="unfinished"/>
</message>
</context>
@@ -1539,42 +1966,37 @@ Address: %4
<message>
<location filename="../forms/receiverequestdialog.ui" line="+29"/>
<source>QR Code</source>
- <translation type="unfinished"/>
+ <translation>QR 코드</translation>
</message>
<message>
<location line="+46"/>
<source>Copy &amp;URI</source>
- <translation type="unfinished"/>
+ <translation>URI 복사(&amp;U)</translation>
</message>
<message>
<location line="+7"/>
<source>Copy &amp;Address</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+7"/>
- <source>&amp;Copy Image</source>
- <translation type="unfinished"/>
+ <translation>주소 복사(&amp;A)</translation>
</message>
<message>
<location line="+7"/>
<source>&amp;Save Image...</source>
- <translation type="unfinished"/>
+ <translation>ì´ë¯¸ì§€ 저장(&amp;S)...</translation>
</message>
<message>
- <location filename="../receiverequestdialog.cpp" line="+58"/>
+ <location filename="../receiverequestdialog.cpp" line="+56"/>
<source>Request payment to %1</source>
- <translation type="unfinished"/>
+ <translation>%1ì— ì§€ë¶ˆì„ ìš”ì²­í–ˆìŠµë‹ˆë‹¤</translation>
</message>
<message>
<location line="+6"/>
<source>Payment information</source>
- <translation type="unfinished"/>
+ <translation>지불 정보</translation>
</message>
<message>
<location line="+1"/>
<source>URI</source>
- <translation type="unfinished"/>
+ <translation>URI</translation>
</message>
<message>
<location line="+2"/>
@@ -1594,7 +2016,7 @@ Address: %4
<message>
<location line="+2"/>
<source>Message</source>
- <translation type="unfinished"/>
+ <translation>메시지</translation>
</message>
<message>
<location line="+10"/>
@@ -1608,16 +2030,119 @@ Address: %4
</message>
</context>
<context>
+ <name>RecentRequestsTableModel</name>
+ <message>
+ <location filename="../recentrequeststablemodel.cpp" line="+24"/>
+ <source>Date</source>
+ <translation>날짜</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Label</source>
+ <translation>표</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Message</source>
+ <translation>메시지</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Amount</source>
+ <translation>거래량</translation>
+ </message>
+ <message>
+ <location line="+38"/>
+ <source>(no label)</source>
+ <translation>(표 없슴)</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>(no message)</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+140"/>
- <location line="+213"/>
+ <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location line="+80"/>
<source>Send Coins</source>
<translation>ì½”ì¸ë“¤ 보내기</translation>
</message>
<message>
- <location line="+50"/>
+ <location line="+76"/>
+ <source>Coin Control Features</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Inputs...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>automatically selected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Insufficient funds!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+89"/>
+ <source>Quantity:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+35"/>
+ <source>Bytes:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Amount:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Priority:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Low Output:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>After Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Change:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+44"/>
+ <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Custom change address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+115"/>
<source>Send to multiple recipients at once</source>
<translation>ë‹¤ìˆ˜ì˜ ìˆ˜ë ¹ì¸ë“¤ì—게 í•œë²ˆì— ë³´ë‚´ê¸°</translation>
</message>
@@ -1629,12 +2154,12 @@ Address: %4
<message>
<location line="+20"/>
<source>Clear all fields of the form.</source>
- <translation type="unfinished"/>
+ <translation>ì–‘ì‹ì˜ 모든 필드를 지ì›ë‹ˆë‹¤</translation>
</message>
<message>
<location line="+3"/>
<source>Clear &amp;All</source>
- <translation type="unfinished"/>
+ <translation>ëª¨ë‘ ì§€ìš°ê¸°(&amp;A)</translation>
</message>
<message>
<location line="+22"/>
@@ -1642,84 +2167,145 @@ Address: %4
<translation>잔액:</translation>
</message>
<message>
- <location line="+10"/>
- <source>123.456 BTC</source>
- <translation>123.456 BTC</translation>
- </message>
- <message>
- <location line="+31"/>
+ <location line="+41"/>
<source>Confirm the send action</source>
<translation>보내는 행위 확ì¸</translation>
</message>
<message>
<location line="+3"/>
<source>S&amp;end</source>
- <translation type="unfinished"/>
+ <translation>보내기(&amp;E)</translation>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-154"/>
+ <location filename="../sendcoinsdialog.cpp" line="-228"/>
<source>Confirm send coins</source>
<translation>ì½”ì¸ ì „ì†¡ì„ í™•ì¸</translation>
</message>
<message>
- <location line="-90"/>
+ <location line="-74"/>
<location line="+5"/>
<location line="+5"/>
+ <location line="+4"/>
<source>%1 to %2</source>
+ <translation>%1ì„(를) %2(으)ë¡œ</translation>
+ </message>
+ <message>
+ <location line="-136"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation>ë¹„íŠ¸ì½”ì¸ ì£¼ì†Œë¥¼ 입력하기 (예 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Copy quantity</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+26"/>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation>거래액 복사</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy after fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy bytes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy low output</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy change</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+170"/>
+ <source>Total Amount %1 (= %2)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>or</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+202"/>
<source>The recipient address is not valid, please recheck.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The amount to pay must be larger than 0.</source>
<translation>지불하는 ê¸ˆì•¡ì€ 0 보다 커야 합니다.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The amount exceeds your balance.</source>
<translation>잔고를 초과하였습니다.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The total exceeds your balance when the %1 transaction fee is included.</source>
<translation>%1 ì˜ ê±°ëž˜ìˆ˜ìˆ˜ë£Œë¥¼ í¬í•¨í•˜ë©´ 잔고를 초과합니다.</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+3"/>
<source>Duplicate address found, can only send to each address once per send operation.</source>
<translation>ë‘ê°œ ì´ìƒì˜ 주소입니다. í•œë²ˆì— í•˜ë‚˜ì˜ ì£¼ì†Œì—만 ìž‘ì—…í•  수 있습니다.</translation>
</message>
<message>
+ <location line="+3"/>
+ <source>Transaction creation failed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+4"/>
- <source>Error: Transaction creation failed!</source>
+ <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+15"/>
- <source>Are you sure you want to send?</source>
+ <location line="+112"/>
+ <source>Warning: Invalid Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+9"/>
- <source>added as transaction fee</source>
+ <location line="+21"/>
+ <source>(no label)</source>
+ <translation>(표 없슴)</translation>
+ </message>
+ <message>
+ <location line="-11"/>
+ <source>Warning: Unknown change address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
- <source>Total Amount %1</source>
+ <location line="-366"/>
+ <source>Are you sure you want to send?</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+20"/>
- <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>
+ <location line="+9"/>
+ <source>added as transaction fee</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+144"/>
+ <location line="+170"/>
<source>Payment request expired</source>
<translation type="unfinished"/>
</message>
@@ -1732,39 +2318,44 @@ Address: %4
<context>
<name>SendCoinsEntry</name>
<message>
- <location filename="../forms/sendcoinsentry.ui" line="+33"/>
- <location line="+585"/>
+ <location filename="../forms/sendcoinsentry.ui" line="+131"/>
+ <location line="+521"/>
+ <location line="+536"/>
<source>A&amp;mount:</source>
<translation>금액:</translation>
</message>
<message>
- <location line="-572"/>
- <location line="+585"/>
+ <location line="-1152"/>
<source>Pay &amp;To:</source>
<translation>지급&amp;수신:</translation>
</message>
<message>
- <location line="-551"/>
+ <location line="+18"/>
<source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../sendcoinsentry.cpp" line="+28"/>
+ <location filename="../sendcoinsentry.cpp" line="+30"/>
<source>Enter a label for this address to add it to your address book</source>
<translation>ë‹¹ì‹ ì˜ ì£¼ì†Œë¡ì— ì´ ì£¼ì†Œë¥¼ 추가하기 위하여 표를 입역하세요 </translation>
</message>
<message>
- <location filename="../forms/sendcoinsentry.ui" line="-18"/>
+ <location filename="../forms/sendcoinsentry.ui" line="+57"/>
<source>&amp;Label:</source>
<translation>표:</translation>
</message>
<message>
- <location line="+28"/>
+ <location line="-50"/>
<source>Choose previously used address</source>
+ <translation>ì´ì „ì— ì‚¬ìš©í•œ 주소를 ì„ íƒí•˜ì‹­ì‹œì˜¤</translation>
+ </message>
+ <message>
+ <location line="-40"/>
+ <source>This is a normal payment.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
+ <location line="+50"/>
<source>Alt+A</source>
<translation>Alt+A</translation>
</message>
@@ -1780,16 +2371,45 @@ Address: %4
</message>
<message>
<location line="+7"/>
- <source>Remove this recipient</source>
- <translation>ì´ ìˆ˜ì‹ ìž ì œê±° 하기</translation>
+ <location line="+524"/>
+ <location line="+536"/>
+ <source>Remove this entry</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="-1008"/>
+ <source>Message:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+958"/>
+ <source>This is a verified payment request.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-991"/>
<source>Enter a label for this address to add it to the list of used addresses</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+465"/>
+ <location line="+459"/>
+ <source>This is an unverified payment request.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+18"/>
+ <location line="+532"/>
+ <source>Pay To:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-498"/>
+ <location line="+536"/>
<source>Memo:</source>
<translation type="unfinished"/>
</message>
@@ -1800,6 +2420,19 @@ Address: %4
</message>
</context>
<context>
+ <name>ShutdownWindow</name>
+ <message>
+ <location filename="../utilitydialog.cpp" line="+48"/>
+ <source>Bitcoin Core is shutting down...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Do not shut down the computer until this window disappears.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>SignVerifyMessageDialog</name>
<message>
<location filename="../forms/signverifymessagedialog.ui" line="+14"/>
@@ -1807,25 +2440,25 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+10"/>
<source>&amp;Sign Message</source>
- <translation type="unfinished"/>
+ <translation>메시지 서명(&amp;S)</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>여러분 ìžì‹ ì„ ì¦ëª…하기 위해 주소를 첨가하고 섬여할 수 있습니다. 피싱 공격으로 ë§ë¯¸ì•”ì•„ ì—¬ëŸ¬ë¶„ì˜ ì„œëª…ì„ í†µí•´ ì†ì•„ 넘어가게 í•  수 있으므로, 서명하지 ì•Šì€ ì–´ë–¤ 모호한 요소든 주ì˜í•˜ì‹­ì‹œì˜¤. ë™ì˜í•˜ëŠ” 완전 무결한 ì¡°í•­ì—만 서명하십시오.</translation>
</message>
<message>
<location line="+18"/>
<source>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation type="unfinished"/>
+ <translation>메시지를 서명할 주소 (예: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
<location line="+10"/>
<location line="+213"/>
<source>Choose previously used address</source>
- <translation type="unfinished"/>
+ <translation>ì´ì „ì— ì‚¬ìš©í•œ 주소를 ì„ íƒí•˜ì‹­ì‹œì˜¤</translation>
</message>
<message>
<location line="-203"/>
@@ -1846,7 +2479,7 @@ Address: %4
<message>
<location line="+12"/>
<source>Enter the message you want to sign here</source>
- <translation type="unfinished"/>
+ <translation>ì—¬ê¸°ì— ì„œëª…í•˜ë ¤ëŠ” 메시지를 입력하십시오</translation>
</message>
<message>
<location line="+7"/>
@@ -1856,33 +2489,33 @@ Address: %4
<message>
<location line="+27"/>
<source>Copy the current signature to the system clipboard</source>
- <translation type="unfinished"/>
+ <translation>현재 ì„œëª…ì„ ì‹œìŠ¤í…œ í´ë¦½ë³´ë“œì— 복사</translation>
</message>
<message>
<location line="+21"/>
<source>Sign the message to prove you own this Bitcoin address</source>
- <translation type="unfinished"/>
+ <translation>ì—¬ëŸ¬ë¶„ì˜ ë¹„íŠ¸ì½”ì¸ ì£¼ì†Œë¥¼ ì¦ëª…하려면 메시지 서명하십시오</translation>
</message>
<message>
<location line="+3"/>
<source>Sign &amp;Message</source>
- <translation type="unfinished"/>
+ <translation>ë©”ì‹œì§€ì— ì„œëª…(&amp;M)</translation>
</message>
<message>
<location line="+14"/>
<source>Reset all sign message fields</source>
- <translation type="unfinished"/>
+ <translation>메시지 í•„ë“œì˜ ëª¨ë“  서명 재설정</translation>
</message>
<message>
<location line="+3"/>
<location line="+146"/>
<source>Clear &amp;All</source>
- <translation type="unfinished"/>
+ <translation>ëª¨ë‘ ì§€ìš°ê¸°(&amp;A)</translation>
</message>
<message>
<location line="-87"/>
<source>&amp;Verify Message</source>
- <translation type="unfinished"/>
+ <translation>메시지 ê²€ì¦(&amp;V)</translation>
</message>
<message>
<location line="+6"/>
@@ -1892,7 +2525,7 @@ Address: %4
<message>
<location line="+21"/>
<source>The address the message was signed with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation type="unfinished"/>
+ <translation>서명한 ë©”ì‹œì§€ì˜ ì£¼ì†Œìž…ë‹ˆë‹¤ (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
<location line="+40"/>
@@ -1902,15 +2535,15 @@ Address: %4
<message>
<location line="+3"/>
<source>Verify &amp;Message</source>
- <translation type="unfinished"/>
+ <translation>메시지 ê²€ì¦(&amp;M)</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"/>
+ <location filename="../signverifymessagedialog.cpp" line="+29"/>
<location line="+3"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>ë¹„íŠ¸ì½”ì¸ ì£¼ì†Œë¥¼ 입력하기 (예 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
@@ -1918,18 +2551,18 @@ Address: %4
<message>
<location line="-2"/>
<source>Click &quot;Sign Message&quot; to generate signature</source>
- <translation type="unfinished"/>
+ <translation>ì„œëª…ì„ ë§Œë“¤ë ¤ë©´ &quot;메시지 서명&quot;ì„ ëˆ„ë¥´ì‹­ì‹œì˜¤</translation>
</message>
<message>
<location line="+3"/>
<source>Enter Bitcoin signature</source>
- <translation type="unfinished"/>
+ <translation>ë¹„íŠ¸ì½”ì¸ ì„œëª…ì„ ìž…ë ¥í•˜ì‹­ì‹œì˜¤</translation>
</message>
<message>
- <location line="+85"/>
+ <location line="+84"/>
<location line="+81"/>
<source>The entered address is invalid.</source>
- <translation type="unfinished"/>
+ <translation>입력한 주소가 잘못ë˜ì—ˆìŠµë‹ˆë‹¤.</translation>
</message>
<message>
<location line="-81"/>
@@ -1937,66 +2570,71 @@ Address: %4
<location line="+73"/>
<location line="+8"/>
<source>Please check the address and try again.</source>
- <translation type="unfinished"/>
+ <translation>주소를 확ì¸í•˜ê³  다시 ì‹œë„하십시오.</translation>
</message>
<message>
<location line="-81"/>
<location line="+81"/>
<source>The entered address does not refer to a key.</source>
- <translation type="unfinished"/>
+ <translation>입력한 주소는 키ì—ì„œ 참조하지 않습니다.</translation>
</message>
<message>
<location line="-73"/>
<source>Wallet unlock was cancelled.</source>
- <translation type="unfinished"/>
+ <translation>지갑 잠금 해제를 취소했습니다.</translation>
</message>
<message>
<location line="+8"/>
<source>Private key for the entered address is not available.</source>
- <translation type="unfinished"/>
+ <translation>입력한 ì£¼ì†Œì— ëŒ€í•œ ê°œì¸í‚¤ê°€ 없습니다.</translation>
</message>
<message>
<location line="+12"/>
<source>Message signing failed.</source>
- <translation type="unfinished"/>
+ <translation>메시지 ì„œëª…ì— ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤.</translation>
</message>
<message>
<location line="+5"/>
<source>Message signed.</source>
- <translation type="unfinished"/>
+ <translation>메시지를 서명했습니다.</translation>
</message>
<message>
<location line="+59"/>
<source>The signature could not be decoded.</source>
- <translation type="unfinished"/>
+ <translation>ì„œëª…ì„ í•´ë…í•  수 없습니다.</translation>
</message>
<message>
<location line="+0"/>
<location line="+13"/>
<source>Please check the signature and try again.</source>
- <translation type="unfinished"/>
+ <translation>ì„œëª…ì„ í™•ì¸í•˜ê³  다시 ì‹œë„하십시오.</translation>
</message>
<message>
<location line="+0"/>
<source>The signature did not match the message digest.</source>
- <translation type="unfinished"/>
+ <translation>메시지 다ì´ì œìŠ¤íŠ¸ì™€ ì„œëª…ì´ ì¼ì¹˜í•˜ì§€ 않습니다.</translation>
</message>
<message>
<location line="+7"/>
<source>Message verification failed.</source>
- <translation type="unfinished"/>
+ <translation>메시지 ê²€ì¦ì— 실패했습니다.</translation>
</message>
<message>
<location line="+5"/>
<source>Message verified.</source>
- <translation type="unfinished"/>
+ <translation>메시지를 ê²€ì¦í–ˆìŠµë‹ˆë‹¤.</translation>
</message>
</context>
<context>
<name>SplashScreen</name>
<message>
- <location filename="../splashscreen.cpp" line="+23"/>
- <source>The Bitcoin developers</source>
+ <location filename="../splashscreen.cpp" line="+28"/>
+ <source>Bitcoin Core</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
<message>
@@ -2008,15 +2646,15 @@ Address: %4
<context>
<name>TrafficGraphWidget</name>
<message>
- <location filename="../trafficgraphwidget.cpp" line="+75"/>
+ <location filename="../trafficgraphwidget.cpp" line="+79"/>
<source>KB/s</source>
- <translation type="unfinished"/>
+ <translation>KB/s</translation>
</message>
</context>
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="+22"/>
+ <location filename="../transactiondesc.cpp" line="+28"/>
<source>Open until %1</source>
<translation>%1 까지 열림</translation>
</message>
@@ -2038,7 +2676,7 @@ Address: %4
<message>
<location line="+18"/>
<source>Status</source>
- <translation type="unfinished"/>
+ <translation>ìƒíƒœ</translation>
</message>
<message numerus="yes">
<location line="+7"/>
@@ -2089,12 +2727,12 @@ Address: %4
<location line="+12"/>
<location line="+45"/>
<location line="+17"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Credit</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="-120"/>
+ <location line="-125"/>
<source>matures in %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
@@ -2107,37 +2745,38 @@ Address: %4
<location line="+44"/>
<location line="+8"/>
<location line="+15"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Debit</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-57"/>
+ <location line="-62"/>
<source>Transaction fee</source>
- <translation type="unfinished"/>
+ <translation>송금 수수료</translation>
</message>
<message>
<location line="+16"/>
<source>Net amount</source>
- <translation type="unfinished"/>
+ <translation>ì´ì•¡</translation>
</message>
<message>
<location line="+6"/>
+ <location line="+9"/>
<source>Message</source>
- <translation type="unfinished"/>
+ <translation>메시지</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="-7"/>
<source>Comment</source>
- <translation type="unfinished"/>
+ <translation>설명</translation>
</message>
<message>
<location line="+2"/>
<source>Transaction ID</source>
- <translation type="unfinished"/>
+ <translation>송금 ID</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+18"/>
<source>Merchant</source>
<translation type="unfinished"/>
</message>
@@ -2149,17 +2788,17 @@ Address: %4
<message>
<location line="+8"/>
<source>Debug information</source>
- <translation type="unfinished"/>
+ <translation>디버깅 정보</translation>
</message>
<message>
<location line="+8"/>
<source>Transaction</source>
- <translation type="unfinished"/>
+ <translation>송금</translation>
</message>
<message>
<location line="+3"/>
<source>Inputs</source>
- <translation type="unfinished"/>
+ <translation>ìž…ë ¥</translation>
</message>
<message>
<location line="+23"/>
@@ -2169,15 +2808,15 @@ Address: %4
<message>
<location line="+1"/>
<source>true</source>
- <translation type="unfinished"/>
+ <translation>ì°¸</translation>
</message>
<message>
<location line="+0"/>
<source>false</source>
- <translation type="unfinished"/>
+ <translation>거짓</translation>
</message>
<message>
- <location line="-227"/>
+ <location line="-232"/>
<source>, has not been successfully broadcast yet</source>
<translation>. ì•„ì§ ì„±ê³µì ìœ¼ë¡œ 통보하지 ì•ŠìŒ</translation>
</message>
@@ -2208,7 +2847,7 @@ Address: %4
<context>
<name>TransactionTableModel</name>
<message>
- <location filename="../transactiontablemodel.cpp" line="+227"/>
+ <location filename="../transactiontablemodel.cpp" line="+234"/>
<source>Date</source>
<translation>날짜</translation>
</message>
@@ -2227,8 +2866,13 @@ Address: %4
<source>Amount</source>
<translation>수량</translation>
</message>
+ <message>
+ <location line="+59"/>
+ <source>Immature (%1 confirmations, will be available after %2)</source>
+ <translation type="unfinished"/>
+ </message>
<message numerus="yes">
- <location line="+57"/>
+ <location line="+16"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
@@ -2248,17 +2892,13 @@ Address: %4
<translation>미확ì¸(%2 중 %1 확ì¸ë¨)</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="-22"/>
+ <location line="+25"/>
<source>Confirmed (%1 confirmations)</source>
<translation>확ì¸ë¨(%1 확ì¸ë¨)</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></translation>
- </message>
<message>
- <location line="+5"/>
+ <location line="-22"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation>ì´ ë¸”ëŸ­ì€ ë‹¤ë¥¸ 노드로부터 받지 않았ìŒ. 허용ë˜ì§€ ì•Šì„ ê²ƒìž„.</translation>
</message>
@@ -2268,14 +2908,14 @@ Address: %4
<translation>ìƒì„±ë˜ì—ˆìœ¼ë‚˜ ê±°ì ˆë¨</translation>
</message>
<message>
- <location line="+43"/>
+ <location line="+62"/>
<source>Received with</source>
<translation>다ìŒê³¼ 함께 ë°›ìŒ : </translation>
</message>
<message>
<location line="+2"/>
<source>Received from</source>
- <translation type="unfinished"/>
+ <translation>보낸 주소</translation>
</message>
<message>
<location line="+3"/>
@@ -2326,7 +2966,7 @@ Address: %4
<context>
<name>TransactionView</name>
<message>
- <location filename="../transactionview.cpp" line="+52"/>
+ <location filename="../transactionview.cpp" line="+57"/>
<location line="+16"/>
<source>All</source>
<translation>ì „ì²´</translation>
@@ -2387,12 +3027,12 @@ Address: %4
<translation>기타</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+6"/>
<source>Enter address or label to search</source>
<translation>검색하기 위한 주소 ë˜ëŠ” ë¼ë²¨ì„ ìž…ë ¥</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+6"/>
<source>Min amount</source>
<translation>최소 거래량</translation>
</message>
@@ -2409,12 +3049,12 @@ Address: %4
<message>
<location line="+1"/>
<source>Copy amount</source>
- <translation type="unfinished"/>
+ <translation>거래액 복사</translation>
</message>
<message>
<location line="+1"/>
<source>Copy transaction ID</source>
- <translation type="unfinished"/>
+ <translation>송금 ID 복사</translation>
</message>
<message>
<location line="+1"/>
@@ -2427,17 +3067,37 @@ Address: %4
<translation>거래 ë‚´ì—­ 확ì¸</translation>
</message>
<message>
- <location line="+143"/>
- <source>Export Transaction Data</source>
- <translation>거래내역 내보내기</translation>
+ <location line="+142"/>
+ <source>Export Transaction History</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Exporting Failed</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="+0"/>
+ <source>There was an error trying to save the transaction history to %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Exporting Successful</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The transaction history was successfully saved to %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-22"/>
<source>Comma separated file (*.csv)</source>
<translation>ê°ê°ì˜ 파ì¼ì— 쉼표하기(*.csv)</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+9"/>
<source>Confirmed</source>
<translation>확ì¸ë¨</translation>
</message>
@@ -2472,17 +3132,7 @@ Address: %4
<translation>ì•„ì´ë””</translation>
</message>
<message>
- <location line="+4"/>
- <source>Error exporting</source>
- <translation>ì—러 내보내기</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation>파ì¼ì„ 저장 í•  수 없슴 %1.</translation>
- </message>
- <message>
- <location line="+100"/>
+ <location line="+107"/>
<source>Range:</source>
<translation>범위:</translation>
</message>
@@ -2493,9 +3143,17 @@ Address: %4
</message>
</context>
<context>
+ <name>WalletFrame</name>
+ <message>
+ <location filename="../walletframe.cpp" line="+26"/>
+ <source>No wallet has been loaded.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>WalletModel</name>
<message>
- <location filename="../walletmodel.cpp" line="+218"/>
+ <location filename="../walletmodel.cpp" line="+245"/>
<source>Send Coins</source>
<translation>ì½”ì¸ë“¤ 보내기</translation>
</message>
@@ -2503,7 +3161,7 @@ Address: %4
<context>
<name>WalletView</name>
<message>
- <location filename="../walletview.cpp" line="+46"/>
+ <location filename="../walletview.cpp" line="+43"/>
<source>&amp;Export</source>
<translation type="unfinished"/>
</message>
@@ -2513,65 +3171,60 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+183"/>
+ <location line="+181"/>
<source>Backup Wallet</source>
- <translation type="unfinished"/>
+ <translation>지갑 백업</translation>
</message>
<message>
- <location line="+0"/>
+ <location line="+1"/>
<source>Wallet Data (*.dat)</source>
- <translation type="unfinished"/>
+ <translation>지갑 ë°ì´í„°(*.dat)</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="+6"/>
<source>Backup Failed</source>
- <translation type="unfinished"/>
+ <translation>백업 실패</translation>
</message>
<message>
<location line="+0"/>
- <source>There was an error trying to save the wallet data to the new location.</source>
+ <source>There was an error trying to save the wallet data to %1.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+4"/>
- <source>Backup Successful</source>
+ <source>The wallet data was successfully saved to %1.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+0"/>
- <source>The wallet data was successfully saved to the new location.</source>
- <translation type="unfinished"/>
+ <source>Backup Successful</source>
+ <translation>백업 성공</translation>
</message>
</context>
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+102"/>
- <source>Bitcoin version</source>
- <translation>ë¹„íŠ¸ì½”ì¸ ë²„ì „</translation>
- </message>
- <message>
- <location line="+107"/>
+ <location filename="../bitcoinstrings.cpp" line="+221"/>
<source>Usage:</source>
- <translation type="unfinished"/>
+ <translation>사용법:</translation>
</message>
<message>
- <location line="-55"/>
+ <location line="-54"/>
<source>List commands</source>
<translation>커맨드 목ë¡</translation>
</message>
<message>
- <location line="-13"/>
+ <location line="-14"/>
<source>Get help for a command</source>
<translation>커맨드 ë„움ë§</translation>
</message>
<message>
- <location line="+25"/>
+ <location line="+26"/>
<source>Options:</source>
<translation>옵션:</translation>
</message>
<message>
- <location line="+24"/>
+ <location line="+22"/>
<source>Specify configuration file (default: bitcoin.conf)</source>
<translation>ì„¤ì •íŒŒì¼ ì§€ì • (기본: bitcoin.conf)</translation>
</message>
@@ -2591,7 +3244,7 @@ Address: %4
<translation>ë°ì´í„°ë² ì´ìŠ¤ ìºì‹œ í¬ê¸°ë¥¼ 메가바ì´íŠ¸ë¡œ 지정(ë‚´ì •ê°’:25)</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-26"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
<translation type="unfinished"/>
</message>
@@ -2601,49 +3254,49 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-49"/>
+ <location line="-51"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
- <translation type="unfinished"/>
+ <translation>피어 주소를 받기 위해 ë…¸ë“œì— ì—°ê²°í•˜ê³ , ë°›ì€ í›„ì— ì—°ê²°ì„ ëŠìŠµë‹ˆë‹¤</translation>
</message>
<message>
<location line="+84"/>
<source>Specify your own public address</source>
- <translation type="unfinished"/>
+ <translation>ê³µì¸ ì£¼ì†Œë¥¼ 지정하십시오</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-142"/>
+ <location line="-148"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-33"/>
+ <location line="-36"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
- <translation type="unfinished"/>
+ <translation>IPv4 ê°ì²­ì„ 위한 RPC í¬íŠ¸ %uë²ˆì„ ì„¤ì •ì¤‘ 오류가 ë°œìƒí–ˆìŠµë‹ˆë‹¤: %s</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+40"/>
+ <location line="+45"/>
<source>Accept command line and JSON-RPC commands</source>
- <translation type="unfinished"/>
+ <translation>명령줄과 JSON-RPC 명령 수ë½</translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<source>Run in the background as a daemon and accept commands</source>
- <translation type="unfinished"/>
+ <translation>ë°ëª¬ìœ¼ë¡œ 백그ë¼ìš´ë“œì—ì„œ 실행하고 ëª…ë ¹ì„ í—ˆìš©</translation>
</message>
<message>
- <location line="+40"/>
+ <location line="+39"/>
<source>Use the test network</source>
- <translation type="unfinished"/>
+ <translation>테스트 ë„¤íŠ¸ì›Œí¬ ì‚¬ìš©</translation>
</message>
<message>
<location line="-118"/>
@@ -2651,7 +3304,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-87"/>
+ <location line="-95"/>
<source>%s, you must set a rpcpassword in the configuration file:
%s
It is recommended you use the following random password:
@@ -2692,6 +3345,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+4"/>
+ <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</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>
@@ -2706,24 +3364,24 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+11"/>
- <source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source>
+ <location line="+18"/>
+ <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="+6"/>
- <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
+ <location line="+5"/>
+ <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+3"/>
<source>Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source>
- <translation type="unfinished"/>
+ <translation>경고: -paytxfeeê°’ì´ ë„ˆë¬´ í½ë‹ˆë‹¤! ì´ ê°’ì€ ì†¡ê¸ˆí• ë•Œ 지불할 송금 수수료입니다.</translation>
</message>
<message>
<location line="+3"/>
<source>Warning: 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>경고: ì»´í“¨í„°ì˜ ë‚ ì§œì™€ ì‹œê°„ì´ ì˜¬ë°”ë¥¸ì§€ 확ì¸í•˜ì‹­ì‹œì˜¤! ì‹œê°„ì´ ìž˜ëª»ë˜ë©´ 비트코ì¸ì€ 제대로 ë™ìž‘하지 않습니다.</translation>
</message>
<message>
<location line="+3"/>
@@ -2746,19 +3404,29 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
+ <location line="+9"/>
+ <source>&lt;category&gt; can be:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
<source>Attempt to recover private keys from a corrupt wallet.dat</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
- <source>Bitcoin RPC client version</source>
+ <source>Bitcoin Core Daemon</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
+ <source>Bitcoin RPC client version</source>
+ <translation>ë¹„íŠ¸ì½”ì¸ RPC í´ë¼ì´ì–¸íŠ¸ 버전</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Block creation options:</source>
- <translation type="unfinished"/>
+ <translation>ë¸”ë¡ ìƒì„± 옵션:</translation>
</message>
<message>
<location line="+5"/>
@@ -2766,7 +3434,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
+ <source>Connect through SOCKS proxy</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect to JSON-RPC on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation type="unfinished"/>
</message>
@@ -2782,13 +3455,18 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+1"/>
+ <source>Do not load the wallet and disable wallet RPC calls</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Do you want to rebuild the block database now?</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+2"/>
<source>Error initializing block database</source>
- <translation type="unfinished"/>
+ <translation>ë¸”ë¡ ë°ì´í„°ë² ì´ìŠ¤ë¥¼ ì´ˆê¸°í™”í•˜ëŠ”ë° ì˜¤ë¥˜</translation>
</message>
<message>
<location line="+1"/>
@@ -2803,12 +3481,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<message>
<location line="+4"/>
<source>Error opening block database</source>
- <translation type="unfinished"/>
+ <translation>ë¸”ë¡ ë°ì´í„°ë² ì´ìŠ¤ë¥¼ ì—¬ëŠ”ë° ì˜¤ë¥˜</translation>
</message>
<message>
<location line="+2"/>
<source>Error: Disk space is low!</source>
- <translation type="unfinished"/>
+ <translation>오류: ë””ìŠ¤í¬ ê³µê°„ì´ ë¶€ì¡±í•©ë‹ˆë‹¤!</translation>
</message>
<message>
<location line="+1"/>
@@ -2818,7 +3496,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<message>
<location line="+1"/>
<source>Error: system error: </source>
- <translation type="unfinished"/>
+ <translation>오류: 시스템 오류:</translation>
</message>
<message>
<location line="+1"/>
@@ -2828,55 +3506,60 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<message>
<location line="+1"/>
<source>Failed to read block info</source>
- <translation type="unfinished"/>
+ <translation>ë¸”ë¡ ì •ë³´ë¥¼ ì½ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤</translation>
</message>
<message>
<location line="+1"/>
<source>Failed to read block</source>
- <translation type="unfinished"/>
+ <translation>블ë¡ì„ ì½ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤</translation>
</message>
<message>
<location line="+1"/>
<source>Failed to sync block index</source>
- <translation type="unfinished"/>
+ <translation>ë¸”ë¡ ì¸ë±ìŠ¤ë¥¼ ë™ê¸°í™”í•˜ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤</translation>
</message>
<message>
<location line="+1"/>
<source>Failed to write block index</source>
- <translation type="unfinished"/>
+ <translation>ë¸”ë¡ ì¸ë±ìŠ¤ë¥¼ 기ë¡í•˜ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤</translation>
</message>
<message>
<location line="+1"/>
<source>Failed to write block info</source>
- <translation type="unfinished"/>
+ <translation>ë¸”ë¡ ì •ë³´ë¥¼ 기ë¡í•˜ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤</translation>
</message>
<message>
<location line="+1"/>
<source>Failed to write block</source>
- <translation type="unfinished"/>
+ <translation>블ë¡ì„ 기ë¡í•˜ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤</translation>
</message>
<message>
<location line="+1"/>
<source>Failed to write file info</source>
- <translation type="unfinished"/>
+ <translation>íŒŒì¼ ì •ë³´ë¥¼ 기ë¡í•˜ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤</translation>
</message>
<message>
<location line="+1"/>
<source>Failed to write to coin database</source>
- <translation type="unfinished"/>
+ <translation>ì½”ì¸ ë°ì´í„°ë² ì´ìŠ¤ì— 기ë¡í•˜ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤</translation>
</message>
<message>
<location line="+1"/>
<source>Failed to write transaction index</source>
- <translation type="unfinished"/>
+ <translation>송금 ì¸ë±ìŠ¤ì— 기ë¡í•˜ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤</translation>
</message>
<message>
<location line="+1"/>
<source>Failed to write undo data</source>
+ <translation>ë°ì´í„° 실행 취소를 기ë¡í•˜ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Fee per kB to add to transactions you send</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
<source>Find peers using DNS lookup (default: 1 unless -connect)</source>
<translation type="unfinished"/>
</message>
@@ -2888,7 +3571,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<message>
<location line="+2"/>
<source>How many blocks to check at startup (default: 288, 0 = all)</source>
- <translation type="unfinished"/>
+ <translation>시작할때 검사할 ë¸”ë¡ ê°¯ìˆ˜ìž…ë‹ˆë‹¤(기본값: 288, 0 = 모ë‘)</translation>
</message>
<message>
<location line="+1"/>
@@ -2896,6 +3579,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
+ <location line="+1"/>
+ <source>If &lt;category&gt; is not supplied, output all debugging information.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+2"/>
<source>Incorrect or no genesis block found. Wrong datadir for network?</source>
<translation type="unfinished"/>
@@ -2903,7 +3591,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<message>
<location line="+3"/>
<source>Invalid -onion address: &apos;%s&apos;</source>
- <translation type="unfinished"/>
+ <translation>ìž˜ëª»ëœ -onion 주소입니다: &apos;%s&apos;</translation>
</message>
<message>
<location line="+15"/>
@@ -2911,17 +3599,37 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+8"/>
+ <location line="+5"/>
+ <source>Prepend debug output with timestamp (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>RPC client options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Rebuild block chain index from current blk000??.dat files</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+5"/>
+ <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Send command to Bitcoin server</source>
+ <translation>ë¹„íŠ¸ì½”ì¸ ì„œë²„ë¡œ 명령 보내기</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Set maximum block size in bytes (default: %d)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
+ <location line="+2"/>
<source>Set the number of threads to service RPC calls (default: 4)</source>
<translation type="unfinished"/>
</message>
@@ -2933,21 +3641,31 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<message>
<location line="+2"/>
<source>Start Bitcoin server</source>
+ <translation>ë¹„íŠ¸ì½”ì¸ ì„œë²„ 시작</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>This is intended for regression testing tools and app development.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+12"/>
+ <location line="+10"/>
<source>Usage (deprecated, use bitcoin-cli):</source>
- <translation type="unfinished"/>
+ <translation>사용법 (오래ë˜ì—ˆìŠµë‹ˆë‹¤. bitcoin-cli를 사용하십시오):</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+7"/>
<source>Verifying blocks...</source>
- <translation type="unfinished"/>
+ <translation>ë¸”ë¡ ê²€ì¦ì¤‘...</translation>
</message>
<message>
<location line="+1"/>
<source>Verifying wallet...</source>
+ <translation>지갑 ê²€ì¦ì¤‘...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Wait for RPC server to start</source>
<translation type="unfinished"/>
</message>
<message>
@@ -2956,29 +3674,49 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+2"/>
+ <source>Wallet options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>You need to rebuild the database using -reindex to change -txindex</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-78"/>
+ <location line="-79"/>
<source>Imports blocks from external blk000??.dat file</source>
- <translation type="unfinished"/>
+ <translation>외부 blk000??.dat 파ì¼ì—ì„œ ë¸”ë¡ ê°€ì ¸ì˜¤ê¸°</translation>
</message>
<message>
- <location line="-98"/>
+ <location line="-105"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+17"/>
+ <location line="+14"/>
+ <source>Output debugging information (default: 0, supplying &lt;category&gt; is optional)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+83"/>
+ <location line="+89"/>
<source>Information</source>
- <translation type="unfinished"/>
+ <translation>ì •ë³´</translation>
</message>
<message>
<location line="+4"/>
@@ -3008,7 +3746,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<message>
<location line="+2"/>
<source>Only accept block chain matching built-in checkpoints (default: 1)</source>
- <translation type="unfinished"/>
+ <translation>내부 중단ì ì— ì¼ì¹˜í•˜ëŠ” ë¸”ë¡ ì²´ì¸ë§Œ 수용(기본값: 1)</translation>
</message>
<message>
<location line="+1"/>
@@ -3016,54 +3754,24 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<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"/>
+ <location line="+9"/>
<source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
- <translation type="unfinished"/>
+ <translation>SSL 옵션: (SSL 설정 절차를 보혀면 ë¹„íŠ¸ì½”ì¸ ìœ„í‚¤ë¥¼ 참조하십시오)</translation>
</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"/>
+ <location line="+4"/>
<source>Send trace/debug info to console instead of debug.log file</source>
<translation>추ì ì˜¤ë¥˜ 정보를 degug.log ìžë£Œë¡œ 보내는 대신 콘솔로 보내기</translation>
</message>
<message>
- <location line="+1"/>
- <source>Send trace/debug info to debugger</source>
- <translation>추ì /오류를 debuggerë¡œ 보내기</translation>
- </message>
- <message>
- <location line="+5"/>
- <source>Set maximum block size in bytes (default: 250000)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+6"/>
<source>Set minimum block size in bytes (default: 0)</source>
- <translation type="unfinished"/>
+ <translation>ë°”ì´íŠ¸ ë‹¨ìœ„ì˜ ìµœì†Œ ë¸”ë¡ í¬ê¸° 설정(기본값: 0)</translation>
</message>
<message>
<location line="+2"/>
<source>Shrink debug.log file on client startup (default: 1 when no -debug)</source>
- <translation type="unfinished"/>
+ <translation>í´ë¼ì´ì–¸íŠ¸ 시작시 debug.log íŒŒì¼ ë¹„ìš°ê¸°(기본값: 디버그 안할때 1)</translation>
</message>
<message>
<location line="+1"/>
@@ -3073,15 +3781,15 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<message>
<location line="+2"/>
<source>Specify connection timeout in milliseconds (default: 5000)</source>
- <translation type="unfinished"/>
+ <translation>밀리초 단위로 ì—°ê²° ì œí•œì‹œê°„ì„ ì„¤ì •í•˜ì‹­ì‹œì˜¤(기본값: 5000)</translation>
</message>
<message>
<location line="+6"/>
<source>System error: </source>
- <translation type="unfinished"/>
+ <translation>시스템 오류:</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Transaction amount too small</source>
<translation type="unfinished"/>
</message>
@@ -3106,107 +3814,102 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<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"/>
+ <translation>JSON-RPC ì—°ê²°ì— ì‚¬ìš©í•  ì‚¬ìš©ìž ì´ë¦„</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+7"/>
<source>Warning</source>
- <translation type="unfinished"/>
+ <translation>경고</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Warning: This version is obsolete, upgrade required!</source>
- <translation type="unfinished"/>
+ <translation>경고: ì´ ë²„ì „ì´ ì˜¤ëž˜ë˜ì–´ 업그레ì´ë“œê°€ 필요합니다!</translation>
</message>
<message>
<location line="+2"/>
+ <source>version</source>
+ <translation>버전</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>wallet.dat corrupt, salvage failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-54"/>
+ <location line="-58"/>
<source>Password for JSON-RPC connections</source>
- <translation type="unfinished"/>
+ <translation>JSON-RPC ì—°ê²°ì— ì‚¬ìš©í•  암호</translation>
</message>
<message>
<location line="-70"/>
<source>Allow JSON-RPC connections from specified IP address</source>
- <translation type="unfinished"/>
+ <translation>지정한 IP ì£¼ì†Œì˜ JSON-RPC ì—°ê²° 허용</translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
- <translation type="unfinished"/>
+ <translation>실행 ì¤‘ì¸ ë…¸ë“œë¡œ 명령 전송 &lt;ip&gt; (기본: 127.0.0.1)</translation>
</message>
<message>
- <location line="-126"/>
+ <location line="-132"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation>ìµœê³ ì˜ ë¸”ëŸ­ì´ ë³€í•˜ë©´ ëª…ë ¹ì„ ì‹¤í–‰(cmd ì— ìžˆëŠ” %s 는 블럭 í•´ì‹œì— ì˜í•´ 대체ë˜ì–´ ì§)</translation>
</message>
<message>
- <location line="+155"/>
+ <location line="+161"/>
<source>Upgrade wallet to latest format</source>
<translation>ì§€ê°‘ì„ ìµœê·¼ 형ì‹ìœ¼ë¡œ 개선하시오</translation>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
- <translation type="unfinished"/>
+ <translation>키 í’€ í¬ê¸° 설정 &lt;n&gt;(기본값: 100)</translation>
</message>
<message>
- <location line="-12"/>
+ <location line="-11"/>
<source>Rescan the block chain for missing wallet transactions</source>
- <translation type="unfinished"/>
+ <translation>누ë½ëœ 지갑 ì†¡ê¸ˆì— ëŒ€í•œ ë¸”ë¡ ì²´ì¸ ë‹¤ì‹œ 검색</translation>
</message>
<message>
<location line="+38"/>
<source>Use OpenSSL (https) for JSON-RPC connections</source>
- <translation type="unfinished"/>
+ <translation>JSON-RPC ì—°ê²°ì— OpenSSL(https) 사용</translation>
</message>
<message>
- <location line="-29"/>
+ <location line="-30"/>
<source>Server certificate file (default: server.cert)</source>
- <translation type="unfinished"/>
+ <translation>서버 ì¸ì¦ íŒŒì¼ (기본값: server.cert)</translation>
</message>
<message>
<location line="+1"/>
<source>Server private key (default: server.pem)</source>
- <translation type="unfinished"/>
+ <translation>서버 ê°œì¸ í‚¤(기본값: server.pem)</translation>
</message>
<message>
<location line="+16"/>
<source>This help message</source>
- <translation type="unfinished"/>
+ <translation>ì´ ë„ì›€ë§ ë©”ì‹œì§€ìž…ë‹ˆë‹¤</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Unable to bind to %s on this computer (bind returned error %d, %s)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="-95"/>
- <source>Connect through socks proxy</source>
- <translation type="unfinished"/>
+ <translation>ì´ ì»´í“¨í„°ì˜ %sì— ë°”ì¸ë”©í•  수 없습니다 (ë°”ì¸ë”© ê³¼ì •ì— %d 오류 ë°œìƒ, %s)</translation>
</message>
<message>
- <location line="-11"/>
+ <location line="-107"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
- <translation type="unfinished"/>
+ <translation>-addnode, -seednode, -connect ì˜µì…˜ì— ëŒ€í•´ DNS íƒìƒ‰ 허용</translation>
</message>
<message>
- <location line="+58"/>
+ <location line="+60"/>
<source>Loading addresses...</source>
<translation>주소를 불러오는 중...</translation>
</message>
<message>
- <location line="-36"/>
+ <location line="-37"/>
<source>Error loading wallet.dat: Wallet corrupted</source>
<translation>wallet.datì—러: 지갑 오류</translation>
</message>
@@ -3226,34 +3929,34 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>wallet.dat 로딩 ì—러</translation>
</message>
<message>
- <location line="+30"/>
+ <location line="+31"/>
<source>Invalid -proxy address: &apos;%s&apos;</source>
- <translation type="unfinished"/>
+ <translation>ìž˜ëª»ëœ -proxy 주소입니다: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+57"/>
+ <location line="+56"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
- <translation type="unfinished"/>
+ <translation>-onlynetì— ì§€ì •í•œ 네트워í¬ë¥¼ ì•Œ 수 없습니다: &apos;%s&apos;</translation>
</message>
<message>
<location line="-1"/>
<source>Unknown -socks proxy version requested: %i</source>
- <translation type="unfinished"/>
+ <translation>요청한 -socks 프ë¡ížˆ ë²„ì „ì„ ì•Œ 수 없습니다: %i</translation>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
- <translation type="unfinished"/>
+ <translation>-bind 주소를 확ì¸í•  수 없습니다: &apos;%s&apos;</translation>
</message>
<message>
<location line="+1"/>
<source>Cannot resolve -externalip address: &apos;%s&apos;</source>
- <translation type="unfinished"/>
+ <translation>-externalip 주소를 확ì¸í•  수 없습니다: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+46"/>
+ <location line="+48"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
- <translation type="unfinished"/>
+ <translation>-paytxfee=&lt;amount&gt;ì— ëŒ€í•œ ì–‘ì´ ìž˜ëª»ë˜ì—ˆìŠµë‹ˆë‹¤: &apos;%s&apos;</translation>
</message>
<message>
<location line="+1"/>
@@ -3271,37 +3974,32 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>블럭 ì¸ë±ìŠ¤ë¥¼ 불러오는 중...</translation>
</message>
<message>
- <location line="-60"/>
+ <location line="-62"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-28"/>
+ <location line="-32"/>
<source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+69"/>
- <source>Fee per KB to add to transactions you send</source>
- <translation type="unfinished"/>
+ <translation>ì´ ì»´í“¨í„°ì˜ %sì— ë°”ì¸ë”© í•  수 없습니다. ì•„ë§ˆë„ ë¹„íŠ¸ì½”ì¸ì´ ì‹¤í–‰ì¤‘ì¸ ê²ƒ 같습니다.</translation>
</message>
<message>
- <location line="+20"/>
+ <location line="+95"/>
<source>Loading wallet...</source>
<translation>ì§€ê°‘ì„ ë¶ˆëŸ¬ì˜¤ëŠ” 중...</translation>
</message>
<message>
- <location line="-54"/>
+ <location line="-56"/>
<source>Cannot downgrade wallet</source>
- <translation type="unfinished"/>
+ <translation>ì§€ê°‘ì„ ë‹¤ìš´ê·¸ë ˆì´ë“œ í•  수 없습니다</translation>
</message>
<message>
<location line="+3"/>
<source>Cannot write default address</source>
- <translation type="unfinished"/>
+ <translation>기본 ê³„ì¢Œì— ê¸°ë¡í•  수 없습니다</translation>
</message>
<message>
- <location line="+66"/>
+ <location line="+67"/>
<source>Rescanning...</source>
<translation>재검색 중...</translation>
</message>
@@ -3313,19 +4011,21 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<message>
<location line="+85"/>
<source>To use the %s option</source>
- <translation type="unfinished"/>
+ <translation>%s ì˜µì…˜ì„ ì‚¬ìš©í•˜ë ¤ë©´</translation>
</message>
<message>
<location line="-77"/>
<source>Error</source>
- <translation type="unfinished"/>
+ <translation>오류</translation>
</message>
<message>
- <location line="-33"/>
+ <location line="-35"/>
<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;암호&gt;를 설정해야 합니다:
+%s
+파ì¼ì´ 없으면 ì†Œìœ ìž ì½ê¸° ì „ìš© íŒŒì¼ ê¶Œí•œìœ¼ë¡œ 만들어야 합니다.</translation>
</message>
</context>
</TS> \ No newline at end of file
diff --git a/src/qt/locale/bitcoin_la.ts b/src/qt/locale/bitcoin_la.ts
index 6b8b72a990..ae65eb1c66 100644
--- a/src/qt/locale/bitcoin_la.ts
+++ b/src/qt/locale/bitcoin_la.ts
@@ -3,13 +3,13 @@
<name>AboutDialog</name>
<message>
<location filename="../forms/aboutdialog.ui" line="+14"/>
- <source>About Bitcoin</source>
- <translation>Informatio de Bitcoin</translation>
+ <source>About Bitcoin Core</source>
+ <translation type="unfinished"/>
</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>
+ <source>&lt;b&gt;Bitcoin Core&lt;/b&gt; version</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+57"/>
@@ -26,14 +26,14 @@ Distributum sub MIT/X11 licentia programmatum, vide comitantem plicam COPYING ve
Hoc productum continet programmata composita ab OpenSSL Project pro utendo in OpenSSL Toolkit (http://www.openssl.org/) et programmata cifrarum scripta ab Eric Young (eay@cryptsoft.com) et UPnP programmata scripta ab Thomas Bernard.</translation>
</message>
<message>
- <location filename="../aboutdialog.cpp" line="+14"/>
+ <location filename="../utilitydialog.cpp" line="+29"/>
<source>Copyright</source>
<translation>Copyright</translation>
</message>
<message>
<location line="+0"/>
- <source>The Bitcoin developers</source>
- <translation>Bitcoin curatores</translation>
+ <source>The Bitcoin Core developers</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -69,7 +69,7 @@ Hoc productum continet programmata composita ab OpenSSL Project pro utendo in Op
<translation type="unfinished"/>
</message>
<message>
- <location filename="../addressbookpage.cpp" line="+72"/>
+ <location filename="../addressbookpage.cpp" line="+74"/>
<source>&amp;Copy Address</source>
<translation>&amp;Copia Inscriptionem</translation>
</message>
@@ -139,7 +139,7 @@ Hoc productum continet programmata composita ab OpenSSL Project pro utendo in Op
<translation>&amp;Muta</translation>
</message>
<message>
- <location line="+197"/>
+ <location line="+194"/>
<source>Export Address List</source>
<translation type="unfinished"/>
</message>
@@ -150,19 +150,19 @@ Hoc productum continet programmata composita ab OpenSSL Project pro utendo in Op
</message>
<message>
<location line="+13"/>
- <source>Error exporting</source>
- <translation>Error exportandi</translation>
+ <source>Exporting Failed</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation>Non potuisse scribere in plicam %1.</translation>
+ <location line="+1"/>
+ <source>There was an error trying to save the address list to %1.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<name>AddressTableModel</name>
<message>
- <location filename="../addresstablemodel.cpp" line="+164"/>
+ <location filename="../addresstablemodel.cpp" line="+168"/>
<source>Label</source>
<translation>Titulus</translation>
</message>
@@ -200,7 +200,7 @@ Hoc productum continet programmata composita ab OpenSSL Project pro utendo in Op
<translation>Itera novam tesseram</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="+34"/>
+ <location filename="../askpassphrasedialog.cpp" line="+40"/>
<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>
@@ -321,22 +321,27 @@ Hoc productum continet programmata composita ab OpenSSL Project pro utendo in Op
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+250"/>
+ <location filename="../bitcoingui.cpp" line="+295"/>
<source>Sign &amp;message...</source>
<translation>Signa &amp;nuntium...</translation>
</message>
<message>
- <location line="+254"/>
+ <location line="+335"/>
<source>Synchronizing with network...</source>
<translation>Synchronizans cum rete...</translation>
</message>
<message>
- <location line="-324"/>
+ <location line="-407"/>
<source>&amp;Overview</source>
<translation>&amp;Summarium</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="-137"/>
+ <source>Node</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+138"/>
<source>Show general overview of wallet</source>
<translation>Monstra generale summarium cassidilis</translation>
</message>
@@ -351,7 +356,7 @@ Hoc productum continet programmata composita ab OpenSSL Project pro utendo in Op
<translation>Inspicio historiam transactionum</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>E&amp;xit</source>
<translation>E&amp;xi</translation>
</message>
@@ -397,7 +402,22 @@ Hoc productum continet programmata composita ab OpenSSL Project pro utendo in Op
<translation>&amp;Muta tesseram...</translation>
</message>
<message>
- <location line="+259"/>
+ <location line="+10"/>
+ <source>&amp;Sending addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Receiving addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open &amp;URI...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+325"/>
<source>Importing blocks from disk...</source>
<translation>Importans frusta ab disco...</translation>
</message>
@@ -407,12 +427,12 @@ Hoc productum continet programmata composita ab OpenSSL Project pro utendo in Op
<translation>Recreans indicem frustorum in disco...</translation>
</message>
<message>
- <location line="-322"/>
+ <location line="-405"/>
<source>Send coins to a Bitcoin address</source>
<translation>Mitte nummos ad inscriptionem Bitcoin</translation>
</message>
<message>
- <location line="+47"/>
+ <location line="+49"/>
<source>Modify configuration options for Bitcoin</source>
<translation>Muta configurationis optiones pro Bitcoin</translation>
</message>
@@ -442,20 +462,17 @@ Hoc productum continet programmata composita ab OpenSSL Project pro utendo in Op
<translation>&amp;Verifica nuntium...</translation>
</message>
<message>
- <location line="-180"/>
- <location line="+6"/>
- <location line="+513"/>
+ <location line="+430"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-519"/>
- <location line="+6"/>
+ <location line="-643"/>
<source>Wallet</source>
<translation>Cassidile</translation>
</message>
<message>
- <location line="+109"/>
+ <location line="+146"/>
<source>&amp;Send</source>
<translation>&amp;Mitte</translation>
</message>
@@ -465,13 +482,7 @@ Hoc productum continet programmata composita ab OpenSSL Project pro utendo in Op
<translation>&amp;Accipe</translation>
</message>
<message>
- <location line="+28"/>
- <location line="+2"/>
- <source>&amp;About Bitcoin</source>
- <translation>&amp;Informatio de Bitcoin</translation>
- </message>
- <message>
- <location line="+14"/>
+ <location line="+46"/>
<location line="+2"/>
<source>&amp;Show / Hide</source>
<translation>&amp;Monstra/Occulta</translation>
@@ -497,64 +508,80 @@ Hoc productum continet programmata composita ab OpenSSL Project pro utendo in Op
<translation>Verifica nuntios ut certus sis eos signatos esse cum specificatis inscriptionibus Bitcoin</translation>
</message>
<message>
- <location line="+35"/>
+ <location line="+48"/>
<source>&amp;File</source>
<translation>&amp;Plica</translation>
</message>
<message>
- <location line="+10"/>
+ <location line="+14"/>
<source>&amp;Settings</source>
<translation>&amp;Configuratio</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>&amp;Help</source>
<translation>&amp;Auxilium</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+15"/>
<source>Tabs toolbar</source>
<translation>Tabella instrumentorum &quot;Tabs&quot;</translation>
</message>
<message>
- <location line="-235"/>
- <location line="+294"/>
+ <location line="-284"/>
+ <location line="+376"/>
<source>[testnet]</source>
<translation>[testnet]</translation>
</message>
<message>
- <location line="-177"/>
+ <location line="-401"/>
+ <source>Bitcoin Core</source>
+ <translation>Bitcoin Nucleus</translation>
+ </message>
+ <message>
+ <location line="+163"/>
<source>Request payments (generates QR codes and bitcoin: URIs)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+63"/>
- <source>&amp;Used sending addresses...</source>
+ <location line="+29"/>
+ <location line="+2"/>
+ <source>&amp;About Bitcoin Core</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="+35"/>
<source>Show the list of used sending addresses and labels</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Used &amp;receiving addresses...</source>
+ <location line="+2"/>
+ <source>Show the list of used receiving addresses and labels</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open a bitcoin: URI or payment request</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Command-line options</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
- <source>Show the list of used receiving addresses and labels</source>
+ <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+106"/>
+ <location line="+159"/>
<location line="+5"/>
<source>Bitcoin client</source>
<translation>Bitcoin cliens</translation>
</message>
<message numerus="yes">
- <location line="+120"/>
+ <location line="+142"/>
<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>
@@ -574,7 +601,7 @@ Hoc productum continet programmata composita ab OpenSSL Project pro utendo in Op
<translation>Processae %1 frusta historiae transactionum.</translation>
</message>
<message numerus="yes">
- <location line="+20"/>
+ <location line="+23"/>
<source>%n hour(s)</source>
<translation><numerusform>%n hora</numerusform><numerusform>%n horae</numerusform></translation>
</message>
@@ -594,7 +621,7 @@ Hoc productum continet programmata composita ab OpenSSL Project pro utendo in Op
<translation>%1 post</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="+21"/>
<source>Last received block was generated %1 ago.</source>
<translation>Postremum acceptum frustum generatum est %1 abhinc.</translation>
</message>
@@ -619,27 +646,17 @@ Hoc productum continet programmata composita ab OpenSSL Project pro utendo in Op
<translation>Informatio</translation>
</message>
<message>
- <location line="+77"/>
- <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="-152"/>
+ <location line="-85"/>
<source>Up to date</source>
<translation>Recentissimo</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Catching up...</source>
<translation>Persequens...</translation>
</message>
<message>
- <location line="+124"/>
- <source>Confirm transaction fee</source>
- <translation>Confirma mercedem transactionis</translation>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+130"/>
<source>Sent transaction</source>
<translation>Transactio missa</translation>
</message>
@@ -662,17 +679,7 @@ Inscriptio: %4
</translation>
</message>
<message>
- <location line="+34"/>
- <source>URI handling</source>
- <translation>Tractatio URI</translation>
- </message>
- <message>
- <location line="+0"/>
- <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="+45"/>
+ <location line="+69"/>
<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>
@@ -682,7 +689,7 @@ Inscriptio: %4
<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="+110"/>
+ <location filename="../bitcoin.cpp" line="+438"/>
<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>
@@ -690,12 +697,304 @@ Inscriptio: %4
<context>
<name>ClientModel</name>
<message>
- <location filename="../clientmodel.cpp" line="+115"/>
+ <location filename="../clientmodel.cpp" line="+119"/>
<source>Network Alert</source>
<translation>Monitio Retis</translation>
</message>
</context>
<context>
+ <name>CoinControlDialog</name>
+ <message>
+ <location filename="../forms/coincontroldialog.ui" line="+14"/>
+ <source>Coin Control Address Selection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>Quantity:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Bytes:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>Amount:</source>
+ <translation>Quantitas:</translation>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Priority:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Low Output:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>After Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Change:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+63"/>
+ <source>(un)select all</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Tree mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>List mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>Amount</source>
+ <translation>Quantitas</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Address</source>
+ <translation>Inscriptio</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Date</source>
+ <translation>Dies</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Confirmations</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Confirmed</source>
+ <translation>Confirmatum</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../coincontroldialog.cpp" line="+42"/>
+ <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"/>
+ <location line="+26"/>
+ <source>Copy amount</source>
+ <translation>Copia quantitatem</translation>
+ </message>
+ <message>
+ <location line="-25"/>
+ <source>Copy transaction ID</source>
+ <translation>Copia transactionis ID</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Lock unspent</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Unlock unspent</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+22"/>
+ <source>Copy quantity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Copy fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy after fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy bytes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy low output</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy change</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+323"/>
+ <source>highest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>higher</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>high</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>medium-high</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>medium</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>low-medium</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>low</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>lower</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>lowest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>(%1 locked)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+140"/>
+ <source>Dust</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>yes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>no</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>This label turns red, if the transaction size is greater than 1000 bytes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+5"/>
+ <source>This means a fee of at least %1 per kB is required.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-4"/>
+ <source>Can vary +/- 1 byte per input.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Transactions with higher priority are more likely to get included into a block.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>This label turns red, if the priority is smaller than &quot;medium&quot;.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>This label turns red, if any recipient receives an amount smaller than %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+4"/>
+ <source>This means a fee of at least %1 is required.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-3"/>
+ <source>Amounts below 0.546 times the minimum relay fee are shown as dust.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>This label turns red, if the change is smaller than %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
+ <location line="+66"/>
+ <source>(no label)</source>
+ <translation>(nullus titulus)</translation>
+ </message>
+ <message>
+ <location line="-9"/>
+ <source>change from %1 (%2)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>(change)</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>EditAddressDialog</name>
<message>
<location filename="../forms/editaddressdialog.ui" line="+14"/>
@@ -723,7 +1022,7 @@ Inscriptio: %4
<translation>&amp;Inscriptio</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+21"/>
+ <location filename="../editaddressdialog.cpp" line="+28"/>
<source>New receiving address</source>
<translation>Nova inscriptio accipiendi</translation>
</message>
@@ -766,7 +1065,7 @@ Inscriptio: %4
<context>
<name>FreespaceChecker</name>
<message>
- <location filename="../intro.cpp" line="+61"/>
+ <location filename="../intro.cpp" line="+65"/>
<source>A new data directory will be created.</source>
<translation type="unfinished"/>
</message>
@@ -792,15 +1091,19 @@ Inscriptio: %4
</message>
</context>
<context>
- <name>GUIUtil::HelpMessageBox</name>
+ <name>HelpMessageDialog</name>
<message>
- <location filename="../guiutil.cpp" line="+558"/>
- <location line="+13"/>
- <source>Bitcoin-Qt</source>
- <translation>Bitcoin-Qt</translation>
+ <location filename="../forms/helpmessagedialog.ui" line="+19"/>
+ <source>Bitcoin Core - Command-line options</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="-13"/>
+ <location filename="../utilitydialog.cpp" line="+38"/>
+ <source>Bitcoin Core</source>
+ <translation>Bitcoin Nucleus</translation>
+ </message>
+ <message>
+ <location line="+0"/>
<source>version</source>
<translation>versio</translation>
</message>
@@ -849,17 +1152,17 @@ Inscriptio: %4
</message>
<message>
<location line="+9"/>
- <source>Welcome to Bitcoin-Qt.</source>
+ <source>Welcome to Bitcoin Core.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+26"/>
- <source>As this is the first time the program is launched, you can choose where Bitcoin-Qt will store its data.</source>
+ <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+10"/>
- <source>Bitcoin-Qt will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
+ <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -873,7 +1176,17 @@ Inscriptio: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../intro.cpp" line="+105"/>
+ <location filename="../intro.cpp" line="+85"/>
+ <source>Bitcoin</source>
+ <translation>Bitcoin</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error: Specified data directory &quot;%1&quot; can not be created.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+19"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
@@ -889,6 +1202,34 @@ Inscriptio: %4
</message>
</context>
<context>
+ <name>OpenURIDialog</name>
+ <message>
+ <location filename="../forms/openuridialog.ui" line="+14"/>
+ <source>Open URI</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Open payment request from URI or file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>URI:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Select payment request file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../openuridialog.cpp" line="+47"/>
+ <source>Select payment request file to open</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OptionsDialog</name>
<message>
<location filename="../forms/optionsdialog.ui" line="+14"/>
@@ -896,7 +1237,7 @@ Inscriptio: %4
<translation>Optiones</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+13"/>
<source>&amp;Main</source>
<translation>&amp;Princeps</translation>
</message>
@@ -921,7 +1262,52 @@ Inscriptio: %4
<translation>&amp;Pelle Bitcoin cum inire systema</translation>
</message>
<message>
- <location line="+35"/>
+ <location line="+9"/>
+ <source>Size of &amp;database cache</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set database cache size in megabytes (default: 25)</source>
+ <translation>Constitue magnitudinem databasis cache in megabytes (praedefinitum: 25)</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>MB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Number of script &amp;verification threads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
+ <translation>Constitue numerum filorum verificationis scriptorum (Maximum 16, 0 = auto, &lt;0 = tot corda libera erunt, praedefinitum: 0)</translation>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Connect to the Bitcoin network through a SOCKS proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Connect through SOCKS proxy (default proxy):</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+224"/>
+ <source>Active command-line options that override above options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
<source>Reset all client options to default.</source>
<translation>Reconstitue omnes optiones clientis ad praedefinita.</translation>
</message>
@@ -931,7 +1317,7 @@ Inscriptio: %4
<translation>&amp;Reconstitue Optiones</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="-323"/>
<source>&amp;Network</source>
<translation>&amp;Rete</translation>
</message>
@@ -946,32 +1332,17 @@ Inscriptio: %4
<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"/>
+ <location line="+19"/>
<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"/>
+ <location line="+32"/>
<source>&amp;Port:</source>
<translation>&amp;Porta:</translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+25"/>
<source>Port of the proxy (e.g. 9050)</source>
<translation>Porta vicarii (e.g. 9050)</translation>
</message>
@@ -1046,7 +1417,17 @@ Inscriptio: %4
<translation>&amp;Monstra inscriptiones in enumeratione transactionum</translation>
</message>
<message>
- <location line="+71"/>
+ <location line="+7"/>
+ <source>Whether to show coin control features or not.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Display coin &amp;control features (experts only)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+136"/>
<source>&amp;OK</source>
<translation>&amp;OK</translation>
</message>
@@ -1056,44 +1437,38 @@ Inscriptio: %4
<translation>&amp;Cancella</translation>
</message>
<message>
- <location line="+10"/>
- <source>&amp;Apply</source>
- <translation>&amp;Applica</translation>
- </message>
- <message>
- <location filename="../optionsdialog.cpp" line="+58"/>
+ <location filename="../optionsdialog.cpp" line="+67"/>
<source>default</source>
<translation>praedefinitum</translation>
</message>
<message>
- <location line="+130"/>
+ <location line="+57"/>
+ <source>none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+75"/>
<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>
+ <location line="+29"/>
+ <source>Client restart required to activate changes.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
- <location line="+9"/>
- <source>Warning</source>
- <translation>Monitio</translation>
+ <location line="-29"/>
+ <source>Client will be shutdown, do you want to proceed?</source>
+ <translation type="unfinished"/>
</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>
+ <location line="+33"/>
+ <source>This change would require a client restart.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+29"/>
+ <location line="+34"/>
<source>The supplied proxy address is invalid.</source>
<translation>Inscriptio vicarii tradita non valida est.</translation>
</message>
@@ -1107,22 +1482,22 @@ Inscriptio: %4
</message>
<message>
<location line="+50"/>
- <location line="+202"/>
+ <location line="+231"/>
<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="-131"/>
+ <location line="-155"/>
<source>Unconfirmed:</source>
<translation>Non confirmata:</translation>
</message>
<message>
- <location line="-78"/>
+ <location line="-83"/>
<source>Wallet</source>
<translation>Cassidile</translation>
</message>
<message>
- <location line="+49"/>
+ <location line="+51"/>
<source>Confirmed:</source>
<translation type="unfinished"/>
</message>
@@ -1132,12 +1507,12 @@ Inscriptio: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+29"/>
+ <location line="+32"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+16"/>
<source>Immature:</source>
<translation>Immatura:</translation>
</message>
@@ -1147,7 +1522,7 @@ Inscriptio: %4
<translation>Fossum pendendum quod nondum maturum est</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+16"/>
<source>Total:</source>
<translation type="unfinished"/>
</message>
@@ -1157,12 +1532,12 @@ Inscriptio: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+53"/>
+ <location line="+71"/>
<source>&lt;b&gt;Recent transactions&lt;/b&gt;</source>
<translation>&lt;b&gt;Recentes transactiones&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../overviewpage.cpp" line="+116"/>
+ <location filename="../overviewpage.cpp" line="+120"/>
<location line="+1"/>
<source>out of sync</source>
<translation>non synchronizato</translation>
@@ -1171,7 +1546,8 @@ Inscriptio: %4
<context>
<name>PaymentServer</name>
<message>
- <location filename="../paymentserver.cpp" line="+392"/>
+ <location filename="../paymentserver.cpp" line="+403"/>
+ <location line="+13"/>
<source>URI handling</source>
<translation>Tractatio URI</translation>
</message>
@@ -1181,45 +1557,82 @@ Inscriptio: %4
<translation>URI intellegi non posse! Huius causa possit inscriptionem Bitcoin non validam aut URI parametra maleformata.</translation>
</message>
<message>
- <location line="+69"/>
+ <location line="+96"/>
<source>Requested payment amount of %1 is too small (considered dust).</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
- <location line="+37"/>
+ <location line="-221"/>
+ <location line="+212"/>
+ <location line="+13"/>
+ <location line="+95"/>
+ <location line="+18"/>
+ <location line="+16"/>
<source>Payment request error</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="-353"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
+ <translation>Bitcoin incipere non potest: cliccare-ad-pensandum handler</translation>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Net manager warning</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+1"/>
- <source>Insecure requests to custom payment scripts unsupported</source>
+ <source>Your active proxy doesn&apos;t support SOCKS5, which is required for payment requests via proxy.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+38"/>
+ <location line="+52"/>
+ <source>Payment request fetch URL is invalid: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Payment request file handling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Payment request file can not be read or processed! This can be caused by an invalid payment request file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+73"/>
+ <source>Unverified payment requests to custom payment scripts are unsupported.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+59"/>
<source>Refund from %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
+ <location line="+43"/>
<source>Error communicating with %1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+24"/>
+ <source>Payment request can not be parsed or processed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
<source>Bad response from server %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+32"/>
+ <location line="+33"/>
<source>Payment acknowledged</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-58"/>
- <location line="+30"/>
- <location line="+17"/>
+ <location line="-11"/>
<source>Network request error</source>
<translation type="unfinished"/>
</message>
@@ -1227,32 +1640,26 @@ Inscriptio: %4
<context>
<name>QObject</name>
<message>
- <location filename="../bitcoin.cpp" line="+114"/>
- <location line="+5"/>
- <location filename="../intro.cpp" line="-32"/>
+ <location filename="../bitcoin.cpp" line="+71"/>
+ <location line="+11"/>
<source>Bitcoin</source>
- <translation type="unfinished"/>
+ <translation>Bitcoin</translation>
</message>
<message>
- <location line="-4"/>
+ <location line="+1"/>
<source>Error: Specified data directory &quot;%1&quot; does not exist.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="-12"/>
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../intro.cpp" line="+1"/>
- <source>Error: Specified data directory &quot;%1&quot; can not be created.</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>QRImageWidget</name>
<message>
- <location filename="../receiverequestdialog.cpp" line="+32"/>
+ <location filename="../receiverequestdialog.cpp" line="+36"/>
<source>&amp;Save Image...</source>
<translation type="unfinished"/>
</message>
@@ -1268,8 +1675,8 @@ Inscriptio: %4
</message>
<message>
<location line="+0"/>
- <source>PNG Images (*.png)</source>
- <translation>Imagines PNG (*.png)</translation>
+ <source>PNG Image (*.png)</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1286,15 +1693,16 @@ Inscriptio: %4
<location line="+23"/>
<location line="+23"/>
<location line="+36"/>
- <location line="+53"/>
+ <location line="+23"/>
+ <location line="+36"/>
<location line="+23"/>
<location line="+23"/>
- <location filename="../rpcconsole.cpp" line="+352"/>
+ <location filename="../rpcconsole.cpp" line="+359"/>
<source>N/A</source>
<translation>N/A</translation>
</message>
<message>
- <location line="-217"/>
+ <location line="-223"/>
<source>Client version</source>
<translation>Versio clientis</translation>
</message>
@@ -1304,7 +1712,17 @@ Inscriptio: %4
<translation>&amp;Informatio</translation>
</message>
<message>
- <location line="+68"/>
+ <location line="-10"/>
+ <source>Debug window</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+25"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+53"/>
<source>Using OpenSSL version</source>
<translation>Utens OpenSSL versione</translation>
</message>
@@ -1320,16 +1738,16 @@ Inscriptio: %4
</message>
<message>
<location line="+7"/>
- <source>Number of connections</source>
- <translation>Numerus conexionum</translation>
+ <source>Name</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+23"/>
- <source>On testnet</source>
- <translation>In testnet</translation>
+ <source>Number of connections</source>
+ <translation>Numerus conexionum</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+29"/>
<source>Block chain</source>
<translation>Catena frustorum</translation>
</message>
@@ -1354,21 +1772,6 @@ Inscriptio: %4
<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>
@@ -1399,22 +1802,12 @@ Inscriptio: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-541"/>
+ <location line="-521"/>
<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"/>
+ <location line="+206"/>
<source>Debug log file</source>
<translation>Debug catalogi plica</translation>
</message>
@@ -1424,7 +1817,7 @@ Inscriptio: %4
<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"/>
+ <location line="+76"/>
<source>Clear console</source>
<translation>Vacuefac terminale</translation>
</message>
@@ -1444,7 +1837,7 @@ Inscriptio: %4
<translation>Scribe &lt;b&gt;help&lt;/b&gt; pro summario possibilium mandatorum.</translation>
</message>
<message>
- <location line="+128"/>
+ <location line="+122"/>
<source>%1 B</source>
<translation type="unfinished"/>
</message>
@@ -1482,48 +1875,48 @@ Inscriptio: %4
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+22"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
<source>&amp;Amount:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
- <source>The amount to request</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+7"/>
+ <location line="-13"/>
<source>&amp;Label:</source>
<translation>&amp;Titulus:</translation>
</message>
<message>
- <location line="+10"/>
- <source>The label to associate with the receiving address</source>
+ <location line="-34"/>
+ <source>&amp;Message:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>&amp;Message:</source>
+ <location line="-17"/>
+ <source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>The message to attach to payment request</source>
+ <location line="+3"/>
+ <source>R&amp;euse an existing receiving address (not recommended)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
- <source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
+ <location line="+27"/>
+ <source>An optional label to associate with the new receiving address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>R&amp;euse an existing receiving address (not recommended)</source>
+ <location line="+7"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+7"/>
- <source>Use this form to request payments. All fields are optional.</source>
+ <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+39"/>
+ <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1541,6 +1934,31 @@ Inscriptio: %4
<source>&amp;Request payment</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+47"/>
+ <source>Requested payments</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Show the selected request (does the same as double clicking an entry)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Show</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Remove the selected entries from the list</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Remove</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
@@ -1561,16 +1979,11 @@ Inscriptio: %4
</message>
<message>
<location line="+7"/>
- <source>&amp;Copy Image</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+7"/>
<source>&amp;Save Image...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../receiverequestdialog.cpp" line="+58"/>
+ <location filename="../receiverequestdialog.cpp" line="+56"/>
<source>Request payment to %1</source>
<translation type="unfinished"/>
</message>
@@ -1616,16 +2029,119 @@ Inscriptio: %4
</message>
</context>
<context>
+ <name>RecentRequestsTableModel</name>
+ <message>
+ <location filename="../recentrequeststablemodel.cpp" line="+24"/>
+ <source>Date</source>
+ <translation>Dies</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Label</source>
+ <translation>Titulus</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Message</source>
+ <translation>Nuntius</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Amount</source>
+ <translation>Quantitas</translation>
+ </message>
+ <message>
+ <location line="+38"/>
+ <source>(no label)</source>
+ <translation>(nullus titulus)</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>(no message)</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+140"/>
- <location line="+213"/>
+ <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location line="+80"/>
<source>Send Coins</source>
<translation>Mitte Nummos</translation>
</message>
<message>
- <location line="+50"/>
+ <location line="+76"/>
+ <source>Coin Control Features</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Inputs...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>automatically selected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Insufficient funds!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+89"/>
+ <source>Quantity:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+35"/>
+ <source>Bytes:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Amount:</source>
+ <translation>Quantitas:</translation>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Priority:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Low Output:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>After Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Change:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+44"/>
+ <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Custom change address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+115"/>
<source>Send to multiple recipients at once</source>
<translation>Mitte pluribus accipientibus simul</translation>
</message>
@@ -1650,12 +2166,7 @@ Inscriptio: %4
<translation>Pendendum:</translation>
</message>
<message>
- <location line="+10"/>
- <source>123.456 BTC</source>
- <translation>123.456 BTC</translation>
- </message>
- <message>
- <location line="+31"/>
+ <location line="+41"/>
<source>Confirm the send action</source>
<translation>Confirma actionem mittendi</translation>
</message>
@@ -1665,69 +2176,135 @@ Inscriptio: %4
<translation>&amp;Mitte</translation>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-154"/>
+ <location filename="../sendcoinsdialog.cpp" line="-228"/>
<source>Confirm send coins</source>
<translation>Confirma mittendum nummorum</translation>
</message>
<message>
- <location line="-90"/>
+ <location line="-74"/>
<location line="+5"/>
<location line="+5"/>
+ <location line="+4"/>
<source>%1 to %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+26"/>
+ <location line="-136"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation>Insere inscriptionem Bitcoin (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Copy quantity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation>Copia quantitatem</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy after fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy bytes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy low output</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy change</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+170"/>
+ <source>Total Amount %1 (= %2)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>or</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+202"/>
<source>The recipient address is not valid, please recheck.</source>
<translation>Inscriptio accipientis non est valida, sodes reproba.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<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="+4"/>
+ <location line="+3"/>
<source>The amount exceeds your balance.</source>
<translation>Quantitas est ultra quod habes.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<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="+5"/>
+ <location line="+3"/>
<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="+3"/>
+ <source>Transaction creation failed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+4"/>
- <source>Error: Transaction creation failed!</source>
- <translation>Error: Creare transactionem abortum est!</translation>
+ <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+15"/>
- <source>Are you sure you want to send?</source>
+ <location line="+112"/>
+ <source>Warning: Invalid Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+9"/>
- <source>added as transaction fee</source>
+ <location line="+21"/>
+ <source>(no label)</source>
+ <translation>(nullus titulus)</translation>
+ </message>
+ <message>
+ <location line="-11"/>
+ <source>Warning: Unknown change address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
- <source>Total Amount %1</source>
+ <location line="-366"/>
+ <source>Are you sure you want to send?</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+20"/>
- <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>
+ <location line="+9"/>
+ <source>added as transaction fee</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+144"/>
+ <location line="+170"/>
<source>Payment request expired</source>
<translation type="unfinished"/>
</message>
@@ -1740,39 +2317,44 @@ Inscriptio: %4
<context>
<name>SendCoinsEntry</name>
<message>
- <location filename="../forms/sendcoinsentry.ui" line="+33"/>
- <location line="+585"/>
+ <location filename="../forms/sendcoinsentry.ui" line="+131"/>
+ <location line="+521"/>
+ <location line="+536"/>
<source>A&amp;mount:</source>
<translation>&amp;Quantitas:</translation>
</message>
<message>
- <location line="-572"/>
- <location line="+585"/>
+ <location line="-1152"/>
<source>Pay &amp;To:</source>
<translation>Pensa &amp;Ad:</translation>
</message>
<message>
- <location line="-551"/>
+ <location line="+18"/>
<source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>Inscriptio cui mittere pensitationem (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location filename="../sendcoinsentry.cpp" line="+28"/>
+ <location filename="../sendcoinsentry.cpp" line="+30"/>
<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 filename="../forms/sendcoinsentry.ui" line="-18"/>
+ <location filename="../forms/sendcoinsentry.ui" line="+57"/>
<source>&amp;Label:</source>
<translation>&amp;Titulus:</translation>
</message>
<message>
- <location line="+28"/>
+ <location line="-50"/>
<source>Choose previously used address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
+ <location line="-40"/>
+ <source>This is a normal payment.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+50"/>
<source>Alt+A</source>
<translation>Alt+A</translation>
</message>
@@ -1788,16 +2370,45 @@ Inscriptio: %4
</message>
<message>
<location line="+7"/>
- <source>Remove this recipient</source>
- <translation>Remove hunc accipientem</translation>
+ <location line="+524"/>
+ <location line="+536"/>
+ <source>Remove this entry</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="-1008"/>
+ <source>Message:</source>
+ <translation>Nuntius:</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+958"/>
+ <source>This is a verified payment request.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-991"/>
<source>Enter a label for this address to add it to the list of used addresses</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+465"/>
+ <location line="+459"/>
+ <source>This is an unverified payment request.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+18"/>
+ <location line="+532"/>
+ <source>Pay To:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-498"/>
+ <location line="+536"/>
<source>Memo:</source>
<translation type="unfinished"/>
</message>
@@ -1808,6 +2419,19 @@ Inscriptio: %4
</message>
</context>
<context>
+ <name>ShutdownWindow</name>
+ <message>
+ <location filename="../utilitydialog.cpp" line="+48"/>
+ <source>Bitcoin Core is shutting down...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Do not shut down the computer until this window disappears.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>SignVerifyMessageDialog</name>
<message>
<location filename="../forms/signverifymessagedialog.ui" line="+14"/>
@@ -1815,7 +2439,7 @@ Inscriptio: %4
<translation>Signationes - Signa / Verifica nuntium</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+10"/>
<source>&amp;Sign Message</source>
<translation>&amp;Signa Nuntium</translation>
</message>
@@ -1918,7 +2542,7 @@ Inscriptio: %4
<translation>Reconstitue omnes campos verificandi nuntii</translation>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+27"/>
+ <location filename="../signverifymessagedialog.cpp" line="+29"/>
<location line="+3"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>Insere inscriptionem Bitcoin (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
@@ -1934,7 +2558,7 @@ Inscriptio: %4
<translation>Insere signationem Bitcoin</translation>
</message>
<message>
- <location line="+85"/>
+ <location line="+84"/>
<location line="+81"/>
<source>The entered address is invalid.</source>
<translation>Inscriptio inserta non valida est.</translation>
@@ -2003,9 +2627,14 @@ Inscriptio: %4
<context>
<name>SplashScreen</name>
<message>
- <location filename="../splashscreen.cpp" line="+23"/>
- <source>The Bitcoin developers</source>
- <translation>Bitcoin curatores</translation>
+ <location filename="../splashscreen.cpp" line="+28"/>
+ <source>Bitcoin Core</source>
+ <translation>Bitcoin Nucleus</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>The Bitcoin Core developers</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
@@ -2016,7 +2645,7 @@ Inscriptio: %4
<context>
<name>TrafficGraphWidget</name>
<message>
- <location filename="../trafficgraphwidget.cpp" line="+75"/>
+ <location filename="../trafficgraphwidget.cpp" line="+79"/>
<source>KB/s</source>
<translation type="unfinished"/>
</message>
@@ -2024,7 +2653,7 @@ Inscriptio: %4
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="+22"/>
+ <location filename="../transactiondesc.cpp" line="+28"/>
<source>Open until %1</source>
<translation>Apertum donec %1</translation>
</message>
@@ -2097,12 +2726,12 @@ Inscriptio: %4
<location line="+12"/>
<location line="+45"/>
<location line="+17"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Credit</source>
<translation>Creditum</translation>
</message>
<message numerus="yes">
- <location line="-120"/>
+ <location line="-125"/>
<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>
@@ -2115,12 +2744,12 @@ Inscriptio: %4
<location line="+44"/>
<location line="+8"/>
<location line="+15"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Debit</source>
<translation>Debitum</translation>
</message>
<message>
- <location line="-57"/>
+ <location line="-62"/>
<source>Transaction fee</source>
<translation>Transactionis merces</translation>
</message>
@@ -2131,11 +2760,12 @@ Inscriptio: %4
</message>
<message>
<location line="+6"/>
+ <location line="+9"/>
<source>Message</source>
<translation>Nuntius</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="-7"/>
<source>Comment</source>
<translation>Annotatio</translation>
</message>
@@ -2145,7 +2775,7 @@ Inscriptio: %4
<translation>ID transactionis</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+18"/>
<source>Merchant</source>
<translation type="unfinished"/>
</message>
@@ -2185,7 +2815,7 @@ Inscriptio: %4
<translation>falsum</translation>
</message>
<message>
- <location line="-227"/>
+ <location line="-232"/>
<source>, has not been successfully broadcast yet</source>
<translation>, nondum prospere disseminatum est</translation>
</message>
@@ -2216,7 +2846,7 @@ Inscriptio: %4
<context>
<name>TransactionTableModel</name>
<message>
- <location filename="../transactiontablemodel.cpp" line="+227"/>
+ <location filename="../transactiontablemodel.cpp" line="+234"/>
<source>Date</source>
<translation>Dies</translation>
</message>
@@ -2235,8 +2865,13 @@ Inscriptio: %4
<source>Amount</source>
<translation>Quantitas</translation>
</message>
+ <message>
+ <location line="+59"/>
+ <source>Immature (%1 confirmations, will be available after %2)</source>
+ <translation type="unfinished"/>
+ </message>
<message numerus="yes">
- <location line="+57"/>
+ <location line="+16"/>
<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>
@@ -2256,17 +2891,13 @@ Inscriptio: %4
<translation>Non confirmatum (%1 de %2 confirmationibus)</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="-22"/>
+ <location line="+25"/>
<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"/>
+ <location line="-22"/>
<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>
@@ -2276,7 +2907,7 @@ Inscriptio: %4
<translation>Generatum sed non acceptum</translation>
</message>
<message>
- <location line="+43"/>
+ <location line="+62"/>
<source>Received with</source>
<translation>Acceptum cum</translation>
</message>
@@ -2334,7 +2965,7 @@ Inscriptio: %4
<context>
<name>TransactionView</name>
<message>
- <location filename="../transactionview.cpp" line="+52"/>
+ <location filename="../transactionview.cpp" line="+57"/>
<location line="+16"/>
<source>All</source>
<translation>Omne</translation>
@@ -2395,12 +3026,12 @@ Inscriptio: %4
<translation>Alia</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+6"/>
<source>Enter address or label to search</source>
<translation>Insere inscriptionem vel titulum ut quaeras</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+6"/>
<source>Min amount</source>
<translation>Quantitas minima</translation>
</message>
@@ -2435,17 +3066,37 @@ Inscriptio: %4
<translation>Monstra particularia transactionis</translation>
</message>
<message>
- <location line="+143"/>
- <source>Export Transaction Data</source>
- <translation>Exporta Data Transactionum</translation>
+ <location line="+142"/>
+ <source>Export Transaction History</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="+19"/>
+ <source>Exporting Failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>There was an error trying to save the transaction history to %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Exporting Successful</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The transaction history was successfully saved to %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-22"/>
<source>Comma separated file (*.csv)</source>
<translation>Comma Separata Plica (*.csv)</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+9"/>
<source>Confirmed</source>
<translation>Confirmatum</translation>
</message>
@@ -2480,17 +3131,7 @@ Inscriptio: %4
<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"/>
+ <location line="+107"/>
<source>Range:</source>
<translation>Intervallum:</translation>
</message>
@@ -2501,9 +3142,17 @@ Inscriptio: %4
</message>
</context>
<context>
+ <name>WalletFrame</name>
+ <message>
+ <location filename="../walletframe.cpp" line="+26"/>
+ <source>No wallet has been loaded.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>WalletModel</name>
<message>
- <location filename="../walletmodel.cpp" line="+218"/>
+ <location filename="../walletmodel.cpp" line="+245"/>
<source>Send Coins</source>
<translation>Mitte Nummos</translation>
</message>
@@ -2511,7 +3160,7 @@ Inscriptio: %4
<context>
<name>WalletView</name>
<message>
- <location filename="../walletview.cpp" line="+46"/>
+ <location filename="../walletview.cpp" line="+43"/>
<source>&amp;Export</source>
<translation>&amp;Exporta</translation>
</message>
@@ -2521,65 +3170,60 @@ Inscriptio: %4
<translation>Exporta data in hac tabella in plicam</translation>
</message>
<message>
- <location line="+183"/>
+ <location line="+181"/>
<source>Backup Wallet</source>
<translation>Conserva cassidile</translation>
</message>
<message>
- <location line="+0"/>
+ <location line="+1"/>
<source>Wallet Data (*.dat)</source>
<translation>Data cassidilis (*.dat)</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="+6"/>
<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>
+ <source>There was an error trying to save the wallet data to %1.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+4"/>
- <source>Backup Successful</source>
- <translation>Successum in conservando</translation>
+ <source>The wallet data was successfully saved to %1.</source>
+ <translation type="unfinished"/>
</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>
+ <source>Backup Successful</source>
+ <translation>Successum in conservando</translation>
</message>
</context>
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+102"/>
- <source>Bitcoin version</source>
- <translation>Versio de Bitcoin</translation>
- </message>
- <message>
- <location line="+107"/>
+ <location filename="../bitcoinstrings.cpp" line="+221"/>
<source>Usage:</source>
<translation>Usus:</translation>
</message>
<message>
- <location line="-55"/>
+ <location line="-54"/>
<source>List commands</source>
<translation>Enumera mandata</translation>
</message>
<message>
- <location line="-13"/>
+ <location line="-14"/>
<source>Get help for a command</source>
<translation>Accipe auxilium pro mandato</translation>
</message>
<message>
- <location line="+25"/>
+ <location line="+26"/>
<source>Options:</source>
<translation>Optiones:</translation>
</message>
<message>
- <location line="+24"/>
+ <location line="+22"/>
<source>Specify configuration file (default: bitcoin.conf)</source>
<translation>Specifica configurationis plicam (praedefinitum: bitcoin.conf)</translation>
</message>
@@ -2599,7 +3243,7 @@ Inscriptio: %4
<translation>Constitue magnitudinem databasis cache in megabytes (praedefinitum: 25)</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-26"/>
<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>
@@ -2609,7 +3253,7 @@ Inscriptio: %4
<translation>Manutene non plures quam &lt;n&gt; conexiones ad paria (praedefinitum: 125)</translation>
</message>
<message>
- <location line="-49"/>
+ <location line="-51"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation>Conecta ad nodum acceptare inscriptiones parium, et disconecte</translation>
</message>
@@ -2619,37 +3263,37 @@ Inscriptio: %4
<translation>Specifica tuam propriam publicam inscriptionem</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation>Limen pro disconectendo paria improba (praedefinitum: 100)</translation>
</message>
<message>
- <location line="-142"/>
+ <location line="-148"/>
<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="-33"/>
+ <location line="-36"/>
<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="+31"/>
+ <location line="+34"/>
<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="+40"/>
+ <location line="+45"/>
<source>Accept command line and JSON-RPC commands</source>
<translation>Accipe terminalis et JSON-RPC mandata.</translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<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="+40"/>
+ <location line="+39"/>
<source>Use the test network</source>
<translation>Utere rete experimentale</translation>
</message>
@@ -2659,7 +3303,7 @@ Inscriptio: %4
<translation>Accipe conexiones externas (praedefinitum: 1 nisi -proxy neque -connect)</translation>
</message>
<message>
- <location line="-87"/>
+ <location line="-95"/>
<source>%s, you must set a rpcpassword in the configuration file:
%s
It is recommended you use the following random password:
@@ -2710,6 +3354,11 @@ exempli gratia: alertnotify=echo %%s | mail -s &quot;Bitcoin Notificatio&quot; a
</message>
<message>
<location line="+4"/>
+ <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</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>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>
@@ -2724,17 +3373,17 @@ exempli gratia: alertnotify=echo %%s | mail -s &quot;Bitcoin Notificatio&quot; a
<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="+6"/>
+ <location line="+18"/>
<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>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
<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>
@@ -2764,17 +3413,27 @@ exempli gratia: alertnotify=echo %%s | mail -s &quot;Bitcoin Notificatio&quot; a
<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"/>
+ <location line="+9"/>
+ <source>&lt;category&gt; can be:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
<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="+1"/>
+ <source>Bitcoin Core Daemon</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Bitcoin RPC client version</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
<source>Block creation options:</source>
<translation>Optiones creandi frustorum:</translation>
</message>
@@ -2784,7 +3443,12 @@ exempli gratia: alertnotify=echo %%s | mail -s &quot;Bitcoin Notificatio&quot; a
<translation>Conecte sole ad nodos specificatos (vel nodum specificatum)</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
+ <source>Connect through SOCKS proxy</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect to JSON-RPC on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation type="unfinished"/>
</message>
@@ -2800,6 +3464,11 @@ exempli gratia: alertnotify=echo %%s | mail -s &quot;Bitcoin Notificatio&quot; a
</message>
<message>
<location line="+1"/>
+ <source>Do not load the wallet and disable wallet RPC calls</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Do you want to rebuild the block database now?</source>
<translation>Visne reficere databasum frustorum iam?</translation>
</message>
@@ -2894,7 +3563,12 @@ exempli gratia: alertnotify=echo %%s | mail -s &quot;Bitcoin Notificatio&quot; a
<translation>Scribere data pro cancellando mutationes abortum est</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
+ <source>Fee per kB to add to transactions you send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Find peers using DNS lookup (default: 1 unless -connect)</source>
<translation>Inveni paria utendo DNS quaerendo (praedefinitum: 1 nisi -connect)</translation>
</message>
@@ -2914,6 +3588,11 @@ exempli gratia: alertnotify=echo %%s | mail -s &quot;Bitcoin Notificatio&quot; a
<translation>Quam perfecta frustorum verificatio est (0-4, praedefinitum: 3)</translation>
</message>
<message>
+ <location line="+1"/>
+ <source>If &lt;category&gt; is not supplied, output all debugging information.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+2"/>
<source>Incorrect or no genesis block found. Wrong datadir for network?</source>
<translation type="unfinished"/>
@@ -2929,17 +3608,37 @@ exempli gratia: alertnotify=echo %%s | mail -s &quot;Bitcoin Notificatio&quot; a
<translation>Inopia descriptorum plicarum.</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+5"/>
+ <source>Prepend debug output with timestamp (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>RPC client options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<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="+6"/>
+ <location line="+5"/>
+ <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Send command to Bitcoin server</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
+ <location line="+7"/>
+ <source>Set maximum block size in bytes (default: %d)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Set the number of threads to service RPC calls (default: 4)</source>
<translation>Constitue numerum filorum ad tractandum RPC postulationes (praedefinitum: 4)</translation>
</message>
@@ -2954,12 +3653,17 @@ exempli gratia: alertnotify=echo %%s | mail -s &quot;Bitcoin Notificatio&quot; a
<translation type="unfinished"/>
</message>
<message>
- <location line="+12"/>
+ <location line="+3"/>
+ <source>This is intended for regression testing tools and app development.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Usage (deprecated, use bitcoin-cli):</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+8"/>
+ <location line="+7"/>
<source>Verifying blocks...</source>
<translation>Verificante frusta...</translation>
</message>
@@ -2970,31 +3674,56 @@ exempli gratia: alertnotify=echo %%s | mail -s &quot;Bitcoin Notificatio&quot; a
</message>
<message>
<location line="+1"/>
+ <source>Wait for RPC server to start</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Wallet %s resides outside data directory %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+2"/>
+ <source>Wallet options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>You need to rebuild the database using -reindex to change -txindex</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-78"/>
+ <location line="-79"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation>Importat frusta ab externa plica blk000??.dat</translation>
</message>
<message>
- <location line="-98"/>
+ <location line="-105"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+17"/>
+ <location line="+14"/>
+ <source>Output debugging information (default: 0, supplying &lt;category&gt; is optional)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
<translation>Constitue numerum filorum verificationis scriptorum (Maximum 16, 0 = auto, &lt;0 = tot corda libera erunt, praedefinitum: 0)</translation>
</message>
<message>
- <location line="+83"/>
+ <location line="+89"/>
<source>Information</source>
<translation>Informatio</translation>
</message>
@@ -3034,47 +3763,17 @@ exempli gratia: alertnotify=echo %%s | mail -s &quot;Bitcoin Notificatio&quot; a
<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"/>
+ <location line="+9"/>
<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"/>
+ <location line="+4"/>
<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"/>
+ <location line="+6"/>
<source>Set minimum block size in bytes (default: 0)</source>
<translation>Constitue minimam magnitudinem frusti in octetis/bytes (praedefinitum: 0)</translation>
</message>
@@ -3099,7 +3798,7 @@ exempli gratia: alertnotify=echo %%s | mail -s &quot;Bitcoin Notificatio&quot; a
<translation>Systematis error:</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Transaction amount too small</source>
<translation>Magnitudo transactionis nimis parva</translation>
</message>
@@ -3124,32 +3823,32 @@ exempli gratia: alertnotify=echo %%s | mail -s &quot;Bitcoin Notificatio&quot; a
<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="+5"/>
+ <location line="+7"/>
<source>Warning</source>
<translation>Monitio</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Warning: This version is obsolete, upgrade required!</source>
<translation>Monitio: Haec versio obsoleta est, progressio postulata!</translation>
</message>
<message>
<location line="+2"/>
+ <source>version</source>
+ <translation>versio</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="-54"/>
+ <location line="-58"/>
<source>Password for JSON-RPC connections</source>
<translation>Tessera pro conexionibus JSON-RPC</translation>
</message>
@@ -3159,27 +3858,27 @@ exempli gratia: alertnotify=echo %%s | mail -s &quot;Bitcoin Notificatio&quot; a
<translation>Permitte conexionibus JSON-RPC ex inscriptione specificata</translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<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="-126"/>
+ <location line="-132"/>
<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="+155"/>
+ <location line="+161"/>
<source>Upgrade wallet to latest format</source>
<translation>Progredere cassidile ad formam recentissimam</translation>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<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"/>
+ <location line="-11"/>
<source>Rescan the block chain for missing wallet transactions</source>
<translation>Iterum perlege catenam frustorum propter absentes cassidilis transactiones</translation>
</message>
@@ -3189,7 +3888,7 @@ exempli gratia: alertnotify=echo %%s | mail -s &quot;Bitcoin Notificatio&quot; a
<translation>Utere OpenSSL (https) pro conexionibus JSON-RPC</translation>
</message>
<message>
- <location line="-29"/>
+ <location line="-30"/>
<source>Server certificate file (default: server.cert)</source>
<translation>Plica certificationis daemonis moderantis (praedefinitum: server.cert)</translation>
</message>
@@ -3204,27 +3903,22 @@ exempli gratia: alertnotify=echo %%s | mail -s &quot;Bitcoin Notificatio&quot; a
<translation>Hic nuntius auxilii</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<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="-95"/>
- <source>Connect through socks proxy</source>
- <translation>Conecte per socks vicarium</translation>
- </message>
- <message>
- <location line="-11"/>
+ <location line="-107"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation>Permitte quaerenda DNS pro -addnode, -seednode, et -connect</translation>
</message>
<message>
- <location line="+58"/>
+ <location line="+60"/>
<source>Loading addresses...</source>
<translation>Legens inscriptiones...</translation>
</message>
<message>
- <location line="-36"/>
+ <location line="-37"/>
<source>Error loading wallet.dat: Wallet corrupted</source>
<translation>Error legendi wallet.dat: Cassidile corruptum</translation>
</message>
@@ -3244,12 +3938,12 @@ exempli gratia: alertnotify=echo %%s | mail -s &quot;Bitcoin Notificatio&quot; a
<translation>Error legendi wallet.dat</translation>
</message>
<message>
- <location line="+30"/>
+ <location line="+31"/>
<source>Invalid -proxy address: &apos;%s&apos;</source>
<translation>Inscriptio -proxy non valida: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+57"/>
+ <location line="+56"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation>Ignotum rete specificatum in -onlynet: &apos;%s&apos;</translation>
</message>
@@ -3259,7 +3953,7 @@ exempli gratia: alertnotify=echo %%s | mail -s &quot;Bitcoin Notificatio&quot; a
<translation>Ignota -socks vicarii versio postulata: %i</translation>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation>Non posse resolvere -bind inscriptonem: &apos;%s&apos;</translation>
</message>
@@ -3269,7 +3963,7 @@ exempli gratia: alertnotify=echo %%s | mail -s &quot;Bitcoin Notificatio&quot; a
<translation>Non posse resolvere -externalip inscriptionem: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+46"/>
+ <location line="+48"/>
<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>
@@ -3289,27 +3983,22 @@ exempli gratia: alertnotify=echo %%s | mail -s &quot;Bitcoin Notificatio&quot; a
<translation>Legens indicem frustorum...</translation>
</message>
<message>
- <location line="-60"/>
+ <location line="-62"/>
<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="-28"/>
+ <location line="-32"/>
<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="+69"/>
- <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="+20"/>
+ <location line="+95"/>
<source>Loading wallet...</source>
<translation>Legens cassidile...</translation>
</message>
<message>
- <location line="-54"/>
+ <location line="-56"/>
<source>Cannot downgrade wallet</source>
<translation>Non posse cassidile regredi</translation>
</message>
@@ -3319,7 +4008,7 @@ exempli gratia: alertnotify=echo %%s | mail -s &quot;Bitcoin Notificatio&quot; a
<translation>Non posse scribere praedefinitam inscriptionem</translation>
</message>
<message>
- <location line="+66"/>
+ <location line="+67"/>
<source>Rescanning...</source>
<translation>Iterum perlegens...</translation>
</message>
@@ -3339,7 +4028,7 @@ exempli gratia: alertnotify=echo %%s | mail -s &quot;Bitcoin Notificatio&quot; a
<translation>Error</translation>
</message>
<message>
- <location line="-33"/>
+ <location line="-35"/>
<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_lt.ts b/src/qt/locale/bitcoin_lt.ts
index e0cc754d2f..4f818d1e96 100644
--- a/src/qt/locale/bitcoin_lt.ts
+++ b/src/qt/locale/bitcoin_lt.ts
@@ -3,13 +3,13 @@
<name>AboutDialog</name>
<message>
<location filename="../forms/aboutdialog.ui" line="+14"/>
- <source>About Bitcoin</source>
- <translation>Apie Bitcoin</translation>
+ <source>About Bitcoin Core</source>
+ <translation type="unfinished"/>
</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>
+ <source>&lt;b&gt;Bitcoin Core&lt;/b&gt; version</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+57"/>
@@ -26,14 +26,14 @@ 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="+14"/>
+ <location filename="../utilitydialog.cpp" line="+29"/>
<source>Copyright</source>
<translation>Copyright</translation>
</message>
<message>
<location line="+0"/>
- <source>The Bitcoin developers</source>
- <translation>Bitcoin programuotojai</translation>
+ <source>The Bitcoin Core developers</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -51,7 +51,7 @@ Platinama pagal MIT/X11 licencijÄ…, kuriÄ… rasite faile COPYING arba http://www.
<message>
<location line="+3"/>
<source>&amp;New</source>
- <translation type="unfinished"/>
+ <translation>&amp;Naujas</translation>
</message>
<message>
<location line="+11"/>
@@ -61,15 +61,15 @@ Platinama pagal MIT/X11 licencijÄ…, kuriÄ… rasite faile COPYING arba http://www.
<message>
<location line="+3"/>
<source>&amp;Copy</source>
- <translation type="unfinished"/>
+ <translation>&amp;Kopijuoti</translation>
</message>
<message>
<location line="+52"/>
<source>C&amp;lose</source>
- <translation type="unfinished"/>
+ <translation>&amp;Užverti</translation>
</message>
<message>
- <location filename="../addressbookpage.cpp" line="+72"/>
+ <location filename="../addressbookpage.cpp" line="+74"/>
<source>&amp;Copy Address</source>
<translation>&amp;Kopijuoti adresÄ…</translation>
</message>
@@ -139,7 +139,7 @@ Platinama pagal MIT/X11 licencijÄ…, kuriÄ… rasite faile COPYING arba http://www.
<translation>&amp;Keisti</translation>
</message>
<message>
- <location line="+197"/>
+ <location line="+194"/>
<source>Export Address List</source>
<translation type="unfinished"/>
</message>
@@ -150,19 +150,19 @@ Platinama pagal MIT/X11 licencijÄ…, kuriÄ… rasite faile COPYING arba http://www.
</message>
<message>
<location line="+13"/>
- <source>Error exporting</source>
- <translation>Eksportavimo klaida</translation>
+ <source>Exporting Failed</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation>Nepavyko įrašyti į failą %1.</translation>
+ <location line="+1"/>
+ <source>There was an error trying to save the address list to %1.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<name>AddressTableModel</name>
<message>
- <location filename="../addresstablemodel.cpp" line="+164"/>
+ <location filename="../addresstablemodel.cpp" line="+168"/>
<source>Label</source>
<translation>Žymė</translation>
</message>
@@ -200,7 +200,7 @@ Platinama pagal MIT/X11 licencijÄ…, kuriÄ… rasite faile COPYING arba http://www.
<translation>Pakartokite naujÄ… slaptafrazÄ™</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="+34"/>
+ <location filename="../askpassphrasedialog.cpp" line="+40"/>
<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>Įveskite naują piniginės slaptafrazę.&lt;br/&gt;Prašome naudoti slaptafrazę iš &lt;b&gt; 10 ar daugiau atsitiktinių simbolių&lt;/b&gt; arba &lt;b&gt;aštuonių ar daugiau žodžių&lt;/b&gt;.</translation>
</message>
@@ -321,22 +321,27 @@ Platinama pagal MIT/X11 licencijÄ…, kuriÄ… rasite faile COPYING arba http://www.
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+250"/>
+ <location filename="../bitcoingui.cpp" line="+295"/>
<source>Sign &amp;message...</source>
<translation>Pasirašyti ži&amp;nutę...</translation>
</message>
<message>
- <location line="+254"/>
+ <location line="+335"/>
<source>Synchronizing with network...</source>
<translation>Sinchronizavimas su tinklu ...</translation>
</message>
<message>
- <location line="-324"/>
+ <location line="-407"/>
<source>&amp;Overview</source>
<translation>&amp;Apžvalga</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="-137"/>
+ <source>Node</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+138"/>
<source>Show general overview of wallet</source>
<translation>Rodyti piniginės bendrą apžvalgą</translation>
</message>
@@ -351,7 +356,7 @@ Platinama pagal MIT/X11 licencijÄ…, kuriÄ… rasite faile COPYING arba http://www.
<translation>Apžvelgti sandorių istoriją</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>E&amp;xit</source>
<translation>&amp;IÅ¡eiti</translation>
</message>
@@ -397,7 +402,22 @@ Platinama pagal MIT/X11 licencijÄ…, kuriÄ… rasite faile COPYING arba http://www.
<translation>&amp;Keisti slaptafrazÄ™...</translation>
</message>
<message>
- <location line="+259"/>
+ <location line="+10"/>
+ <source>&amp;Sending addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Receiving addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open &amp;URI...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+325"/>
<source>Importing blocks from disk...</source>
<translation>Blokai importuojami iš disko...</translation>
</message>
@@ -407,12 +427,12 @@ Platinama pagal MIT/X11 licencijÄ…, kuriÄ… rasite faile COPYING arba http://www.
<translation>Blokai iš naujo indeksuojami...</translation>
</message>
<message>
- <location line="-322"/>
+ <location line="-405"/>
<source>Send coins to a Bitcoin address</source>
<translation>Siųsti monetas Bitcoin adresui</translation>
</message>
<message>
- <location line="+47"/>
+ <location line="+49"/>
<source>Modify configuration options for Bitcoin</source>
<translation>Keisti bitcoin konfigūracijos galimybes</translation>
</message>
@@ -442,20 +462,17 @@ Platinama pagal MIT/X11 licencijÄ…, kuriÄ… rasite faile COPYING arba http://www.
<translation>&amp;Tikrinti žinutę...</translation>
</message>
<message>
- <location line="-180"/>
- <location line="+6"/>
- <location line="+513"/>
+ <location line="+430"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-519"/>
- <location line="+6"/>
+ <location line="-643"/>
<source>Wallet</source>
<translation>PiniginÄ—</translation>
</message>
<message>
- <location line="+109"/>
+ <location line="+146"/>
<source>&amp;Send</source>
<translation>&amp;Siųsti</translation>
</message>
@@ -465,13 +482,7 @@ Platinama pagal MIT/X11 licencijÄ…, kuriÄ… rasite faile COPYING arba http://www.
<translation>&amp;Gauti</translation>
</message>
<message>
- <location line="+28"/>
- <location line="+2"/>
- <source>&amp;About Bitcoin</source>
- <translation>&amp;Apie Bitcoin</translation>
- </message>
- <message>
- <location line="+14"/>
+ <location line="+46"/>
<location line="+2"/>
<source>&amp;Show / Hide</source>
<translation>&amp;Rodyti / SlÄ—pti</translation>
@@ -497,64 +508,80 @@ Platinama pagal MIT/X11 licencijÄ…, kuriÄ… rasite faile COPYING arba http://www.
<translation type="unfinished"/>
</message>
<message>
- <location line="+35"/>
+ <location line="+48"/>
<source>&amp;File</source>
<translation>&amp;Failas</translation>
</message>
<message>
- <location line="+10"/>
+ <location line="+14"/>
<source>&amp;Settings</source>
<translation>&amp;Nustatymai</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>&amp;Help</source>
<translation>&amp;Pagalba</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+15"/>
<source>Tabs toolbar</source>
<translation>Kortelių įrankinė</translation>
</message>
<message>
- <location line="-235"/>
- <location line="+294"/>
+ <location line="-284"/>
+ <location line="+376"/>
<source>[testnet]</source>
<translation>[testavimotinklas]</translation>
</message>
<message>
- <location line="-177"/>
+ <location line="-401"/>
+ <source>Bitcoin Core</source>
+ <translation>Bitcoin branduolys</translation>
+ </message>
+ <message>
+ <location line="+163"/>
<source>Request payments (generates QR codes and bitcoin: URIs)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+63"/>
- <source>&amp;Used sending addresses...</source>
+ <location line="+29"/>
+ <location line="+2"/>
+ <source>&amp;About Bitcoin Core</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="+35"/>
<source>Show the list of used sending addresses and labels</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Used &amp;receiving addresses...</source>
+ <location line="+2"/>
+ <source>Show the list of used receiving addresses and labels</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open a bitcoin: URI or payment request</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Command-line options</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
- <source>Show the list of used receiving addresses and labels</source>
+ <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+106"/>
+ <location line="+159"/>
<location line="+5"/>
<source>Bitcoin client</source>
<translation>Bitcoin klientas</translation>
</message>
<message numerus="yes">
- <location line="+120"/>
+ <location line="+142"/>
<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>
@@ -574,7 +601,7 @@ Platinama pagal MIT/X11 licencijÄ…, kuriÄ… rasite faile COPYING arba http://www.
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+20"/>
+ <location line="+23"/>
<source>%n hour(s)</source>
<translation><numerusform>%n valanda</numerusform><numerusform>%n valandos</numerusform><numerusform>%n valandų</numerusform></translation>
</message>
@@ -594,7 +621,7 @@ Platinama pagal MIT/X11 licencijÄ…, kuriÄ… rasite faile COPYING arba http://www.
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
+ <location line="+21"/>
<source>Last received block was generated %1 ago.</source>
<translation type="unfinished"/>
</message>
@@ -619,27 +646,17 @@ Platinama pagal MIT/X11 licencijÄ…, kuriÄ… rasite faile COPYING arba http://www.
<translation>Informacija</translation>
</message>
<message>
- <location line="+77"/>
- <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="-152"/>
+ <location line="-85"/>
<source>Up to date</source>
<translation>Atnaujinta</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Catching up...</source>
<translation>Vejamasi...</translation>
</message>
<message>
- <location line="+124"/>
- <source>Confirm transaction fee</source>
- <translation>Patvirtinti sandorio mokestį</translation>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+130"/>
<source>Sent transaction</source>
<translation>Sandoris nusiųstas</translation>
</message>
@@ -661,17 +678,7 @@ Tipas: %3
Adresas: %4</translation>
</message>
<message>
- <location line="+34"/>
- <source>URI handling</source>
- <translation>URI apdorojimas</translation>
- </message>
- <message>
- <location line="+0"/>
- <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="+45"/>
+ <location line="+69"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation>Piniginė &lt;b&gt;užšifruota&lt;/b&gt; ir šiuo metu &lt;b&gt;atrakinta&lt;/b&gt;</translation>
</message>
@@ -681,7 +688,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 filename="../bitcoin.cpp" line="+110"/>
+ <location filename="../bitcoin.cpp" line="+438"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation type="unfinished"/>
</message>
@@ -689,12 +696,304 @@ Adresas: %4</translation>
<context>
<name>ClientModel</name>
<message>
- <location filename="../clientmodel.cpp" line="+115"/>
+ <location filename="../clientmodel.cpp" line="+119"/>
<source>Network Alert</source>
<translation>Tinklo įspėjimas</translation>
</message>
</context>
<context>
+ <name>CoinControlDialog</name>
+ <message>
+ <location filename="../forms/coincontroldialog.ui" line="+14"/>
+ <source>Coin Control Address Selection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>Quantity:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Bytes:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>Amount:</source>
+ <translation>Suma:</translation>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Priority:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Low Output:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>After Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Change:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+63"/>
+ <source>(un)select all</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Tree mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>List mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>Amount</source>
+ <translation>Suma</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Address</source>
+ <translation>Adresas</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Date</source>
+ <translation>Data</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Confirmations</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Confirmed</source>
+ <translation>Patvirtintas</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../coincontroldialog.cpp" line="+42"/>
+ <source>Copy address</source>
+ <translation>Kopijuoti adresÄ…</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy label</source>
+ <translation>Kopijuoti žymę</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+26"/>
+ <source>Copy amount</source>
+ <translation>Kopijuoti sumÄ…</translation>
+ </message>
+ <message>
+ <location line="-25"/>
+ <source>Copy transaction ID</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Lock unspent</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Unlock unspent</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+22"/>
+ <source>Copy quantity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Copy fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy after fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy bytes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy low output</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy change</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+323"/>
+ <source>highest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>higher</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>high</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>medium-high</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>medium</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>low-medium</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>low</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>lower</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>lowest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>(%1 locked)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+140"/>
+ <source>Dust</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>yes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>no</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>This label turns red, if the transaction size is greater than 1000 bytes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+5"/>
+ <source>This means a fee of at least %1 per kB is required.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-4"/>
+ <source>Can vary +/- 1 byte per input.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Transactions with higher priority are more likely to get included into a block.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>This label turns red, if the priority is smaller than &quot;medium&quot;.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>This label turns red, if any recipient receives an amount smaller than %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+4"/>
+ <source>This means a fee of at least %1 is required.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-3"/>
+ <source>Amounts below 0.546 times the minimum relay fee are shown as dust.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>This label turns red, if the change is smaller than %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
+ <location line="+66"/>
+ <source>(no label)</source>
+ <translation>(nėra žymės)</translation>
+ </message>
+ <message>
+ <location line="-9"/>
+ <source>change from %1 (%2)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>(change)</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>EditAddressDialog</name>
<message>
<location filename="../forms/editaddressdialog.ui" line="+14"/>
@@ -722,7 +1021,7 @@ Adresas: %4</translation>
<translation>&amp;Adresas</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+21"/>
+ <location filename="../editaddressdialog.cpp" line="+28"/>
<source>New receiving address</source>
<translation>Naujas gavimo adresas</translation>
</message>
@@ -765,7 +1064,7 @@ Adresas: %4</translation>
<context>
<name>FreespaceChecker</name>
<message>
- <location filename="../intro.cpp" line="+61"/>
+ <location filename="../intro.cpp" line="+65"/>
<source>A new data directory will be created.</source>
<translation type="unfinished"/>
</message>
@@ -791,15 +1090,19 @@ Adresas: %4</translation>
</message>
</context>
<context>
- <name>GUIUtil::HelpMessageBox</name>
+ <name>HelpMessageDialog</name>
<message>
- <location filename="../guiutil.cpp" line="+558"/>
- <location line="+13"/>
- <source>Bitcoin-Qt</source>
- <translation>Bitcoin-Qt</translation>
+ <location filename="../forms/helpmessagedialog.ui" line="+19"/>
+ <source>Bitcoin Core - Command-line options</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="-13"/>
+ <location filename="../utilitydialog.cpp" line="+38"/>
+ <source>Bitcoin Core</source>
+ <translation>Bitcoin branduolys</translation>
+ </message>
+ <message>
+ <location line="+0"/>
<source>version</source>
<translation>versija</translation>
</message>
@@ -844,21 +1147,21 @@ Adresas: %4</translation>
<message>
<location filename="../forms/intro.ui" line="+14"/>
<source>Welcome</source>
- <translation type="unfinished"/>
+ <translation>Sveiki</translation>
</message>
<message>
<location line="+9"/>
- <source>Welcome to Bitcoin-Qt.</source>
+ <source>Welcome to Bitcoin Core.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+26"/>
- <source>As this is the first time the program is launched, you can choose where Bitcoin-Qt will store its data.</source>
+ <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+10"/>
- <source>Bitcoin-Qt will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
+ <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -872,7 +1175,17 @@ Adresas: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../intro.cpp" line="+105"/>
+ <location filename="../intro.cpp" line="+85"/>
+ <source>Bitcoin</source>
+ <translation>Bitcoin</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error: Specified data directory &quot;%1&quot; can not be created.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+19"/>
<source>Error</source>
<translation>Klaida</translation>
</message>
@@ -888,6 +1201,34 @@ Adresas: %4</translation>
</message>
</context>
<context>
+ <name>OpenURIDialog</name>
+ <message>
+ <location filename="../forms/openuridialog.ui" line="+14"/>
+ <source>Open URI</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Open payment request from URI or file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>URI:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Select payment request file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../openuridialog.cpp" line="+47"/>
+ <source>Select payment request file to open</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OptionsDialog</name>
<message>
<location filename="../forms/optionsdialog.ui" line="+14"/>
@@ -895,7 +1236,7 @@ Adresas: %4</translation>
<translation>Parinktys</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+13"/>
<source>&amp;Main</source>
<translation>&amp;PagrindinÄ—s</translation>
</message>
@@ -920,7 +1261,52 @@ Adresas: %4</translation>
<translation>&amp;Paleisti Bitcoin programÄ… su window sistemos paleidimu</translation>
</message>
<message>
- <location line="+35"/>
+ <location line="+9"/>
+ <source>Size of &amp;database cache</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set database cache size in megabytes (default: 25)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>MB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Number of script &amp;verification threads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Connect to the Bitcoin network through a SOCKS proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Connect through SOCKS proxy (default proxy):</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+224"/>
+ <source>Active command-line options that override above options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
<source>Reset all client options to default.</source>
<translation type="unfinished"/>
</message>
@@ -930,7 +1316,7 @@ Adresas: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="-323"/>
<source>&amp;Network</source>
<translation>&amp;Tinklas</translation>
</message>
@@ -945,32 +1331,17 @@ Adresas: %4</translation>
<translation>Persiųsti prievadą naudojant &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>Jungtis į Bitkoin tinklą per socks proxy (pvz. jungiantis per Tor)</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>&amp;Connect through SOCKS proxy:</source>
- <translation>&amp;Jungtis per SOCKS tarpinį serverį:</translation>
- </message>
- <message>
- <location line="+9"/>
+ <location line="+19"/>
<source>Proxy &amp;IP:</source>
<translation>Tarpinio serverio &amp;IP:</translation>
</message>
<message>
- <location line="+19"/>
- <source>IP address of the proxy (e.g. 127.0.0.1)</source>
- <translation>Tarpinio serverio IP adresas (pvz. 127.0.0.1)</translation>
- </message>
- <message>
- <location line="+7"/>
+ <location line="+32"/>
<source>&amp;Port:</source>
<translation>&amp;Prievadas:</translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+25"/>
<source>Port of the proxy (e.g. 9050)</source>
<translation>Tarpinio serverio preivadas (pvz, 9050)</translation>
</message>
@@ -1045,7 +1416,17 @@ Adresas: %4</translation>
<translation>&amp;Rodyti adresus sandorių sąraše</translation>
</message>
<message>
- <location line="+71"/>
+ <location line="+7"/>
+ <source>Whether to show coin control features or not.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Display coin &amp;control features (experts only)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+136"/>
<source>&amp;OK</source>
<translation>&amp;Gerai</translation>
</message>
@@ -1055,44 +1436,38 @@ Adresas: %4</translation>
<translation>&amp;Atšaukti</translation>
</message>
<message>
- <location line="+10"/>
- <source>&amp;Apply</source>
- <translation>&amp;Pritaikyti</translation>
- </message>
- <message>
- <location filename="../optionsdialog.cpp" line="+58"/>
+ <location filename="../optionsdialog.cpp" line="+67"/>
<source>default</source>
<translation>numatyta</translation>
</message>
<message>
- <location line="+130"/>
- <source>Confirm options reset</source>
+ <location line="+57"/>
+ <source>none</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Some settings may require a client restart to take effect.</source>
+ <location line="+75"/>
+ <source>Confirm options reset</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>Do you want to proceed?</source>
- <translation>Ar norite tęsti?</translation>
+ <location line="+1"/>
+ <location line="+29"/>
+ <source>Client restart required to activate changes.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
- <location line="+9"/>
- <source>Warning</source>
- <translation>Įspėjimas</translation>
+ <location line="-29"/>
+ <source>Client will be shutdown, do you want to proceed?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="-9"/>
- <location line="+9"/>
- <source>This setting will take effect after restarting Bitcoin.</source>
+ <location line="+33"/>
+ <source>This change would require a client restart.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+29"/>
+ <location line="+34"/>
<source>The supplied proxy address is invalid.</source>
<translation>Nurodytas tarpinio serverio adresas negalioja.</translation>
</message>
@@ -1106,22 +1481,22 @@ Adresas: %4</translation>
</message>
<message>
<location line="+50"/>
- <location line="+202"/>
+ <location line="+231"/>
<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="-131"/>
+ <location line="-155"/>
<source>Unconfirmed:</source>
<translation>Nepatvirtinti:</translation>
</message>
<message>
- <location line="-78"/>
+ <location line="-83"/>
<source>Wallet</source>
<translation>PiniginÄ—</translation>
</message>
<message>
- <location line="+49"/>
+ <location line="+51"/>
<source>Confirmed:</source>
<translation>Patvirtinta:</translation>
</message>
@@ -1131,12 +1506,12 @@ Adresas: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="+29"/>
+ <location line="+32"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+16"/>
<source>Immature:</source>
<translation>NepribrendÄ™:</translation>
</message>
@@ -1146,7 +1521,7 @@ Adresas: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+16"/>
<source>Total:</source>
<translation>Viso:</translation>
</message>
@@ -1156,12 +1531,12 @@ Adresas: %4</translation>
<translation>Jūsų balansas</translation>
</message>
<message>
- <location line="+53"/>
+ <location line="+71"/>
<source>&lt;b&gt;Recent transactions&lt;/b&gt;</source>
<translation>&lt;b&gt;Naujausi sandoriai&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../overviewpage.cpp" line="+116"/>
+ <location filename="../overviewpage.cpp" line="+120"/>
<location line="+1"/>
<source>out of sync</source>
<translation>nesinchronizuota</translation>
@@ -1170,7 +1545,8 @@ Adresas: %4</translation>
<context>
<name>PaymentServer</name>
<message>
- <location filename="../paymentserver.cpp" line="+392"/>
+ <location filename="../paymentserver.cpp" line="+403"/>
+ <location line="+13"/>
<source>URI handling</source>
<translation>URI apdorojimas</translation>
</message>
@@ -1180,78 +1556,109 @@ Adresas: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="+69"/>
+ <location line="+96"/>
<source>Requested payment amount of %1 is too small (considered dust).</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
- <location line="+37"/>
+ <location line="-221"/>
+ <location line="+212"/>
+ <location line="+13"/>
+ <location line="+95"/>
+ <location line="+18"/>
+ <location line="+16"/>
<source>Payment request error</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="-353"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Net manager warning</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+1"/>
- <source>Insecure requests to custom payment scripts unsupported</source>
+ <source>Your active proxy doesn&apos;t support SOCKS5, which is required for payment requests via proxy.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+38"/>
+ <location line="+52"/>
+ <source>Payment request fetch URL is invalid: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Payment request file handling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Payment request file can not be read or processed! This can be caused by an invalid payment request file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+73"/>
+ <source>Unverified payment requests to custom payment scripts are unsupported.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+59"/>
<source>Refund from %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
+ <location line="+43"/>
<source>Error communicating with %1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+24"/>
+ <source>Payment request can not be parsed or processed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
<source>Bad response from server %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+32"/>
+ <location line="+33"/>
<source>Payment acknowledged</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-58"/>
- <location line="+30"/>
- <location line="+17"/>
+ <location line="-11"/>
<source>Network request error</source>
- <translation type="unfinished"/>
+ <translation>Tinklo užklausos klaida</translation>
</message>
</context>
<context>
<name>QObject</name>
<message>
- <location filename="../bitcoin.cpp" line="+114"/>
- <location line="+5"/>
- <location filename="../intro.cpp" line="-32"/>
+ <location filename="../bitcoin.cpp" line="+71"/>
+ <location line="+11"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-4"/>
+ <location line="+1"/>
<source>Error: Specified data directory &quot;%1&quot; does not exist.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="-12"/>
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../intro.cpp" line="+1"/>
- <source>Error: Specified data directory &quot;%1&quot; can not be created.</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>QRImageWidget</name>
<message>
- <location filename="../receiverequestdialog.cpp" line="+32"/>
+ <location filename="../receiverequestdialog.cpp" line="+36"/>
<source>&amp;Save Image...</source>
<translation type="unfinished"/>
</message>
@@ -1267,8 +1674,8 @@ Adresas: %4</translation>
</message>
<message>
<location line="+0"/>
- <source>PNG Images (*.png)</source>
- <translation>PNG paveikslÄ—liai (*.png)</translation>
+ <source>PNG Image (*.png)</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1285,15 +1692,16 @@ Adresas: %4</translation>
<location line="+23"/>
<location line="+23"/>
<location line="+36"/>
- <location line="+53"/>
+ <location line="+23"/>
+ <location line="+36"/>
<location line="+23"/>
<location line="+23"/>
- <location filename="../rpcconsole.cpp" line="+352"/>
+ <location filename="../rpcconsole.cpp" line="+359"/>
<source>N/A</source>
<translation>nÄ—ra</translation>
</message>
<message>
- <location line="-217"/>
+ <location line="-223"/>
<source>Client version</source>
<translation>Kliento versija</translation>
</message>
@@ -1303,7 +1711,17 @@ Adresas: %4</translation>
<translation>&amp;Informacija</translation>
</message>
<message>
- <location line="+68"/>
+ <location line="-10"/>
+ <source>Debug window</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+25"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+53"/>
<source>Using OpenSSL version</source>
<translation>Naudojama OpenSSL versija</translation>
</message>
@@ -1319,16 +1737,16 @@ Adresas: %4</translation>
</message>
<message>
<location line="+7"/>
- <source>Number of connections</source>
- <translation>Prisijungimų kiekis</translation>
+ <source>Name</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+23"/>
- <source>On testnet</source>
- <translation>Testnete</translation>
+ <source>Number of connections</source>
+ <translation>Prisijungimų kiekis</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+29"/>
<source>Block chain</source>
<translation>Blokų grandinė</translation>
</message>
@@ -1353,21 +1771,6 @@ Adresas: %4</translation>
<translation>&amp;Atverti</translation>
</message>
<message>
- <location line="+16"/>
- <source>Command-line options</source>
- <translation>KomandinÄ—s eilutÄ—s parametrai</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"/>
- </message>
- <message>
- <location line="+3"/>
- <source>&amp;Show</source>
- <translation>&amp;Rodyti</translation>
- </message>
- <message>
<location line="+24"/>
<source>&amp;Console</source>
<translation>&amp;KonsolÄ—</translation>
@@ -1398,22 +1801,12 @@ Adresas: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="-541"/>
+ <location line="-521"/>
<source>Build date</source>
<translation>Kompiliavimo data</translation>
</message>
<message>
- <location line="-104"/>
- <source>Bitcoin - Debug window</source>
- <translation>Bitcoin - Derinimo langas</translation>
- </message>
- <message>
- <location line="+25"/>
- <source>Bitcoin Core</source>
- <translation>Bitcoin branduolys</translation>
- </message>
- <message>
- <location line="+279"/>
+ <location line="+206"/>
<source>Debug log file</source>
<translation>Derinimo žurnalo failas</translation>
</message>
@@ -1423,7 +1816,7 @@ Adresas: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="+102"/>
+ <location line="+76"/>
<source>Clear console</source>
<translation>IÅ¡valyti konsolÄ™</translation>
</message>
@@ -1443,86 +1836,86 @@ Adresas: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="+128"/>
+ <location line="+122"/>
<source>%1 B</source>
- <translation type="unfinished"/>
+ <translation>%1 B</translation>
</message>
<message>
<location line="+2"/>
<source>%1 KB</source>
- <translation type="unfinished"/>
+ <translation>%1 KB</translation>
</message>
<message>
<location line="+2"/>
<source>%1 MB</source>
- <translation type="unfinished"/>
+ <translation>%1 MB</translation>
</message>
<message>
<location line="+2"/>
<source>%1 GB</source>
- <translation type="unfinished"/>
+ <translation>%1 GB</translation>
</message>
<message>
<location line="+7"/>
<source>%1 m</source>
- <translation type="unfinished"/>
+ <translation>%1 m</translation>
</message>
<message>
<location line="+5"/>
<source>%1 h</source>
- <translation type="unfinished"/>
+ <translation>%1 h</translation>
</message>
<message>
<location line="+2"/>
<source>%1 h %2 m</source>
- <translation type="unfinished"/>
+ <translation>%1 h %2 m</translation>
</message>
</context>
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+22"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
<source>&amp;Amount:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
- <source>The amount to request</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+7"/>
+ <location line="-13"/>
<source>&amp;Label:</source>
<translation>Ž&amp;ymė:</translation>
</message>
<message>
- <location line="+10"/>
- <source>The label to associate with the receiving address</source>
+ <location line="-34"/>
+ <source>&amp;Message:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>&amp;Message:</source>
+ <location line="-17"/>
+ <source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>The message to attach to payment request</source>
+ <location line="+3"/>
+ <source>R&amp;euse an existing receiving address (not recommended)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
- <source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
+ <location line="+27"/>
+ <source>An optional label to associate with the new receiving address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>R&amp;euse an existing receiving address (not recommended)</source>
+ <location line="+7"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+7"/>
- <source>Use this form to request payments. All fields are optional.</source>
+ <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+39"/>
+ <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1540,6 +1933,31 @@ Adresas: %4</translation>
<source>&amp;Request payment</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+47"/>
+ <source>Requested payments</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Show the selected request (does the same as double clicking an entry)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Show</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Remove the selected entries from the list</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Remove</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
@@ -1560,23 +1978,18 @@ Adresas: %4</translation>
</message>
<message>
<location line="+7"/>
- <source>&amp;Copy Image</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+7"/>
<source>&amp;Save Image...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../receiverequestdialog.cpp" line="+58"/>
+ <location filename="../receiverequestdialog.cpp" line="+56"/>
<source>Request payment to %1</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+6"/>
<source>Payment information</source>
- <translation type="unfinished"/>
+ <translation>MokÄ—jimo informacija</translation>
</message>
<message>
<location line="+1"/>
@@ -1615,16 +2028,119 @@ Adresas: %4</translation>
</message>
</context>
<context>
+ <name>RecentRequestsTableModel</name>
+ <message>
+ <location filename="../recentrequeststablemodel.cpp" line="+24"/>
+ <source>Date</source>
+ <translation>Data</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Label</source>
+ <translation>Žymė</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Message</source>
+ <translation>Žinutė</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Amount</source>
+ <translation>Suma</translation>
+ </message>
+ <message>
+ <location line="+38"/>
+ <source>(no label)</source>
+ <translation>(nėra žymės)</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>(no message)</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+140"/>
- <location line="+213"/>
+ <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location line="+80"/>
<source>Send Coins</source>
<translation>Siųsti monetas</translation>
</message>
<message>
- <location line="+50"/>
+ <location line="+76"/>
+ <source>Coin Control Features</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Inputs...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>automatically selected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Insufficient funds!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+89"/>
+ <source>Quantity:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+35"/>
+ <source>Bytes:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Amount:</source>
+ <translation>Suma:</translation>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Priority:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Low Output:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>After Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Change:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+44"/>
+ <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Custom change address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+115"/>
<source>Send to multiple recipients at once</source>
<translation>Siųsti keliems gavėjams vienu metu</translation>
</message>
@@ -1649,12 +2165,7 @@ Adresas: %4</translation>
<translation>Balansas:</translation>
</message>
<message>
- <location line="+10"/>
- <source>123.456 BTC</source>
- <translation>123.456 BTC</translation>
- </message>
- <message>
- <location line="+31"/>
+ <location line="+41"/>
<source>Confirm the send action</source>
<translation>Patvirtinti siuntimo veiksmÄ…</translation>
</message>
@@ -1664,69 +2175,135 @@ Adresas: %4</translation>
<translation>&amp;Siųsti</translation>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-154"/>
+ <location filename="../sendcoinsdialog.cpp" line="-228"/>
<source>Confirm send coins</source>
<translation>Patvirtinti monetų siuntimą</translation>
</message>
<message>
- <location line="-90"/>
+ <location line="-74"/>
<location line="+5"/>
<location line="+5"/>
+ <location line="+4"/>
<source>%1 to %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+26"/>
+ <location line="-136"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation>Įveskite bitkoinų adresą (pvz. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Copy quantity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation>Kopijuoti sumÄ…</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy after fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy bytes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy low output</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy change</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+170"/>
+ <source>Total Amount %1 (= %2)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>or</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+202"/>
<source>The recipient address is not valid, please recheck.</source>
<translation>Negaliojantis gavÄ—jo adresas. Patikrinkite.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The amount to pay must be larger than 0.</source>
<translation>Apmokėjimo suma turi būti didesnė nei 0.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The amount exceeds your balance.</source>
<translation>Suma viršija jūsų balansą.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The total exceeds your balance when the %1 transaction fee is included.</source>
<translation>Jei pridedame sandorio mokestį %1 bendra suma viršija jūsų balansą.</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+3"/>
<source>Duplicate address found, can only send to each address once per send operation.</source>
<translation>Rastas adreso dublikatas.</translation>
</message>
<message>
+ <location line="+3"/>
+ <source>Transaction creation failed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+4"/>
- <source>Error: Transaction creation failed!</source>
+ <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+15"/>
- <source>Are you sure you want to send?</source>
+ <location line="+112"/>
+ <source>Warning: Invalid Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+9"/>
- <source>added as transaction fee</source>
+ <location line="+21"/>
+ <source>(no label)</source>
+ <translation>(nėra žymės)</translation>
+ </message>
+ <message>
+ <location line="-11"/>
+ <source>Warning: Unknown change address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
- <source>Total Amount %1</source>
+ <location line="-366"/>
+ <source>Are you sure you want to send?</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+20"/>
- <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>Klaida: sandoris buvo atmestas.Tai gali įvykti, jei kai kurios monetos iÅ¡ jÅ«sų piniginÄ—je jau buvo panaudotos, pvz. jei naudojote wallet.dat kopijÄ… ir monetos buvo iÅ¡leistos kopijoje, bet nepažymÄ—tos kaip skirtos iÅ¡leisti Äia.</translation>
+ <location line="+9"/>
+ <source>added as transaction fee</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+144"/>
+ <location line="+170"/>
<source>Payment request expired</source>
<translation type="unfinished"/>
</message>
@@ -1739,39 +2316,44 @@ Adresas: %4</translation>
<context>
<name>SendCoinsEntry</name>
<message>
- <location filename="../forms/sendcoinsentry.ui" line="+33"/>
- <location line="+585"/>
+ <location filename="../forms/sendcoinsentry.ui" line="+131"/>
+ <location line="+521"/>
+ <location line="+536"/>
<source>A&amp;mount:</source>
<translation>Su&amp;ma:</translation>
</message>
<message>
- <location line="-572"/>
- <location line="+585"/>
+ <location line="-1152"/>
<source>Pay &amp;To:</source>
<translation>MokÄ—ti &amp;gavÄ—jui:</translation>
</message>
<message>
- <location line="-551"/>
+ <location line="+18"/>
<source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../sendcoinsentry.cpp" line="+28"/>
+ <location filename="../sendcoinsentry.cpp" line="+30"/>
<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>
<message>
- <location filename="../forms/sendcoinsentry.ui" line="-18"/>
+ <location filename="../forms/sendcoinsentry.ui" line="+57"/>
<source>&amp;Label:</source>
<translation>Ž&amp;ymė:</translation>
</message>
<message>
- <location line="+28"/>
+ <location line="-50"/>
<source>Choose previously used address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
+ <location line="-40"/>
+ <source>This is a normal payment.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+50"/>
<source>Alt+A</source>
<translation>Alt+A</translation>
</message>
@@ -1787,16 +2369,45 @@ Adresas: %4</translation>
</message>
<message>
<location line="+7"/>
- <source>Remove this recipient</source>
- <translation>Pašalinti šį gavėją</translation>
+ <location line="+524"/>
+ <location line="+536"/>
+ <source>Remove this entry</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="-1008"/>
+ <source>Message:</source>
+ <translation>Žinutė:</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+958"/>
+ <source>This is a verified payment request.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-991"/>
<source>Enter a label for this address to add it to the list of used addresses</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+465"/>
+ <location line="+459"/>
+ <source>This is an unverified payment request.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+18"/>
+ <location line="+532"/>
+ <source>Pay To:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-498"/>
+ <location line="+536"/>
<source>Memo:</source>
<translation type="unfinished"/>
</message>
@@ -1807,6 +2418,19 @@ Adresas: %4</translation>
</message>
</context>
<context>
+ <name>ShutdownWindow</name>
+ <message>
+ <location filename="../utilitydialog.cpp" line="+48"/>
+ <source>Bitcoin Core is shutting down...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Do not shut down the computer until this window disappears.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>SignVerifyMessageDialog</name>
<message>
<location filename="../forms/signverifymessagedialog.ui" line="+14"/>
@@ -1814,7 +2438,7 @@ Adresas: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+10"/>
<source>&amp;Sign Message</source>
<translation>&amp;Pasirašyti žinutę</translation>
</message>
@@ -1917,7 +2541,7 @@ Adresas: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+27"/>
+ <location filename="../signverifymessagedialog.cpp" line="+29"/>
<location line="+3"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>Įveskite bitkoinų adresą (pvz. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
@@ -1933,7 +2557,7 @@ Adresas: %4</translation>
<translation>Įveskite Bitcoin parašą</translation>
</message>
<message>
- <location line="+85"/>
+ <location line="+84"/>
<location line="+81"/>
<source>The entered address is invalid.</source>
<translation>Įvestas adresas negalioja.</translation>
@@ -2002,9 +2626,14 @@ Adresas: %4</translation>
<context>
<name>SplashScreen</name>
<message>
- <location filename="../splashscreen.cpp" line="+23"/>
- <source>The Bitcoin developers</source>
- <translation>Bitcoin programuotojai</translation>
+ <location filename="../splashscreen.cpp" line="+28"/>
+ <source>Bitcoin Core</source>
+ <translation>Bitcoin branduolys</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>The Bitcoin Core developers</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
@@ -2015,15 +2644,15 @@ Adresas: %4</translation>
<context>
<name>TrafficGraphWidget</name>
<message>
- <location filename="../trafficgraphwidget.cpp" line="+75"/>
+ <location filename="../trafficgraphwidget.cpp" line="+79"/>
<source>KB/s</source>
- <translation type="unfinished"/>
+ <translation>KB/s</translation>
</message>
</context>
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="+22"/>
+ <location filename="../transactiondesc.cpp" line="+28"/>
<source>Open until %1</source>
<translation>Atidaryta iki %1</translation>
</message>
@@ -2096,12 +2725,12 @@ Adresas: %4</translation>
<location line="+12"/>
<location line="+45"/>
<location line="+17"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Credit</source>
<translation>Kreditas</translation>
</message>
<message numerus="yes">
- <location line="-120"/>
+ <location line="-125"/>
<source>matures in %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -2114,12 +2743,12 @@ Adresas: %4</translation>
<location line="+44"/>
<location line="+8"/>
<location line="+15"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Debit</source>
<translation>Debitas</translation>
</message>
<message>
- <location line="-57"/>
+ <location line="-62"/>
<source>Transaction fee</source>
<translation>Sandorio mokestis</translation>
</message>
@@ -2130,11 +2759,12 @@ Adresas: %4</translation>
</message>
<message>
<location line="+6"/>
+ <location line="+9"/>
<source>Message</source>
<translation>Žinutė</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="-7"/>
<source>Comment</source>
<translation>Komentaras</translation>
</message>
@@ -2144,7 +2774,7 @@ Adresas: %4</translation>
<translation>Sandorio ID</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+18"/>
<source>Merchant</source>
<translation type="unfinished"/>
</message>
@@ -2184,7 +2814,7 @@ Adresas: %4</translation>
<translation>netiesa</translation>
</message>
<message>
- <location line="-227"/>
+ <location line="-232"/>
<source>, has not been successfully broadcast yet</source>
<translation>, transliavimas dar nebuvo sÄ—kmingas</translation>
</message>
@@ -2215,7 +2845,7 @@ Adresas: %4</translation>
<context>
<name>TransactionTableModel</name>
<message>
- <location filename="../transactiontablemodel.cpp" line="+227"/>
+ <location filename="../transactiontablemodel.cpp" line="+234"/>
<source>Date</source>
<translation>Data</translation>
</message>
@@ -2234,8 +2864,13 @@ Adresas: %4</translation>
<source>Amount</source>
<translation>Suma</translation>
</message>
+ <message>
+ <location line="+59"/>
+ <source>Immature (%1 confirmations, will be available after %2)</source>
+ <translation type="unfinished"/>
+ </message>
<message numerus="yes">
- <location line="+57"/>
+ <location line="+16"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -2255,17 +2890,13 @@ Adresas: %4</translation>
<translation>Nepatvirtintos (%1 iš %2 patvirtinimų)</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="-22"/>
+ <location line="+25"/>
<source>Confirmed (%1 confirmations)</source>
<translation>Patvirtinta (%1 patvirtinimai)</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"/>
+ <location line="-22"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation>Šis blokas negautas nė vienu iš mazgų ir matomai nepriimtas</translation>
</message>
@@ -2275,7 +2906,7 @@ Adresas: %4</translation>
<translation>IÅ¡gauta bet nepriimta</translation>
</message>
<message>
- <location line="+43"/>
+ <location line="+62"/>
<source>Received with</source>
<translation>Gauta su</translation>
</message>
@@ -2333,7 +2964,7 @@ Adresas: %4</translation>
<context>
<name>TransactionView</name>
<message>
- <location filename="../transactionview.cpp" line="+52"/>
+ <location filename="../transactionview.cpp" line="+57"/>
<location line="+16"/>
<source>All</source>
<translation>Visi</translation>
@@ -2394,12 +3025,12 @@ Adresas: %4</translation>
<translation>Kita</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+6"/>
<source>Enter address or label to search</source>
<translation>Įveskite adresą ar žymę į paiešką</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+6"/>
<source>Min amount</source>
<translation>Minimali suma</translation>
</message>
@@ -2434,17 +3065,37 @@ Adresas: %4</translation>
<translation>Rodyti sandÄ—rio detales</translation>
</message>
<message>
- <location line="+143"/>
- <source>Export Transaction Data</source>
- <translation>Sandorio duomenų eksportavimas</translation>
+ <location line="+142"/>
+ <source>Export Transaction History</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="+19"/>
+ <source>Exporting Failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>There was an error trying to save the transaction history to %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Exporting Successful</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The transaction history was successfully saved to %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-22"/>
<source>Comma separated file (*.csv)</source>
<translation>Kableliais atskirtų duomenų failas (*.csv)</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+9"/>
<source>Confirmed</source>
<translation>Patvirtintas</translation>
</message>
@@ -2479,17 +3130,7 @@ Adresas: %4</translation>
<translation>ID</translation>
</message>
<message>
- <location line="+4"/>
- <source>Error exporting</source>
- <translation>Eksportavimo klaida</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation>Neįmanoma įrašyti į failą %1.</translation>
- </message>
- <message>
- <location line="+100"/>
+ <location line="+107"/>
<source>Range:</source>
<translation>GrupÄ—:</translation>
</message>
@@ -2500,9 +3141,17 @@ Adresas: %4</translation>
</message>
</context>
<context>
+ <name>WalletFrame</name>
+ <message>
+ <location filename="../walletframe.cpp" line="+26"/>
+ <source>No wallet has been loaded.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>WalletModel</name>
<message>
- <location filename="../walletmodel.cpp" line="+218"/>
+ <location filename="../walletmodel.cpp" line="+245"/>
<source>Send Coins</source>
<translation>Siųsti monetas</translation>
</message>
@@ -2510,7 +3159,7 @@ Adresas: %4</translation>
<context>
<name>WalletView</name>
<message>
- <location filename="../walletview.cpp" line="+46"/>
+ <location filename="../walletview.cpp" line="+43"/>
<source>&amp;Export</source>
<translation>&amp;Eksportuoti</translation>
</message>
@@ -2520,65 +3169,60 @@ Adresas: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="+183"/>
+ <location line="+181"/>
<source>Backup Wallet</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
+ <location line="+1"/>
<source>Wallet Data (*.dat)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
+ <location line="+6"/>
<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>
+ <source>There was an error trying to save the wallet data to %1.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+4"/>
- <source>Backup Successful</source>
- <translation>AtsarginÄ— kopija sÄ—kmingai padaryta</translation>
+ <source>The wallet data was successfully saved to %1.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+0"/>
- <source>The wallet data was successfully saved to the new location.</source>
- <translation type="unfinished"/>
+ <source>Backup Successful</source>
+ <translation>AtsarginÄ— kopija sÄ—kmingai padaryta</translation>
</message>
</context>
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+102"/>
- <source>Bitcoin version</source>
- <translation>Bitcoin versija</translation>
- </message>
- <message>
- <location line="+107"/>
+ <location filename="../bitcoinstrings.cpp" line="+221"/>
<source>Usage:</source>
<translation>Naudojimas:</translation>
</message>
<message>
- <location line="-55"/>
+ <location line="-54"/>
<source>List commands</source>
<translation>Komandų sąrašas</translation>
</message>
<message>
- <location line="-13"/>
+ <location line="-14"/>
<source>Get help for a command</source>
<translation>Suteikti pagalba komandai</translation>
</message>
<message>
- <location line="+25"/>
+ <location line="+26"/>
<source>Options:</source>
<translation>Parinktys:</translation>
</message>
<message>
- <location line="+24"/>
+ <location line="+22"/>
<source>Specify configuration file (default: bitcoin.conf)</source>
<translation>Nurodyti konfigūracijos failą (pagal nutylėjimąt: bitcoin.conf)</translation>
</message>
@@ -2598,7 +3242,7 @@ Adresas: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="-28"/>
+ <location line="-26"/>
<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>
@@ -2608,7 +3252,7 @@ Adresas: %4</translation>
<translation>Palaikyti ne daugiau &lt;n&gt; jungÄių kolegoms (pagal nutylÄ—jimÄ…: 125)</translation>
</message>
<message>
- <location line="-49"/>
+ <location line="-51"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation type="unfinished"/>
</message>
@@ -2618,37 +3262,37 @@ Adresas: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<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="-142"/>
+ <location line="-148"/>
<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="-33"/>
+ <location line="-36"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<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="+40"/>
+ <location line="+45"/>
<source>Accept command line and JSON-RPC commands</source>
<translation>Priimti komandinÄ™ eilutÄ™ ir JSON-RPC komandas</translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<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="+40"/>
+ <location line="+39"/>
<source>Use the test network</source>
<translation>Naudoti testavimo tinklÄ…</translation>
</message>
@@ -2658,7 +3302,7 @@ Adresas: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="-87"/>
+ <location line="-95"/>
<source>%s, you must set a rpcpassword in the configuration file:
%s
It is recommended you use the following random password:
@@ -2699,6 +3343,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+4"/>
+ <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</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>
@@ -2713,17 +3362,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+11"/>
- <source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source>
+ <location line="+18"/>
+ <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="+6"/>
- <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
+ <location line="+5"/>
+ <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+3"/>
<source>Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source>
<translation>Įspėjimas: -paytxfee yra nustatytas per didelis. Tai sandorio mokestis, kurį turėsite mokėti, jei siųsite sandorį.</translation>
</message>
@@ -2753,17 +3402,27 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
+ <location line="+9"/>
+ <source>&lt;category&gt; can be:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
<source>Attempt to recover private keys from a corrupt wallet.dat</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
+ <source>Bitcoin Core Daemon</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Bitcoin RPC client version</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
<source>Block creation options:</source>
<translation type="unfinished"/>
</message>
@@ -2773,7 +3432,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Prisijungti tik prie nurodyto mazgo</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
+ <source>Connect through SOCKS proxy</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect to JSON-RPC on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation type="unfinished"/>
</message>
@@ -2789,6 +3453,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+1"/>
+ <source>Do not load the wallet and disable wallet RPC calls</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Do you want to rebuild the block database now?</source>
<translation type="unfinished"/>
</message>
@@ -2810,7 +3479,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<message>
<location line="+4"/>
<source>Error opening block database</source>
- <translation type="unfinished"/>
+ <translation>Klaida atveriant blokų duombazę</translation>
</message>
<message>
<location line="+2"/>
@@ -2825,7 +3494,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<message>
<location line="+1"/>
<source>Error: system error: </source>
- <translation type="unfinished"/>
+ <translation>Klaida: sistemos klaida:</translation>
</message>
<message>
<location line="+1"/>
@@ -2835,12 +3504,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<message>
<location line="+1"/>
<source>Failed to read block info</source>
- <translation type="unfinished"/>
+ <translation>Nepavyko nuskaityti bloko informacijos</translation>
</message>
<message>
<location line="+1"/>
<source>Failed to read block</source>
- <translation type="unfinished"/>
+ <translation>Nepavyko nuskaityti bloko</translation>
</message>
<message>
<location line="+1"/>
@@ -2860,12 +3529,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<message>
<location line="+1"/>
<source>Failed to write block</source>
- <translation type="unfinished"/>
+ <translation>Nepavyko įrašyti bloko</translation>
</message>
<message>
<location line="+1"/>
<source>Failed to write file info</source>
- <translation type="unfinished"/>
+ <translation>Nepavyko įrašyti failo informacijos</translation>
</message>
<message>
<location line="+1"/>
@@ -2883,14 +3552,19 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
+ <source>Fee per kB to add to transactions you send</source>
+ <translation> Ä®traukti mokestį už kB siunÄiamiems sandoriams</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Find peers using DNS lookup (default: 1 unless -connect)</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
<source>Generate coins (default: 0)</source>
- <translation type="unfinished"/>
+ <translation>Generuoti monetas (numatyta: 0)</translation>
</message>
<message>
<location line="+2"/>
@@ -2903,6 +3577,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
+ <location line="+1"/>
+ <source>If &lt;category&gt; is not supplied, output all debugging information.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+2"/>
<source>Incorrect or no genesis block found. Wrong datadir for network?</source>
<translation type="unfinished"/>
@@ -2918,17 +3597,37 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+8"/>
+ <location line="+5"/>
+ <source>Prepend debug output with timestamp (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>RPC client options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Rebuild block chain index from current blk000??.dat files</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+5"/>
+ <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Send command to Bitcoin server</source>
+ <translation>Siųsti komandą Bitcoin serveriui</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Set maximum block size in bytes (default: %d)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
+ <location line="+2"/>
<source>Set the number of threads to service RPC calls (default: 4)</source>
<translation type="unfinished"/>
</message>
@@ -2940,21 +3639,31 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<message>
<location line="+2"/>
<source>Start Bitcoin server</source>
+ <translation>Paleisti Bitcoin serverį</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>This is intended for regression testing tools and app development.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+12"/>
+ <location line="+10"/>
<source>Usage (deprecated, use bitcoin-cli):</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+8"/>
+ <location line="+7"/>
<source>Verifying blocks...</source>
- <translation type="unfinished"/>
+ <translation>Tikrinami blokai...</translation>
</message>
<message>
<location line="+1"/>
<source>Verifying wallet...</source>
+ <translation>Tikrinama piniginÄ—...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Wait for RPC server to start</source>
<translation type="unfinished"/>
</message>
<message>
@@ -2963,27 +3672,47 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+2"/>
+ <source>Wallet options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>You need to rebuild the database using -reindex to change -txindex</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-78"/>
+ <location line="-79"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-98"/>
+ <location line="-105"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+17"/>
+ <location line="+14"/>
+ <source>Output debugging information (default: 0, supplying &lt;category&gt; is optional)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+83"/>
+ <location line="+89"/>
<source>Information</source>
<translation>Informacija</translation>
</message>
@@ -3023,47 +3752,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
- <source>Output extra debugging information. Implies all other -debug* options</source>
- <translation>IÅ¡vesti papildomÄ… derinimo informacijÄ…. Numanomi visi kiti -debug* parametrai</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Output extra network debugging information</source>
- <translation>IÅ¡vesti papildomÄ… tinklo derinimo informacijÄ…</translation>
- </message>
- <message>
- <location line="+2"/>
- <source>Prepend debug output with timestamp</source>
- <translation>Prideėti laiko žymę derinimo rezultatams</translation>
- </message>
- <message>
- <location line="+5"/>
+ <location line="+9"/>
<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>
<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"/>
+ <location line="+4"/>
<source>Send trace/debug info to console instead of debug.log file</source>
<translation>Siųsti atsekimo/derinimo info į konsolę vietoj debug.log failo</translation>
</message>
<message>
- <location line="+1"/>
- <source>Send trace/debug info to debugger</source>
- <translation>Siųsti sekimo/derinimo info derintojui</translation>
- </message>
- <message>
- <location line="+5"/>
- <source>Set maximum block size in bytes (default: 250000)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+6"/>
<source>Set minimum block size in bytes (default: 0)</source>
<translation type="unfinished"/>
</message>
@@ -3085,10 +3784,10 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<message>
<location line="+6"/>
<source>System error: </source>
- <translation type="unfinished"/>
+ <translation>Sistemos klaida:</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Transaction amount too small</source>
<translation type="unfinished"/>
</message>
@@ -3113,32 +3812,32 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Bandymas naudoti UPnP struktūra klausymosi prievadui (default: 1 when listening)</translation>
</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>Vartotojo vardas JSON-RPC jungimuisi</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+7"/>
<source>Warning</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Warning: This version is obsolete, upgrade required!</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+2"/>
+ <source>version</source>
+ <translation>versija</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>wallet.dat corrupt, salvage failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-54"/>
+ <location line="-58"/>
<source>Password for JSON-RPC connections</source>
<translation>Slaptažodis JSON-RPC sujungimams</translation>
</message>
@@ -3148,27 +3847,27 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Leisti JSON-RPC tik iš nurodytų IP adresų</translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<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="-126"/>
+ <location line="-132"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+155"/>
+ <location line="+161"/>
<source>Upgrade wallet to latest format</source>
<translation>Atnaujinti piniginę į naujausią formatą</translation>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<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>
<message>
- <location line="-12"/>
+ <location line="-11"/>
<source>Rescan the block chain for missing wallet transactions</source>
<translation>Ieškoti prarastų piniginės sandorių blokų grandinėje</translation>
</message>
@@ -3178,7 +3877,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Naudoti OpenSSL (https) jungimuisi JSON-RPC </translation>
</message>
<message>
- <location line="-29"/>
+ <location line="-30"/>
<source>Server certificate file (default: server.cert)</source>
<translation>Serverio sertifikato failas (pagal nutylÄ—jimÄ…: server.cert)</translation>
</message>
@@ -3193,27 +3892,22 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Pagelbos žinutė</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Unable to bind to %s on this computer (bind returned error %d, %s)</source>
<translation>Nepavyko susieti Å¡iame kompiuteryje prievado %s (bind returned error %d, %s)</translation>
</message>
<message>
- <location line="-95"/>
- <source>Connect through socks proxy</source>
- <translation>Jungtis per socks tarpinį serverį</translation>
- </message>
- <message>
- <location line="-11"/>
+ <location line="-107"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation>Leisti DNS paiešką sujungimui ir mazgo pridėjimui</translation>
</message>
<message>
- <location line="+58"/>
+ <location line="+60"/>
<source>Loading addresses...</source>
<translation>Užkraunami adresai...</translation>
</message>
<message>
- <location line="-36"/>
+ <location line="-37"/>
<source>Error loading wallet.dat: Wallet corrupted</source>
<translation> wallet.dat pakrovimo klaida, wallet.dat sugadintas</translation>
</message>
@@ -3233,12 +3927,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation> wallet.dat pakrovimo klaida</translation>
</message>
<message>
- <location line="+30"/>
+ <location line="+31"/>
<source>Invalid -proxy address: &apos;%s&apos;</source>
<translation>Neteisingas proxy adresas: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+57"/>
+ <location line="+56"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3248,7 +3942,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3258,7 +3952,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+46"/>
+ <location line="+48"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation>Neteisinga suma -paytxfee=&lt;amount&gt;: &apos;%s&apos;</translation>
</message>
@@ -3278,27 +3972,22 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Įkeliamas blokų indeksas...</translation>
</message>
<message>
- <location line="-60"/>
+ <location line="-62"/>
<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>
<message>
- <location line="-28"/>
+ <location line="-32"/>
<source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source>
<translation>Nepavyko susieti Å¡iame kompiuteryje prievado %s. Bitcoin tikriausiai jau veikia.</translation>
</message>
<message>
- <location line="+69"/>
- <source>Fee per KB to add to transactions you send</source>
- <translation>Ä®traukti mokestį už kB siunÄiamiems sandoriams</translation>
- </message>
- <message>
- <location line="+20"/>
+ <location line="+95"/>
<source>Loading wallet...</source>
<translation>Užkraunama piniginė...</translation>
</message>
<message>
- <location line="-54"/>
+ <location line="-56"/>
<source>Cannot downgrade wallet</source>
<translation type="unfinished"/>
</message>
@@ -3308,7 +3997,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+66"/>
+ <location line="+67"/>
<source>Rescanning...</source>
<translation>Peržiūra</translation>
</message>
@@ -3328,7 +4017,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Klaida</translation>
</message>
<message>
- <location line="-33"/>
+ <location line="-35"/>
<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
index 09cc00b0a8..48ac158b1e 100644
--- a/src/qt/locale/bitcoin_lv_LV.ts
+++ b/src/qt/locale/bitcoin_lv_LV.ts
@@ -3,13 +3,13 @@
<name>AboutDialog</name>
<message>
<location filename="../forms/aboutdialog.ui" line="+14"/>
- <source>About Bitcoin</source>
- <translation>Par Bitcoin</translation>
+ <source>About Bitcoin Core</source>
+ <translation type="unfinished"/>
</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>
+ <source>&lt;b&gt;Bitcoin Core&lt;/b&gt; version</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+57"/>
@@ -22,13 +22,13 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location filename="../aboutdialog.cpp" line="+14"/>
+ <location filename="../utilitydialog.cpp" line="+29"/>
<source>Copyright</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+0"/>
- <source>The Bitcoin developers</source>
+ <source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
</context>
@@ -65,7 +65,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location filename="../addressbookpage.cpp" line="+72"/>
+ <location filename="../addressbookpage.cpp" line="+74"/>
<source>&amp;Copy Address</source>
<translation>&amp;Kopēt adresi</translation>
</message>
@@ -135,7 +135,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>&amp;Rediģēt</translation>
</message>
<message>
- <location line="+197"/>
+ <location line="+194"/>
<source>Export Address List</source>
<translation type="unfinished"/>
</message>
@@ -146,19 +146,19 @@ This product includes software developed by the OpenSSL Project for use in the O
</message>
<message>
<location line="+13"/>
- <source>Error exporting</source>
- <translation>Kļūda eksportējot</translation>
+ <source>Exporting Failed</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation>Nevar ierakstÄ«t failÄ %1.</translation>
+ <location line="+1"/>
+ <source>There was an error trying to save the address list to %1.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<name>AddressTableModel</name>
<message>
- <location filename="../addresstablemodel.cpp" line="+164"/>
+ <location filename="../addresstablemodel.cpp" line="+168"/>
<source>Label</source>
<translation>Nosaukums</translation>
</message>
@@ -196,7 +196,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>JaunÄ parole vÄ“lreiz</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="+34"/>
+ <location filename="../askpassphrasedialog.cpp" line="+40"/>
<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>
@@ -317,22 +317,27 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+250"/>
+ <location filename="../bitcoingui.cpp" line="+295"/>
<source>Sign &amp;message...</source>
<translation>Parakstīt &amp;ziņojumu...</translation>
</message>
<message>
- <location line="+254"/>
+ <location line="+335"/>
<source>Synchronizing with network...</source>
<translation>SinhronizÄcija ar tÄ«klu...</translation>
</message>
<message>
- <location line="-324"/>
+ <location line="-407"/>
<source>&amp;Overview</source>
<translation>&amp;PÄrskats</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="-137"/>
+ <source>Node</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+138"/>
<source>Show general overview of wallet</source>
<translation>RÄdÄ«t vispÄrÄ“ju maciņa pÄrskatu</translation>
</message>
@@ -347,7 +352,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Skatīt transakciju vēsturi</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>E&amp;xit</source>
<translation>&amp;Iziet</translation>
</message>
@@ -393,7 +398,22 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>&amp;Mainīt paroli</translation>
</message>
<message>
- <location line="+259"/>
+ <location line="+10"/>
+ <source>&amp;Sending addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Receiving addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open &amp;URI...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+325"/>
<source>Importing blocks from disk...</source>
<translation type="unfinished"/>
</message>
@@ -403,12 +423,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="-322"/>
+ <location line="-405"/>
<source>Send coins to a Bitcoin address</source>
<translation>Nosūtīt bitkoinus uz Bitcoin adresi</translation>
</message>
<message>
- <location line="+47"/>
+ <location line="+49"/>
<source>Modify configuration options for Bitcoin</source>
<translation>MainÄ«t Bitcoin konfigurÄcijas uzstÄdÄ«jumus</translation>
</message>
@@ -438,20 +458,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>&amp;PÄrbaudÄ«t ziņojumu...</translation>
</message>
<message>
- <location line="-180"/>
- <location line="+6"/>
- <location line="+513"/>
+ <location line="+430"/>
<source>Bitcoin</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-519"/>
- <location line="+6"/>
+ <location line="-643"/>
<source>Wallet</source>
<translation>Maciņš</translation>
</message>
<message>
- <location line="+109"/>
+ <location line="+146"/>
<source>&amp;Send</source>
<translation type="unfinished"/>
</message>
@@ -461,13 +478,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+28"/>
- <location line="+2"/>
- <source>&amp;About Bitcoin</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+14"/>
+ <location line="+46"/>
<location line="+2"/>
<source>&amp;Show / Hide</source>
<translation type="unfinished"/>
@@ -493,64 +504,80 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+35"/>
+ <location line="+48"/>
<source>&amp;File</source>
<translation>&amp;Fails</translation>
</message>
<message>
- <location line="+10"/>
+ <location line="+14"/>
<source>&amp;Settings</source>
<translation>&amp;UzstÄdÄ«jumi</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>&amp;Help</source>
<translation>&amp;Palīdzība</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+15"/>
<source>Tabs toolbar</source>
<translation>Ciļņu rīkjosla</translation>
</message>
<message>
- <location line="-235"/>
- <location line="+294"/>
+ <location line="-284"/>
+ <location line="+376"/>
<source>[testnet]</source>
<translation>[testnet]</translation>
</message>
<message>
- <location line="-177"/>
+ <location line="-401"/>
+ <source>Bitcoin Core</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+163"/>
<source>Request payments (generates QR codes and bitcoin: URIs)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+63"/>
- <source>&amp;Used sending addresses...</source>
+ <location line="+29"/>
+ <location line="+2"/>
+ <source>&amp;About Bitcoin Core</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="+35"/>
<source>Show the list of used sending addresses and labels</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Used &amp;receiving addresses...</source>
+ <location line="+2"/>
+ <source>Show the list of used receiving addresses and labels</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open a bitcoin: URI or payment request</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Command-line options</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
- <source>Show the list of used receiving addresses and labels</source>
+ <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+106"/>
+ <location line="+159"/>
<location line="+5"/>
<source>Bitcoin client</source>
<translation>Bitcoin klients</translation>
</message>
<message numerus="yes">
- <location line="+120"/>
+ <location line="+142"/>
<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>
@@ -570,7 +597,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+20"/>
+ <location line="+23"/>
<source>%n hour(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -590,7 +617,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
+ <location line="+21"/>
<source>Last received block was generated %1 ago.</source>
<translation type="unfinished"/>
</message>
@@ -615,27 +642,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+77"/>
- <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="-152"/>
+ <location line="-85"/>
<source>Up to date</source>
<translation>Sinhronizēts</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Catching up...</source>
<translation>Sinhronizējos...</translation>
</message>
<message>
- <location line="+124"/>
- <source>Confirm transaction fee</source>
- <translation>ApstiprinÄt transakcijas maksu</translation>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+130"/>
<source>Sent transaction</source>
<translation>Transakcija nosūtīta</translation>
</message>
@@ -658,17 +675,7 @@ Adrese: %4
</translation>
</message>
<message>
- <location line="+34"/>
- <source>URI handling</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+0"/>
- <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="+45"/>
+ <location line="+69"/>
<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>
@@ -678,7 +685,7 @@ Adrese: %4
<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="+110"/>
+ <location filename="../bitcoin.cpp" line="+438"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation type="unfinished"/>
</message>
@@ -686,12 +693,304 @@ Adrese: %4
<context>
<name>ClientModel</name>
<message>
- <location filename="../clientmodel.cpp" line="+115"/>
+ <location filename="../clientmodel.cpp" line="+119"/>
<source>Network Alert</source>
<translation>TÄ«kla brÄ«dinÄjums</translation>
</message>
</context>
<context>
+ <name>CoinControlDialog</name>
+ <message>
+ <location filename="../forms/coincontroldialog.ui" line="+14"/>
+ <source>Coin Control Address Selection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>Quantity:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Bytes:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>Amount:</source>
+ <translation>Daudzums:</translation>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Priority:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Low Output:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>After Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Change:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+63"/>
+ <source>(un)select all</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Tree mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>List mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>Amount</source>
+ <translation>Daudzums</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Address</source>
+ <translation>Adrese</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Date</source>
+ <translation>Datums</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Confirmations</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Confirmed</source>
+ <translation>ApstiprinÄts</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../coincontroldialog.cpp" line="+42"/>
+ <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"/>
+ <location line="+26"/>
+ <source>Copy amount</source>
+ <translation>Kopēt daudzumu</translation>
+ </message>
+ <message>
+ <location line="-25"/>
+ <source>Copy transaction ID</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Lock unspent</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Unlock unspent</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+22"/>
+ <source>Copy quantity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Copy fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy after fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy bytes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy low output</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy change</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+323"/>
+ <source>highest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>higher</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>high</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>medium-high</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>medium</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>low-medium</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>low</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>lower</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>lowest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>(%1 locked)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+140"/>
+ <source>Dust</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>yes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>no</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>This label turns red, if the transaction size is greater than 1000 bytes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+5"/>
+ <source>This means a fee of at least %1 per kB is required.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-4"/>
+ <source>Can vary +/- 1 byte per input.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Transactions with higher priority are more likely to get included into a block.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>This label turns red, if the priority is smaller than &quot;medium&quot;.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>This label turns red, if any recipient receives an amount smaller than %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+4"/>
+ <source>This means a fee of at least %1 is required.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-3"/>
+ <source>Amounts below 0.546 times the minimum relay fee are shown as dust.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>This label turns red, if the change is smaller than %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
+ <location line="+66"/>
+ <source>(no label)</source>
+ <translation>(bez nosaukuma)</translation>
+ </message>
+ <message>
+ <location line="-9"/>
+ <source>change from %1 (%2)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>(change)</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>EditAddressDialog</name>
<message>
<location filename="../forms/editaddressdialog.ui" line="+14"/>
@@ -719,7 +1018,7 @@ Adrese: %4
<translation>&amp;Adrese</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+21"/>
+ <location filename="../editaddressdialog.cpp" line="+28"/>
<source>New receiving address</source>
<translation>Jauna saņemšanas adrese</translation>
</message>
@@ -762,7 +1061,7 @@ Adrese: %4
<context>
<name>FreespaceChecker</name>
<message>
- <location filename="../intro.cpp" line="+61"/>
+ <location filename="../intro.cpp" line="+65"/>
<source>A new data directory will be created.</source>
<translation type="unfinished"/>
</message>
@@ -788,15 +1087,19 @@ Adrese: %4
</message>
</context>
<context>
- <name>GUIUtil::HelpMessageBox</name>
+ <name>HelpMessageDialog</name>
<message>
- <location filename="../guiutil.cpp" line="+558"/>
- <location line="+13"/>
- <source>Bitcoin-Qt</source>
- <translation>Bitcoin-Qt</translation>
+ <location filename="../forms/helpmessagedialog.ui" line="+19"/>
+ <source>Bitcoin Core - Command-line options</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="-13"/>
+ <location filename="../utilitydialog.cpp" line="+38"/>
+ <source>Bitcoin Core</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
<source>version</source>
<translation>versija</translation>
</message>
@@ -845,17 +1148,17 @@ Adrese: %4
</message>
<message>
<location line="+9"/>
- <source>Welcome to Bitcoin-Qt.</source>
+ <source>Welcome to Bitcoin Core.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+26"/>
- <source>As this is the first time the program is launched, you can choose where Bitcoin-Qt will store its data.</source>
+ <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+10"/>
- <source>Bitcoin-Qt will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
+ <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -869,7 +1172,17 @@ Adrese: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../intro.cpp" line="+105"/>
+ <location filename="../intro.cpp" line="+85"/>
+ <source>Bitcoin</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error: Specified data directory &quot;%1&quot; can not be created.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+19"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
@@ -885,6 +1198,34 @@ Adrese: %4
</message>
</context>
<context>
+ <name>OpenURIDialog</name>
+ <message>
+ <location filename="../forms/openuridialog.ui" line="+14"/>
+ <source>Open URI</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Open payment request from URI or file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>URI:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Select payment request file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../openuridialog.cpp" line="+47"/>
+ <source>Select payment request file to open</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OptionsDialog</name>
<message>
<location filename="../forms/optionsdialog.ui" line="+14"/>
@@ -892,7 +1233,7 @@ Adrese: %4
<translation>Iespējas</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+13"/>
<source>&amp;Main</source>
<translation>&amp;Galvenais</translation>
</message>
@@ -917,7 +1258,52 @@ Adrese: %4
<translation>&amp;SÄkt Bitcoin reizÄ“ ar sistÄ“mu</translation>
</message>
<message>
- <location line="+35"/>
+ <location line="+9"/>
+ <source>Size of &amp;database cache</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <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="+13"/>
+ <source>MB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Number of script &amp;verification threads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Connect to the Bitcoin network through a SOCKS proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Connect through SOCKS proxy (default proxy):</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+224"/>
+ <source>Active command-line options that override above options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
<source>Reset all client options to default.</source>
<translation type="unfinished"/>
</message>
@@ -927,7 +1313,7 @@ Adrese: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="-323"/>
<source>&amp;Network</source>
<translation>&amp;TÄ«kls</translation>
</message>
@@ -942,32 +1328,17 @@ Adrese: %4
<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"/>
+ <location line="+19"/>
<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"/>
+ <location line="+32"/>
<source>&amp;Port:</source>
<translation>&amp;Ports:</translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+25"/>
<source>Port of the proxy (e.g. 9050)</source>
<translation>Proxy ports (piem. 9050)</translation>
</message>
@@ -1042,7 +1413,17 @@ Adrese: %4
<translation>&amp;AttÄ“lot adreses transakciju sarakstÄ</translation>
</message>
<message>
- <location line="+71"/>
+ <location line="+7"/>
+ <source>Whether to show coin control features or not.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Display coin &amp;control features (experts only)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+136"/>
<source>&amp;OK</source>
<translation>&amp;OK</translation>
</message>
@@ -1052,44 +1433,38 @@ Adrese: %4
<translation>&amp;Atcelt</translation>
</message>
<message>
- <location line="+10"/>
- <source>&amp;Apply</source>
- <translation>&amp;Pielietot</translation>
- </message>
- <message>
- <location filename="../optionsdialog.cpp" line="+58"/>
+ <location filename="../optionsdialog.cpp" line="+67"/>
<source>default</source>
<translation>pēc noklusēšanas</translation>
</message>
<message>
- <location line="+130"/>
- <source>Confirm options reset</source>
+ <location line="+57"/>
+ <source>none</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Some settings may require a client restart to take effect.</source>
+ <location line="+75"/>
+ <source>Confirm options reset</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>Do you want to proceed?</source>
+ <location line="+1"/>
+ <location line="+29"/>
+ <source>Client restart required to activate changes.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
- <location line="+9"/>
- <source>Warning</source>
- <translation>BrÄ«dinÄjums</translation>
+ <location line="-29"/>
+ <source>Client will be shutdown, do you want to proceed?</source>
+ <translation type="unfinished"/>
</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>
+ <location line="+33"/>
+ <source>This change would require a client restart.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+29"/>
+ <location line="+34"/>
<source>The supplied proxy address is invalid.</source>
<translation>NorÄdÄ«tÄ proxy adrese nav derÄ«ga.</translation>
</message>
@@ -1103,22 +1478,22 @@ Adrese: %4
</message>
<message>
<location line="+50"/>
- <location line="+202"/>
+ <location line="+231"/>
<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="-131"/>
+ <location line="-155"/>
<source>Unconfirmed:</source>
<translation>NeapstiprinÄtas:</translation>
</message>
<message>
- <location line="-78"/>
+ <location line="-83"/>
<source>Wallet</source>
<translation>Maciņš</translation>
</message>
<message>
- <location line="+49"/>
+ <location line="+51"/>
<source>Confirmed:</source>
<translation type="unfinished"/>
</message>
@@ -1128,12 +1503,12 @@ Adrese: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+29"/>
+ <location line="+32"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+16"/>
<source>Immature:</source>
<translation type="unfinished"/>
</message>
@@ -1143,7 +1518,7 @@ Adrese: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+16"/>
<source>Total:</source>
<translation type="unfinished"/>
</message>
@@ -1153,12 +1528,12 @@ Adrese: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+53"/>
+ <location line="+71"/>
<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 filename="../overviewpage.cpp" line="+116"/>
+ <location filename="../overviewpage.cpp" line="+120"/>
<location line="+1"/>
<source>out of sync</source>
<translation>nav sinhronizēts</translation>
@@ -1167,7 +1542,8 @@ Adrese: %4
<context>
<name>PaymentServer</name>
<message>
- <location filename="../paymentserver.cpp" line="+392"/>
+ <location filename="../paymentserver.cpp" line="+403"/>
+ <location line="+13"/>
<source>URI handling</source>
<translation type="unfinished"/>
</message>
@@ -1177,45 +1553,82 @@ Adrese: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+69"/>
+ <location line="+96"/>
<source>Requested payment amount of %1 is too small (considered dust).</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
- <location line="+37"/>
+ <location line="-221"/>
+ <location line="+212"/>
+ <location line="+13"/>
+ <location line="+95"/>
+ <location line="+18"/>
+ <location line="+16"/>
<source>Payment request error</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="-353"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Net manager warning</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+1"/>
- <source>Insecure requests to custom payment scripts unsupported</source>
+ <source>Your active proxy doesn&apos;t support SOCKS5, which is required for payment requests via proxy.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+38"/>
+ <location line="+52"/>
+ <source>Payment request fetch URL is invalid: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Payment request file handling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Payment request file can not be read or processed! This can be caused by an invalid payment request file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+73"/>
+ <source>Unverified payment requests to custom payment scripts are unsupported.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+59"/>
<source>Refund from %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
+ <location line="+43"/>
<source>Error communicating with %1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+24"/>
+ <source>Payment request can not be parsed or processed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
<source>Bad response from server %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+32"/>
+ <location line="+33"/>
<source>Payment acknowledged</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-58"/>
- <location line="+30"/>
- <location line="+17"/>
+ <location line="-11"/>
<source>Network request error</source>
<translation type="unfinished"/>
</message>
@@ -1223,32 +1636,26 @@ Adrese: %4
<context>
<name>QObject</name>
<message>
- <location filename="../bitcoin.cpp" line="+114"/>
- <location line="+5"/>
- <location filename="../intro.cpp" line="-32"/>
+ <location filename="../bitcoin.cpp" line="+71"/>
+ <location line="+11"/>
<source>Bitcoin</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-4"/>
+ <location line="+1"/>
<source>Error: Specified data directory &quot;%1&quot; does not exist.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="-12"/>
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../intro.cpp" line="+1"/>
- <source>Error: Specified data directory &quot;%1&quot; can not be created.</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>QRImageWidget</name>
<message>
- <location filename="../receiverequestdialog.cpp" line="+32"/>
+ <location filename="../receiverequestdialog.cpp" line="+36"/>
<source>&amp;Save Image...</source>
<translation type="unfinished"/>
</message>
@@ -1264,8 +1671,8 @@ Adrese: %4
</message>
<message>
<location line="+0"/>
- <source>PNG Images (*.png)</source>
- <translation>PNG attēli (*.png)</translation>
+ <source>PNG Image (*.png)</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1282,15 +1689,16 @@ Adrese: %4
<location line="+23"/>
<location line="+23"/>
<location line="+36"/>
- <location line="+53"/>
<location line="+23"/>
+ <location line="+36"/>
<location line="+23"/>
- <location filename="../rpcconsole.cpp" line="+352"/>
+ <location line="+23"/>
+ <location filename="../rpcconsole.cpp" line="+359"/>
<source>N/A</source>
<translation>N/A</translation>
</message>
<message>
- <location line="-217"/>
+ <location line="-223"/>
<source>Client version</source>
<translation>Klienta versija</translation>
</message>
@@ -1300,7 +1708,17 @@ Adrese: %4
<translation>&amp;InformÄcija</translation>
</message>
<message>
- <location line="+68"/>
+ <location line="-10"/>
+ <source>Debug window</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+25"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+53"/>
<source>Using OpenSSL version</source>
<translation type="unfinished"/>
</message>
@@ -1316,16 +1734,16 @@ Adrese: %4
</message>
<message>
<location line="+7"/>
- <source>Number of connections</source>
- <translation>Savienojumu skaits</translation>
+ <source>Name</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+23"/>
- <source>On testnet</source>
- <translation>Testa tÄ«klÄ</translation>
+ <source>Number of connections</source>
+ <translation>Savienojumu skaits</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+29"/>
<source>Block chain</source>
<translation>Bloku virkne</translation>
</message>
@@ -1350,21 +1768,6 @@ Adrese: %4
<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>
@@ -1395,22 +1798,12 @@ Adrese: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-541"/>
+ <location line="-521"/>
<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"/>
+ <location line="+206"/>
<source>Debug log file</source>
<translation type="unfinished"/>
</message>
@@ -1420,7 +1813,7 @@ Adrese: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+102"/>
+ <location line="+76"/>
<source>Clear console</source>
<translation>Notīrīt konsoli</translation>
</message>
@@ -1440,7 +1833,7 @@ Adrese: %4
<translation>Ierakstiet &lt;b&gt;help&lt;/b&gt; lai iegūtu pieejamo komandu sarakstu.</translation>
</message>
<message>
- <location line="+128"/>
+ <location line="+122"/>
<source>%1 B</source>
<translation type="unfinished"/>
</message>
@@ -1478,48 +1871,48 @@ Adrese: %4
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+22"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
<source>&amp;Amount:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
- <source>The amount to request</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+7"/>
+ <location line="-13"/>
<source>&amp;Label:</source>
<translation>&amp;Nosaukums:</translation>
</message>
<message>
- <location line="+10"/>
- <source>The label to associate with the receiving address</source>
+ <location line="-34"/>
+ <source>&amp;Message:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>&amp;Message:</source>
+ <location line="-17"/>
+ <source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>The message to attach to payment request</source>
+ <location line="+3"/>
+ <source>R&amp;euse an existing receiving address (not recommended)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
- <source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
+ <location line="+27"/>
+ <source>An optional label to associate with the new receiving address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>R&amp;euse an existing receiving address (not recommended)</source>
+ <location line="+7"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+7"/>
- <source>Use this form to request payments. All fields are optional.</source>
+ <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+39"/>
+ <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1537,6 +1930,31 @@ Adrese: %4
<source>&amp;Request payment</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+47"/>
+ <source>Requested payments</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Show the selected request (does the same as double clicking an entry)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Show</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Remove the selected entries from the list</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Remove</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
@@ -1557,16 +1975,11 @@ Adrese: %4
</message>
<message>
<location line="+7"/>
- <source>&amp;Copy Image</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+7"/>
<source>&amp;Save Image...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../receiverequestdialog.cpp" line="+58"/>
+ <location filename="../receiverequestdialog.cpp" line="+56"/>
<source>Request payment to %1</source>
<translation type="unfinished"/>
</message>
@@ -1612,16 +2025,119 @@ Adrese: %4
</message>
</context>
<context>
+ <name>RecentRequestsTableModel</name>
+ <message>
+ <location filename="../recentrequeststablemodel.cpp" line="+24"/>
+ <source>Date</source>
+ <translation>Datums</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Label</source>
+ <translation>Nosaukums</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Amount</source>
+ <translation>Daudzums</translation>
+ </message>
+ <message>
+ <location line="+38"/>
+ <source>(no label)</source>
+ <translation>(bez nosaukuma)</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>(no message)</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+140"/>
- <location line="+213"/>
+ <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location line="+80"/>
<source>Send Coins</source>
<translation>Sūtīt bitkoinus</translation>
</message>
<message>
- <location line="+50"/>
+ <location line="+76"/>
+ <source>Coin Control Features</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Inputs...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>automatically selected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Insufficient funds!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+89"/>
+ <source>Quantity:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+35"/>
+ <source>Bytes:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Amount:</source>
+ <translation>Daudzums:</translation>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Priority:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Low Output:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>After Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Change:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+44"/>
+ <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Custom change address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+115"/>
<source>Send to multiple recipients at once</source>
<translation>SÅ«tÄ«t vairÄkiem saņēmÄ“jiem uzreiz</translation>
</message>
@@ -1646,12 +2162,7 @@ Adrese: %4
<translation>Bilance:</translation>
</message>
<message>
- <location line="+10"/>
- <source>123.456 BTC</source>
- <translation>123,456 BTC</translation>
- </message>
- <message>
- <location line="+31"/>
+ <location line="+41"/>
<source>Confirm the send action</source>
<translation>ApstiprinÄt nosÅ«tÄ«Å¡anu</translation>
</message>
@@ -1661,69 +2172,135 @@ Adrese: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-154"/>
+ <location filename="../sendcoinsdialog.cpp" line="-228"/>
<source>Confirm send coins</source>
<translation>ApstiprinÄt bitkoinu sÅ«tÄ«Å¡anu</translation>
</message>
<message>
- <location line="-90"/>
+ <location line="-74"/>
<location line="+5"/>
<location line="+5"/>
+ <location line="+4"/>
<source>%1 to %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+26"/>
+ <location line="-136"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation>Ierakstiet Bitcoin adresi (piem. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Copy quantity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation>Kopēt daudzumu</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy after fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy bytes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy low output</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy change</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+170"/>
+ <source>Total Amount %1 (= %2)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>or</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+202"/>
<source>The recipient address is not valid, please recheck.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<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="+4"/>
+ <location line="+3"/>
<source>The amount exceeds your balance.</source>
<translation>Daudzums pÄrsniedz pieejamo.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<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="+5"/>
+ <location line="+3"/>
<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="+3"/>
+ <source>Transaction creation failed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+4"/>
- <source>Error: Transaction creation failed!</source>
+ <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+15"/>
- <source>Are you sure you want to send?</source>
+ <location line="+112"/>
+ <source>Warning: Invalid Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+9"/>
- <source>added as transaction fee</source>
+ <location line="+21"/>
+ <source>(no label)</source>
+ <translation>(bez nosaukuma)</translation>
+ </message>
+ <message>
+ <location line="-11"/>
+ <source>Warning: Unknown change address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
- <source>Total Amount %1</source>
+ <location line="-366"/>
+ <source>Are you sure you want to send?</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+20"/>
- <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>
+ <location line="+9"/>
+ <source>added as transaction fee</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+144"/>
+ <location line="+170"/>
<source>Payment request expired</source>
<translation type="unfinished"/>
</message>
@@ -1736,39 +2313,44 @@ Adrese: %4
<context>
<name>SendCoinsEntry</name>
<message>
- <location filename="../forms/sendcoinsentry.ui" line="+33"/>
- <location line="+585"/>
+ <location filename="../forms/sendcoinsentry.ui" line="+131"/>
+ <location line="+521"/>
+ <location line="+536"/>
<source>A&amp;mount:</source>
<translation>Apjo&amp;ms</translation>
</message>
<message>
- <location line="-572"/>
- <location line="+585"/>
+ <location line="-1152"/>
<source>Pay &amp;To:</source>
<translation>&amp;Saņēmējs:</translation>
</message>
<message>
- <location line="-551"/>
+ <location line="+18"/>
<source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../sendcoinsentry.cpp" line="+28"/>
+ <location filename="../sendcoinsentry.cpp" line="+30"/>
<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 filename="../forms/sendcoinsentry.ui" line="-18"/>
+ <location filename="../forms/sendcoinsentry.ui" line="+57"/>
<source>&amp;Label:</source>
<translation>&amp;Nosaukums:</translation>
</message>
<message>
- <location line="+28"/>
+ <location line="-50"/>
<source>Choose previously used address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
+ <location line="-40"/>
+ <source>This is a normal payment.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+50"/>
<source>Alt+A</source>
<translation>Alt+A</translation>
</message>
@@ -1784,16 +2366,45 @@ Adrese: %4
</message>
<message>
<location line="+7"/>
- <source>Remove this recipient</source>
- <translation>Dzēst šo saņēmēju</translation>
+ <location line="+524"/>
+ <location line="+536"/>
+ <source>Remove this entry</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="-1008"/>
+ <source>Message:</source>
+ <translation>Ziņojums:</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+958"/>
+ <source>This is a verified payment request.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-991"/>
<source>Enter a label for this address to add it to the list of used addresses</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+465"/>
+ <location line="+459"/>
+ <source>This is an unverified payment request.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+18"/>
+ <location line="+532"/>
+ <source>Pay To:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-498"/>
+ <location line="+536"/>
<source>Memo:</source>
<translation type="unfinished"/>
</message>
@@ -1804,6 +2415,19 @@ Adrese: %4
</message>
</context>
<context>
+ <name>ShutdownWindow</name>
+ <message>
+ <location filename="../utilitydialog.cpp" line="+48"/>
+ <source>Bitcoin Core is shutting down...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Do not shut down the computer until this window disappears.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>SignVerifyMessageDialog</name>
<message>
<location filename="../forms/signverifymessagedialog.ui" line="+14"/>
@@ -1811,7 +2435,7 @@ Adrese: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+10"/>
<source>&amp;Sign Message</source>
<translation type="unfinished"/>
</message>
@@ -1914,7 +2538,7 @@ Adrese: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+27"/>
+ <location filename="../signverifymessagedialog.cpp" line="+29"/>
<location line="+3"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>Ierakstiet Bitcoin adresi (piem. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
@@ -1930,7 +2554,7 @@ Adrese: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+85"/>
+ <location line="+84"/>
<location line="+81"/>
<source>The entered address is invalid.</source>
<translation type="unfinished"/>
@@ -1999,8 +2623,13 @@ Adrese: %4
<context>
<name>SplashScreen</name>
<message>
- <location filename="../splashscreen.cpp" line="+23"/>
- <source>The Bitcoin developers</source>
+ <location filename="../splashscreen.cpp" line="+28"/>
+ <source>Bitcoin Core</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
<message>
@@ -2012,7 +2641,7 @@ Adrese: %4
<context>
<name>TrafficGraphWidget</name>
<message>
- <location filename="../trafficgraphwidget.cpp" line="+75"/>
+ <location filename="../trafficgraphwidget.cpp" line="+79"/>
<source>KB/s</source>
<translation type="unfinished"/>
</message>
@@ -2020,7 +2649,7 @@ Adrese: %4
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="+22"/>
+ <location filename="../transactiondesc.cpp" line="+28"/>
<source>Open until %1</source>
<translation>Atvērts līdz %1</translation>
</message>
@@ -2093,12 +2722,12 @@ Adrese: %4
<location line="+12"/>
<location line="+45"/>
<location line="+17"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Credit</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="-120"/>
+ <location line="-125"/>
<source>matures in %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -2111,12 +2740,12 @@ Adrese: %4
<location line="+44"/>
<location line="+8"/>
<location line="+15"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Debit</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-57"/>
+ <location line="-62"/>
<source>Transaction fee</source>
<translation type="unfinished"/>
</message>
@@ -2127,11 +2756,12 @@ Adrese: %4
</message>
<message>
<location line="+6"/>
+ <location line="+9"/>
<source>Message</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="-7"/>
<source>Comment</source>
<translation type="unfinished"/>
</message>
@@ -2141,7 +2771,7 @@ Adrese: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+18"/>
<source>Merchant</source>
<translation type="unfinished"/>
</message>
@@ -2181,7 +2811,7 @@ Adrese: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-227"/>
+ <location line="-232"/>
<source>, has not been successfully broadcast yet</source>
<translation>, vēl nav veiksmīgi izziņots</translation>
</message>
@@ -2212,7 +2842,7 @@ Adrese: %4
<context>
<name>TransactionTableModel</name>
<message>
- <location filename="../transactiontablemodel.cpp" line="+227"/>
+ <location filename="../transactiontablemodel.cpp" line="+234"/>
<source>Date</source>
<translation>Datums</translation>
</message>
@@ -2231,8 +2861,13 @@ Adrese: %4
<source>Amount</source>
<translation>Daudzums</translation>
</message>
+ <message>
+ <location line="+59"/>
+ <source>Immature (%1 confirmations, will be available after %2)</source>
+ <translation type="unfinished"/>
+ </message>
<message numerus="yes">
- <location line="+57"/>
+ <location line="+16"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -2252,17 +2887,13 @@ Adrese: %4
<translation>Nav apstiprinÄts (%1 no %2 apstiprinÄjumu)</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="-22"/>
+ <location line="+25"/>
<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"/>
+ <location line="-22"/>
<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>
@@ -2272,7 +2903,7 @@ Adrese: %4
<translation>Ä¢enerÄ“ts, taÄu nav akceptÄ“ts</translation>
</message>
<message>
- <location line="+43"/>
+ <location line="+62"/>
<source>Received with</source>
<translation>Saņemts ar</translation>
</message>
@@ -2330,7 +2961,7 @@ Adrese: %4
<context>
<name>TransactionView</name>
<message>
- <location filename="../transactionview.cpp" line="+52"/>
+ <location filename="../transactionview.cpp" line="+57"/>
<location line="+16"/>
<source>All</source>
<translation>Visi</translation>
@@ -2391,12 +3022,12 @@ Adrese: %4
<translation>Cits</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+6"/>
<source>Enter address or label to search</source>
<translation>Ierakstiet meklējamo nosaukumu vai adresi</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+6"/>
<source>Min amount</source>
<translation>MinimÄlais daudzums</translation>
</message>
@@ -2431,17 +3062,37 @@ Adrese: %4
<translation>RÄdÄ«t transakcijas detaļas</translation>
</message>
<message>
- <location line="+143"/>
- <source>Export Transaction Data</source>
- <translation>Eksportēt transakcijas datus</translation>
+ <location line="+142"/>
+ <source>Export Transaction History</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="+19"/>
+ <source>Exporting Failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>There was an error trying to save the transaction history to %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Exporting Successful</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The transaction history was successfully saved to %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-22"/>
<source>Comma separated file (*.csv)</source>
<translation>Fails ar komatu kÄ atdalÄ«tÄju (*.csv)</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+9"/>
<source>Confirmed</source>
<translation>ApstiprinÄts</translation>
</message>
@@ -2476,17 +3127,7 @@ Adrese: %4
<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"/>
+ <location line="+107"/>
<source>Range:</source>
<translation>Diapazons:</translation>
</message>
@@ -2497,9 +3138,17 @@ Adrese: %4
</message>
</context>
<context>
+ <name>WalletFrame</name>
+ <message>
+ <location filename="../walletframe.cpp" line="+26"/>
+ <source>No wallet has been loaded.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>WalletModel</name>
<message>
- <location filename="../walletmodel.cpp" line="+218"/>
+ <location filename="../walletmodel.cpp" line="+245"/>
<source>Send Coins</source>
<translation type="unfinished"/>
</message>
@@ -2507,7 +3156,7 @@ Adrese: %4
<context>
<name>WalletView</name>
<message>
- <location filename="../walletview.cpp" line="+46"/>
+ <location filename="../walletview.cpp" line="+43"/>
<source>&amp;Export</source>
<translation type="unfinished"/>
</message>
@@ -2517,65 +3166,60 @@ Adrese: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+183"/>
+ <location line="+181"/>
<source>Backup Wallet</source>
<translation>Izveidot maciņa rezerves kopiju</translation>
</message>
<message>
- <location line="+0"/>
+ <location line="+1"/>
<source>Wallet Data (*.dat)</source>
<translation>Maciņa dati (*.dat)</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="+6"/>
<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>
+ <source>There was an error trying to save the wallet data to %1.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+4"/>
- <source>Backup Successful</source>
+ <source>The wallet data was successfully saved to %1.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+0"/>
- <source>The wallet data was successfully saved to the new location.</source>
+ <source>Backup Successful</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+102"/>
- <source>Bitcoin version</source>
- <translation>Bitcoin versija</translation>
- </message>
- <message>
- <location line="+107"/>
+ <location filename="../bitcoinstrings.cpp" line="+221"/>
<source>Usage:</source>
<translation>Lietojums:</translation>
</message>
<message>
- <location line="-55"/>
+ <location line="-54"/>
<source>List commands</source>
<translation>Komandu saraksts</translation>
</message>
<message>
- <location line="-13"/>
+ <location line="-14"/>
<source>Get help for a command</source>
<translation>Palīdzība par komandu</translation>
</message>
<message>
- <location line="+25"/>
+ <location line="+26"/>
<source>Options:</source>
<translation>Iespējas:</translation>
</message>
<message>
- <location line="+24"/>
+ <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>
@@ -2595,7 +3239,7 @@ Adrese: %4
<translation>UzstÄdiet datu bÄzes bufera izmÄ“ru megabaitos (pÄ“c noklusÄ“Å¡anas: 25)</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-26"/>
<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>
@@ -2605,7 +3249,7 @@ Adrese: %4
<translation>Uzturēt līdz &lt;n&gt; savienojumiem ar citiem mezgliem(pēc noklusēšanas: 125)</translation>
</message>
<message>
- <location line="-49"/>
+ <location line="-51"/>
<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>
@@ -2615,37 +3259,37 @@ Adrese: %4
<translation>NorÄdiet savu publisko adresi</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<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="-142"/>
+ <location line="-148"/>
<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="-33"/>
+ <location line="-36"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+40"/>
+ <location line="+45"/>
<source>Accept command line and JSON-RPC commands</source>
<translation>Pieņemt komandrindas un JSON-RPC komandas</translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<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="+40"/>
+ <location line="+39"/>
<source>Use the test network</source>
<translation>Izmantot testa tīklu</translation>
</message>
@@ -2655,7 +3299,7 @@ Adrese: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-87"/>
+ <location line="-95"/>
<source>%s, you must set a rpcpassword in the configuration file:
%s
It is recommended you use the following random password:
@@ -2696,6 +3340,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+4"/>
+ <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</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>
@@ -2710,17 +3359,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+11"/>
- <source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source>
+ <location line="+18"/>
+ <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="+6"/>
- <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
+ <location line="+5"/>
+ <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+3"/>
<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>
@@ -2750,17 +3399,27 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
+ <location line="+9"/>
+ <source>&lt;category&gt; can be:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
<source>Attempt to recover private keys from a corrupt wallet.dat</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
+ <source>Bitcoin Core Daemon</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Bitcoin RPC client version</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
<source>Block creation options:</source>
<translation type="unfinished"/>
</message>
@@ -2770,7 +3429,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
+ <source>Connect through SOCKS proxy</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect to JSON-RPC on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation type="unfinished"/>
</message>
@@ -2786,6 +3450,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+1"/>
+ <source>Do not load the wallet and disable wallet RPC calls</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Do you want to rebuild the block database now?</source>
<translation type="unfinished"/>
</message>
@@ -2880,7 +3549,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
+ <source>Fee per kB to add to transactions you send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Find peers using DNS lookup (default: 1 unless -connect)</source>
<translation type="unfinished"/>
</message>
@@ -2900,6 +3574,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
+ <location line="+1"/>
+ <source>If &lt;category&gt; is not supplied, output all debugging information.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+2"/>
<source>Incorrect or no genesis block found. Wrong datadir for network?</source>
<translation type="unfinished"/>
@@ -2915,17 +3594,37 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+8"/>
+ <location line="+5"/>
+ <source>Prepend debug output with timestamp (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>RPC client options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Rebuild block chain index from current blk000??.dat files</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+5"/>
+ <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Send command to Bitcoin server</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
+ <location line="+7"/>
+ <source>Set maximum block size in bytes (default: %d)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Set the number of threads to service RPC calls (default: 4)</source>
<translation type="unfinished"/>
</message>
@@ -2940,12 +3639,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+12"/>
+ <location line="+3"/>
+ <source>This is intended for regression testing tools and app development.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Usage (deprecated, use bitcoin-cli):</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+8"/>
+ <location line="+7"/>
<source>Verifying blocks...</source>
<translation type="unfinished"/>
</message>
@@ -2956,31 +3660,56 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+1"/>
+ <source>Wait for RPC server to start</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Wallet %s resides outside data directory %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+2"/>
+ <source>Wallet options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>You need to rebuild the database using -reindex to change -txindex</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-78"/>
+ <location line="-79"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-98"/>
+ <location line="-105"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+17"/>
+ <location line="+14"/>
+ <source>Output debugging information (default: 0, supplying &lt;category&gt; is optional)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+83"/>
+ <location line="+89"/>
<source>Information</source>
<translation type="unfinished"/>
</message>
@@ -3020,47 +3749,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<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"/>
+ <location line="+9"/>
<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"/>
+ <location line="+4"/>
<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"/>
+ <location line="+6"/>
<source>Set minimum block size in bytes (default: 0)</source>
<translation type="unfinished"/>
</message>
@@ -3085,7 +3784,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Transaction amount too small</source>
<translation type="unfinished"/>
</message>
@@ -3110,32 +3809,32 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<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="+5"/>
+ <location line="+7"/>
<source>Warning</source>
<translation>BrÄ«dinÄjums</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Warning: This version is obsolete, upgrade required!</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+2"/>
+ <source>version</source>
+ <translation>versija</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>wallet.dat corrupt, salvage failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-54"/>
+ <location line="-58"/>
<source>Password for JSON-RPC connections</source>
<translation>JSON-RPC savienojumu parole</translation>
</message>
@@ -3145,27 +3844,27 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Atļaut JSON-RPC savienojumus no norÄdÄ«tÄs IP adreses</translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<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="-126"/>
+ <location line="-132"/>
<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="+155"/>
+ <location line="+161"/>
<source>Upgrade wallet to latest format</source>
<translation>Atjaunot maciņa formÄtu uz jaunÄko</translation>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<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"/>
+ <location line="-11"/>
<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>
@@ -3175,7 +3874,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>JSON-RPC savienojumiem izmantot OpenSSL (https)</translation>
</message>
<message>
- <location line="-29"/>
+ <location line="-30"/>
<source>Server certificate file (default: server.cert)</source>
<translation>Servera sertifikÄta fails (pÄ“c noklusÄ“Å¡anas: server.cert)</translation>
</message>
@@ -3190,27 +3889,22 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Šis palīdzības paziņojums</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<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="-95"/>
- <source>Connect through socks proxy</source>
- <translation>Savienoties caurs socks proxy</translation>
- </message>
- <message>
- <location line="-11"/>
+ <location line="-107"/>
<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="+58"/>
+ <location line="+60"/>
<source>Loading addresses...</source>
<translation>IelÄdÄ“ adreses...</translation>
</message>
<message>
- <location line="-36"/>
+ <location line="-37"/>
<source>Error loading wallet.dat: Wallet corrupted</source>
<translation>Nevar ielÄdÄ“t wallet.dat: maciņš bojÄts</translation>
</message>
@@ -3230,12 +3924,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Kļūda ielÄdÄ“jot wallet.dat</translation>
</message>
<message>
- <location line="+30"/>
+ <location line="+31"/>
<source>Invalid -proxy address: &apos;%s&apos;</source>
<translation>Nederīga -proxy adrese: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+57"/>
+ <location line="+56"/>
<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>
@@ -3245,7 +3939,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>PieprasÄ«ta nezinÄma -socks proxy versija: %i</translation>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation>Nevar uzmeklēt -bind adresi: &apos;%s&apos;</translation>
</message>
@@ -3255,7 +3949,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Nevar atrisinÄt -externalip adresi: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+46"/>
+ <location line="+48"/>
<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>
@@ -3275,27 +3969,22 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>IelÄdÄ“ bloku indeksu...</translation>
</message>
<message>
- <location line="-60"/>
+ <location line="-62"/>
<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="-28"/>
+ <location line="-32"/>
<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="+69"/>
- <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="+20"/>
+ <location line="+95"/>
<source>Loading wallet...</source>
<translation>IelÄdÄ“ maciņu...</translation>
</message>
<message>
- <location line="-54"/>
+ <location line="-56"/>
<source>Cannot downgrade wallet</source>
<translation>Nevar maciņa formÄtu padarÄ«t vecÄku</translation>
</message>
@@ -3305,7 +3994,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Nevar ierakstīt adresi pēc noklusēšanas</translation>
</message>
<message>
- <location line="+66"/>
+ <location line="+67"/>
<source>Rescanning...</source>
<translation>Skanēju no jauna...</translation>
</message>
@@ -3325,7 +4014,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Kļūda</translation>
</message>
<message>
- <location line="-33"/>
+ <location line="-35"/>
<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_ms_MY.ts b/src/qt/locale/bitcoin_ms_MY.ts
index d252b2e353..8df9ea2a3d 100644
--- a/src/qt/locale/bitcoin_ms_MY.ts
+++ b/src/qt/locale/bitcoin_ms_MY.ts
@@ -22,13 +22,13 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location filename="../aboutdialog.cpp" line="+19"/>
+ <location filename="../utilitydialog.cpp" line="+29"/>
<source>Copyright</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+0"/>
- <source>The Bitcoin developers</source>
+ <source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
</context>
@@ -146,13 +146,13 @@ This product includes software developed by the OpenSSL Project for use in the O
</message>
<message>
<location line="+13"/>
- <source>Error exporting</source>
- <translation>Laporan ralat</translation>
+ <source>Exporting Failed</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation>Tidak dapat tulis ke dalam fail %1.</translation>
+ <location line="+1"/>
+ <source>There was an error trying to save the address list to %1.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -317,22 +317,27 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+260"/>
+ <location filename="../bitcoingui.cpp" line="+295"/>
<source>Sign &amp;message...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+290"/>
+ <location line="+335"/>
<source>Synchronizing with network...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-360"/>
+ <location line="-407"/>
<source>&amp;Overview</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="-137"/>
+ <source>Node</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+138"/>
<source>Show general overview of wallet</source>
<translation type="unfinished"/>
</message>
@@ -347,7 +352,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>E&amp;xit</source>
<translation type="unfinished"/>
</message>
@@ -393,7 +398,22 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+295"/>
+ <location line="+10"/>
+ <source>&amp;Sending addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Receiving addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open &amp;URI...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+325"/>
<source>Importing blocks from disk...</source>
<translation type="unfinished"/>
</message>
@@ -403,12 +423,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="-358"/>
+ <location line="-405"/>
<source>Send coins to a Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+47"/>
+ <location line="+49"/>
<source>Modify configuration options for Bitcoin</source>
<translation type="unfinished"/>
</message>
@@ -438,18 +458,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+375"/>
+ <location line="+430"/>
<source>Bitcoin</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-563"/>
- <location line="+10"/>
+ <location line="-643"/>
<source>Wallet</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+113"/>
+ <location line="+146"/>
<source>&amp;Send</source>
<translation type="unfinished"/>
</message>
@@ -459,7 +478,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+44"/>
+ <location line="+46"/>
<location line="+2"/>
<source>&amp;Show / Hide</source>
<translation type="unfinished"/>
@@ -485,86 +504,80 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+39"/>
+ <location line="+48"/>
<source>&amp;File</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+11"/>
+ <location line="+14"/>
<source>&amp;Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>&amp;Help</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+9"/>
+ <location line="+15"/>
<source>Tabs toolbar</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-244"/>
- <location line="+321"/>
+ <location line="-284"/>
+ <location line="+376"/>
<source>[testnet]</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-331"/>
- <location line="+10"/>
+ <location line="-401"/>
<source>Bitcoin Core</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+121"/>
+ <location line="+163"/>
<source>Request payments (generates QR codes and bitcoin: URIs)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+27"/>
+ <location line="+29"/>
<location line="+2"/>
<source>&amp;About Bitcoin Core</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+34"/>
- <source>&amp;Used sending addresses...</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+35"/>
<source>Show the list of used sending addresses and labels</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Used &amp;receiving addresses...</source>
+ <location line="+2"/>
+ <source>Show the list of used receiving addresses and labels</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Show the list of used receiving addresses and labels</source>
+ <location line="+3"/>
+ <source>Open a bitcoin: URI or payment request</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+2"/>
- <source>Open URI...</source>
+ <source>&amp;Command-line options</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
- <source>Open a bitcoin: URI or payment request</source>
+ <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+126"/>
+ <location line="+159"/>
<location line="+5"/>
<source>Bitcoin client</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+133"/>
+ <location line="+142"/>
<source>%n active connection(s) to Bitcoin network</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
@@ -584,7 +597,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+20"/>
+ <location line="+23"/>
<source>%n hour(s)</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
@@ -604,7 +617,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
+ <location line="+21"/>
<source>Last received block was generated %1 ago.</source>
<translation type="unfinished"/>
</message>
@@ -629,27 +642,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+77"/>
- <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="-152"/>
+ <location line="-85"/>
<source>Up to date</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Catching up...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+124"/>
- <source>Confirm transaction fee</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+130"/>
<source>Sent transaction</source>
<translation type="unfinished"/>
</message>
@@ -668,7 +671,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+67"/>
+ <location line="+69"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation type="unfinished"/>
</message>
@@ -678,7 +681,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+116"/>
+ <location filename="../bitcoin.cpp" line="+438"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation type="unfinished"/>
</message>
@@ -900,7 +903,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+171"/>
+ <location line="+31"/>
+ <source>none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+140"/>
<source>Dust</source>
<translation type="unfinished"/>
</message>
@@ -937,7 +945,7 @@ Address: %4
</message>
<message>
<location line="+1"/>
- <source>This label turns red, if the priority is smaller than &quot;medium&quot;</source>
+ <source>This label turns red, if the priority is smaller than &quot;medium&quot;.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1006,7 +1014,7 @@ Address: %4
<translation>Alamat</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+25"/>
+ <location filename="../editaddressdialog.cpp" line="+28"/>
<source>New receiving address</source>
<translation type="unfinished"/>
</message>
@@ -1075,20 +1083,24 @@ Address: %4
</message>
</context>
<context>
- <name>GUIUtil::HelpMessageBox</name>
+ <name>HelpMessageDialog</name>
<message>
- <location filename="../guiutil.cpp" line="+597"/>
- <source>version</source>
+ <location filename="../forms/helpmessagedialog.ui" line="+19"/>
+ <source>Bitcoin Core - Command-line options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <location line="+13"/>
+ <location filename="../utilitydialog.cpp" line="+38"/>
<source>Bitcoin Core</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-11"/>
+ <location line="+0"/>
+ <source>version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Usage:</source>
<translation type="unfinished"/>
</message>
@@ -1217,7 +1229,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+13"/>
<source>&amp;Main</source>
<translation type="unfinished"/>
</message>
@@ -1242,57 +1254,87 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+35"/>
- <source>Reset all client options to default.</source>
+ <location line="+9"/>
+ <source>Size of &amp;database cache</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>&amp;Reset Options</source>
+ <location line="+13"/>
+ <source>Set database cache size in megabytes (default: 25)</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+13"/>
- <source>&amp;Network</source>
+ <source>MB</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>
+ <location line="+27"/>
+ <source>Number of script &amp;verification threads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Connect to the Bitcoin network through a SOCKS proxy.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
- <source>Map port using &amp;UPnP</source>
+ <source>&amp;Connect through SOCKS proxy (default proxy):</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>
+ <location line="+34"/>
+ <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+224"/>
+ <source>Active command-line options that override above options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
+ <source>Reset all client options to default.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
- <source>&amp;Connect through SOCKS proxy:</source>
+ <source>&amp;Reset Options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+9"/>
- <source>Proxy &amp;IP:</source>
+ <location line="-323"/>
+ <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="+19"/>
- <source>IP address of the proxy (e.g. 127.0.0.1)</source>
+ <source>Proxy &amp;IP:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="+32"/>
<source>&amp;Port:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+19"/>
+ <location line="+25"/>
<source>Port of the proxy (e.g. 9050)</source>
<translation type="unfinished"/>
</message>
@@ -1377,7 +1419,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+71"/>
+ <location line="+136"/>
<source>&amp;OK</source>
<translation type="unfinished"/>
</message>
@@ -1387,44 +1429,38 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>&amp;Apply</source>
+ <location filename="../optionsdialog.cpp" line="+67"/>
+ <source>default</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+63"/>
- <source>default</source>
+ <location line="+57"/>
+ <source>none</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+131"/>
+ <location line="+75"/>
<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>
+ <location line="+29"/>
+ <source>Client restart required to activate changes.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
- <location line="+9"/>
- <source>Warning</source>
+ <location line="-29"/>
+ <source>Client will be shutdown, do you want to proceed?</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-9"/>
- <location line="+9"/>
- <source>This setting will take effect after restarting Bitcoin.</source>
+ <location line="+33"/>
+ <source>This change would require a client restart.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+29"/>
+ <location line="+34"/>
<source>The supplied proxy address is invalid.</source>
<translation type="unfinished"/>
</message>
@@ -1438,22 +1474,22 @@ Address: %4
</message>
<message>
<location line="+50"/>
- <location line="+214"/>
+ <location line="+231"/>
<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="-140"/>
+ <location line="-155"/>
<source>Unconfirmed:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-81"/>
+ <location line="-83"/>
<source>Wallet</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+49"/>
+ <location line="+51"/>
<source>Confirmed:</source>
<translation type="unfinished"/>
</message>
@@ -1488,7 +1524,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+56"/>
+ <location line="+71"/>
<source>&lt;b&gt;Recent transactions&lt;/b&gt;</source>
<translation type="unfinished"/>
</message>
@@ -1502,7 +1538,8 @@ Address: %4
<context>
<name>PaymentServer</name>
<message>
- <location filename="../paymentserver.cpp" line="+397"/>
+ <location filename="../paymentserver.cpp" line="+403"/>
+ <location line="+13"/>
<source>URI handling</source>
<translation type="unfinished"/>
</message>
@@ -1512,24 +1549,52 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+91"/>
+ <location line="+96"/>
<source>Requested payment amount of %1 is too small (considered dust).</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-204"/>
- <location line="+195"/>
+ <location line="-221"/>
+ <location line="+212"/>
<location line="+13"/>
+ <location line="+95"/>
+ <location line="+18"/>
+ <location line="+16"/>
<source>Payment request error</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-207"/>
+ <location line="-353"/>
<source>Cannot start bitcoin: click-to-pay handler</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+195"/>
+ <location line="+58"/>
+ <source>Net manager warning</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Your active proxy doesn&apos;t support SOCKS5, which is required for payment requests via proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>Payment request fetch URL is invalid: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Payment request file handling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Payment request file can not be read or processed! This can be caused by an invalid payment request file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+73"/>
<source>Unverified payment requests to custom payment scripts are unsupported.</source>
<translation type="unfinished"/>
</message>
@@ -1539,24 +1604,27 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
+ <location line="+43"/>
<source>Error communicating with %1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+28"/>
+ <location line="+24"/>
+ <source>Payment request can not be parsed or processed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
<source>Bad response from server %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+32"/>
+ <location line="+33"/>
<source>Payment acknowledged</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-55"/>
- <location line="+27"/>
- <location line="+17"/>
+ <location line="-11"/>
<source>Network request error</source>
<translation type="unfinished"/>
</message>
@@ -1564,18 +1632,18 @@ Address: %4
<context>
<name>QObject</name>
<message>
- <location filename="../bitcoin.cpp" line="+119"/>
- <location line="+5"/>
+ <location filename="../bitcoin.cpp" line="+71"/>
+ <location line="+11"/>
<source>Bitcoin</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-4"/>
+ <location line="+1"/>
<source>Error: Specified data directory &quot;%1&quot; does not exist.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="-12"/>
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation type="unfinished"/>
</message>
@@ -1617,15 +1685,16 @@ Address: %4
<location line="+23"/>
<location line="+23"/>
<location line="+36"/>
- <location line="+53"/>
+ <location line="+23"/>
+ <location line="+36"/>
<location line="+23"/>
<location line="+23"/>
- <location filename="../rpcconsole.cpp" line="+360"/>
+ <location filename="../rpcconsole.cpp" line="+359"/>
<source>N/A</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-217"/>
+ <location line="-223"/>
<source>Client version</source>
<translation type="unfinished"/>
</message>
@@ -1640,7 +1709,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+78"/>
+ <location line="+25"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+53"/>
<source>Using OpenSSL version</source>
<translation type="unfinished"/>
</message>
@@ -1656,16 +1730,16 @@ Address: %4
</message>
<message>
<location line="+7"/>
- <source>Number of connections</source>
+ <source>Name</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+23"/>
- <source>On testnet</source>
+ <source>Number of connections</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+23"/>
+ <location line="+29"/>
<source>Block chain</source>
<translation type="unfinished"/>
</message>
@@ -1690,16 +1764,6 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
- <source>Command-line options</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+10"/>
- <source>&amp;Show</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location line="+24"/>
<source>&amp;Console</source>
<translation type="unfinished"/>
@@ -1730,17 +1794,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-541"/>
+ <location line="-521"/>
<source>Build date</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-79"/>
- <source>Bitcoin Core</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+279"/>
+ <location line="+206"/>
<source>Debug log file</source>
<translation type="unfinished"/>
</message>
@@ -1750,11 +1809,6 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+26"/>
- <source>Show the Bitcoin-Core help message to get a list with possible Bitcoin command-line options.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location line="+76"/>
<source>Clear console</source>
<translation type="unfinished"/>
@@ -1775,7 +1829,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+128"/>
+ <location line="+122"/>
<source>%1 B</source>
<translation type="unfinished"/>
</message>
@@ -1818,12 +1872,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+19"/>
- <source>The amount to request</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="-32"/>
+ <location line="-13"/>
<source>&amp;Label:</source>
<translation type="unfinished"/>
</message>
@@ -1833,12 +1882,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+20"/>
- <source>The message to attach to payment request</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="-37"/>
+ <location line="-17"/>
<source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
@@ -1849,16 +1893,26 @@ Address: %4
</message>
<message>
<location line="+27"/>
- <source>The label to associate with the new receiving address</source>
+ <source>An optional label to associate with the new receiving address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
- <source>Use this form to request payments. All fields are optional.</source>
+ <location line="+7"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+56"/>
+ <location line="+7"/>
+ <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+39"/>
+ <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+17"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"/>
</message>
@@ -1874,11 +1928,11 @@ Address: %4
</message>
<message>
<location line="+47"/>
- <source>Previously requested payments</source>
+ <source>Requested payments</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+12"/>
+ <location line="+16"/>
<source>Show the selected request (does the same as double clicking an entry)</source>
<translation type="unfinished"/>
</message>
@@ -1969,7 +2023,7 @@ Address: %4
<context>
<name>RecentRequestsTableModel</name>
<message>
- <location filename="../recentrequeststablemodel.cpp" line="+14"/>
+ <location filename="../recentrequeststablemodel.cpp" line="+24"/>
<source>Date</source>
<translation type="unfinished"/>
</message>
@@ -1989,7 +2043,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+36"/>
+ <location line="+38"/>
<source>(no label)</source>
<translation type="unfinished"/>
</message>
@@ -2004,7 +2058,7 @@ Address: %4
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
<location filename="../sendcoinsdialog.cpp" line="+381"/>
- <location line="+81"/>
+ <location line="+80"/>
<source>Send Coins</source>
<translation type="unfinished"/>
</message>
@@ -2114,7 +2168,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-229"/>
+ <location filename="../sendcoinsdialog.cpp" line="-228"/>
<source>Confirm send coins</source>
<translation type="unfinished"/>
</message>
@@ -2217,22 +2271,22 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+113"/>
+ <location line="+112"/>
<source>Warning: Invalid Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+21"/>
<source>(no label)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+8"/>
+ <location line="-11"/>
<source>Warning: Unknown change address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-378"/>
+ <location line="-366"/>
<source>Are you sure you want to send?</source>
<translation type="unfinished"/>
</message>
@@ -2256,13 +2310,13 @@ Address: %4
<name>SendCoinsEntry</name>
<message>
<location filename="../forms/sendcoinsentry.ui" line="+131"/>
- <location line="+501"/>
+ <location line="+521"/>
<location line="+536"/>
<source>A&amp;mount:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-1132"/>
+ <location line="-1152"/>
<source>Pay &amp;To:</source>
<translation type="unfinished"/>
</message>
@@ -2308,23 +2362,33 @@ Address: %4
</message>
<message>
<location line="+7"/>
- <location line="+504"/>
+ <location line="+524"/>
<location line="+536"/>
<source>Remove this entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-40"/>
+ <location line="-1008"/>
+ <source>Message:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+958"/>
<source>This is a verified payment request.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-971"/>
+ <location line="-991"/>
<source>Enter a label for this address to add it to the list of used addresses</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+439"/>
+ <location line="+459"/>
<source>This is an unverified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2347,6 +2411,19 @@ Address: %4
</message>
</context>
<context>
+ <name>ShutdownWindow</name>
+ <message>
+ <location filename="../utilitydialog.cpp" line="+48"/>
+ <source>Bitcoin Core is shutting down...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Do not shut down the computer until this window disappears.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>SignVerifyMessageDialog</name>
<message>
<location filename="../forms/signverifymessagedialog.ui" line="+14"/>
@@ -2354,7 +2431,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+10"/>
<source>&amp;Sign Message</source>
<translation type="unfinished"/>
</message>
@@ -2542,7 +2619,7 @@ Address: %4
<context>
<name>SplashScreen</name>
<message>
- <location filename="../splashscreen.cpp" line="+26"/>
+ <location filename="../splashscreen.cpp" line="+28"/>
<source>Bitcoin Core</source>
<translation type="unfinished"/>
</message>
@@ -2641,12 +2718,12 @@ Address: %4
<location line="+12"/>
<location line="+45"/>
<location line="+17"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Credit</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="-120"/>
+ <location line="-125"/>
<source>matures in %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
@@ -2659,12 +2736,12 @@ Address: %4
<location line="+44"/>
<location line="+8"/>
<location line="+15"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Debit</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-57"/>
+ <location line="-62"/>
<source>Transaction fee</source>
<translation type="unfinished"/>
</message>
@@ -2675,11 +2752,12 @@ Address: %4
</message>
<message>
<location line="+6"/>
+ <location line="+9"/>
<source>Message</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="-7"/>
<source>Comment</source>
<translation type="unfinished"/>
</message>
@@ -2689,7 +2767,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+18"/>
<source>Merchant</source>
<translation type="unfinished"/>
</message>
@@ -2729,7 +2807,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-227"/>
+ <location line="-232"/>
<source>, has not been successfully broadcast yet</source>
<translation type="unfinished"/>
</message>
@@ -2779,8 +2857,13 @@ Address: %4
<source>Amount</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+59"/>
+ <source>Immature (%1 confirmations, will be available after %2)</source>
+ <translation type="unfinished"/>
+ </message>
<message numerus="yes">
- <location line="+57"/>
+ <location line="+16"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
@@ -2800,17 +2883,13 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
+ <location line="-22"/>
+ <location line="+25"/>
<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></translation>
- </message>
<message>
- <location line="+5"/>
+ <location line="-22"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation type="unfinished"/>
</message>
@@ -2820,7 +2899,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+43"/>
+ <location line="+62"/>
<source>Received with</source>
<translation type="unfinished"/>
</message>
@@ -3116,7 +3195,7 @@ Address: %4
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+217"/>
+ <location filename="../bitcoinstrings.cpp" line="+221"/>
<source>Usage:</source>
<translation type="unfinished"/>
</message>
@@ -3136,7 +3215,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+23"/>
+ <location line="+22"/>
<source>Specify configuration file (default: bitcoin.conf)</source>
<translation type="unfinished"/>
</message>
@@ -3156,7 +3235,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-27"/>
+ <location line="-26"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
<translation type="unfinished"/>
</message>
@@ -3166,7 +3245,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-50"/>
+ <location line="-51"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation type="unfinished"/>
</message>
@@ -3176,22 +3255,22 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-147"/>
+ <location line="-148"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-33"/>
+ <location line="-36"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation type="unfinished"/>
</message>
@@ -3201,7 +3280,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<source>Run in the background as a daemon and accept commands</source>
<translation type="unfinished"/>
</message>
@@ -3211,12 +3290,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-117"/>
+ <location line="-118"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-92"/>
+ <location line="-95"/>
<source>%s, you must set a rpcpassword in the configuration file:
%s
It is recommended you use the following random password:
@@ -3257,6 +3336,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+4"/>
+ <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</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>
@@ -3362,6 +3446,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+1"/>
+ <source>Do not load the wallet and disable wallet RPC calls</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Do you want to rebuild the block database now?</source>
<translation type="unfinished"/>
</message>
@@ -3526,7 +3615,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+8"/>
+ <location line="+7"/>
<source>Set maximum block size in bytes (default: %d)</source>
<translation type="unfinished"/>
</message>
@@ -3546,7 +3635,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+12"/>
+ <location line="+3"/>
+ <source>This is intended for regression testing tools and app development.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Usage (deprecated, use bitcoin-cli):</source>
<translation type="unfinished"/>
</message>
@@ -3571,7 +3665,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
+ <location line="+2"/>
+ <source>Wallet options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source>
<translation type="unfinished"/>
</message>
@@ -3581,12 +3680,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-78"/>
+ <location line="-79"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-104"/>
+ <location line="-105"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
@@ -3606,7 +3705,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+88"/>
+ <location line="+89"/>
<source>Information</source>
<translation type="unfinished"/>
</message>
@@ -3656,11 +3755,6 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Send trace/debug info to debugger</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location line="+6"/>
<source>Set minimum block size in bytes (default: 0)</source>
<translation type="unfinished"/>
@@ -3686,7 +3780,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Transaction amount too small</source>
<translation type="unfinished"/>
</message>
@@ -3716,7 +3810,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Warning</source>
<translation type="unfinished"/>
</message>
@@ -3736,37 +3830,37 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-57"/>
+ <location line="-58"/>
<source>Password for JSON-RPC connections</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-69"/>
+ <location line="-70"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-131"/>
+ <location line="-132"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+160"/>
+ <location line="+161"/>
<source>Upgrade wallet to latest format</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-12"/>
+ <location line="-11"/>
<source>Rescan the block chain for missing wallet transactions</source>
<translation type="unfinished"/>
</message>
@@ -3776,7 +3870,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-29"/>
+ <location line="-30"/>
<source>Server certificate file (default: server.cert)</source>
<translation type="unfinished"/>
</message>
@@ -3791,17 +3885,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Unable to bind to %s on this computer (bind returned error %d, %s)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-106"/>
+ <location line="-107"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+59"/>
+ <location line="+60"/>
<source>Loading addresses...</source>
<translation type="unfinished"/>
</message>
@@ -3841,7 +3935,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3851,7 +3945,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+47"/>
+ <location line="+48"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3871,7 +3965,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-61"/>
+ <location line="-62"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation type="unfinished"/>
</message>
@@ -3881,12 +3975,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+94"/>
+ <location line="+95"/>
<source>Loading wallet...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-55"/>
+ <location line="-56"/>
<source>Cannot downgrade wallet</source>
<translation type="unfinished"/>
</message>
@@ -3896,7 +3990,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+66"/>
+ <location line="+67"/>
<source>Rescanning...</source>
<translation type="unfinished"/>
</message>
@@ -3916,7 +4010,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-34"/>
+ <location line="-35"/>
<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_nb.ts b/src/qt/locale/bitcoin_nb.ts
index 88ae1f40cc..8f196a66c3 100644
--- a/src/qt/locale/bitcoin_nb.ts
+++ b/src/qt/locale/bitcoin_nb.ts
@@ -27,14 +27,14 @@ 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="+19"/>
+ <location filename="../utilitydialog.cpp" line="+29"/>
<source>Copyright</source>
- <translation type="unfinished"/>
+ <translation>Copyright</translation>
</message>
<message>
<location line="+0"/>
- <source>The Bitcoin developers</source>
- <translation>Bitcoin utviklerne</translation>
+ <source>The Bitcoin Core developers</source>
+ <translation>Bitcoin Core utviklerne</translation>
</message>
</context>
<context>
@@ -151,13 +151,13 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i
</message>
<message>
<location line="+13"/>
- <source>Error exporting</source>
- <translation>Feil ved eksportering</translation>
+ <source>Exporting Failed</source>
+ <translation>Ekport Feilet</translation>
</message>
<message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation>Kunne ikke skrive til filen %1.</translation>
+ <location line="+1"/>
+ <source>There was an error trying to save the address list to %1.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -322,22 +322,27 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+260"/>
+ <location filename="../bitcoingui.cpp" line="+295"/>
<source>Sign &amp;message...</source>
<translation>Signer &amp;melding...</translation>
</message>
<message>
- <location line="+290"/>
+ <location line="+335"/>
<source>Synchronizing with network...</source>
<translation>Synkroniserer med nettverk...</translation>
</message>
<message>
- <location line="-360"/>
+ <location line="-407"/>
<source>&amp;Overview</source>
<translation>&amp;Oversikt</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="-137"/>
+ <source>Node</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+138"/>
<source>Show general overview of wallet</source>
<translation>Vis generell oversikt over lommeboken</translation>
</message>
@@ -352,7 +357,7 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i
<translation>Vis transaksjonshistorikk</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>E&amp;xit</source>
<translation>&amp;Avslutt</translation>
</message>
@@ -398,7 +403,22 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i
<translation>&amp;Endre Adgangsfrase...</translation>
</message>
<message>
- <location line="+295"/>
+ <location line="+10"/>
+ <source>&amp;Sending addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Receiving addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open &amp;URI...</source>
+ <translation>Ã…pne %URI...</translation>
+ </message>
+ <message>
+ <location line="+325"/>
<source>Importing blocks from disk...</source>
<translation>Importere blokker...</translation>
</message>
@@ -408,12 +428,12 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i
<translation>Re-indekserer blokker på disk...</translation>
</message>
<message>
- <location line="-358"/>
+ <location line="-405"/>
<source>Send coins to a Bitcoin address</source>
<translation>Send til en Bitcoin-adresse</translation>
</message>
<message>
- <location line="+47"/>
+ <location line="+49"/>
<source>Modify configuration options for Bitcoin</source>
<translation>Endre oppsett for Bitcoin</translation>
</message>
@@ -443,18 +463,17 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i
<translation>&amp;Verifiser melding...</translation>
</message>
<message>
- <location line="+375"/>
+ <location line="+430"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-563"/>
- <location line="+10"/>
+ <location line="-643"/>
<source>Wallet</source>
<translation>Lommebok</translation>
</message>
<message>
- <location line="+113"/>
+ <location line="+146"/>
<source>&amp;Send</source>
<translation>&amp;Send</translation>
</message>
@@ -464,7 +483,7 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i
<translation>&amp;Motta</translation>
</message>
<message>
- <location line="+44"/>
+ <location line="+46"/>
<location line="+2"/>
<source>&amp;Show / Hide</source>
<translation>&amp;Gjem / vis</translation>
@@ -490,86 +509,80 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i
<translation>Bekreft meldinger for å være sikker på at de ble signert av en angitt Bitcoin-adresse</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+48"/>
<source>&amp;File</source>
<translation>&amp;Fil</translation>
</message>
<message>
- <location line="+11"/>
+ <location line="+14"/>
<source>&amp;Settings</source>
<translation>&amp;Innstillinger</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>&amp;Help</source>
<translation>&amp;Hjelp</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+15"/>
<source>Tabs toolbar</source>
<translation>Verktøylinje for faner</translation>
</message>
<message>
- <location line="-244"/>
- <location line="+321"/>
+ <location line="-284"/>
+ <location line="+376"/>
<source>[testnet]</source>
<translation>[testnett]</translation>
</message>
<message>
- <location line="-331"/>
- <location line="+10"/>
+ <location line="-401"/>
<source>Bitcoin Core</source>
<translation>Bitcoin Kjerne</translation>
</message>
<message>
- <location line="+121"/>
+ <location line="+163"/>
<source>Request payments (generates QR codes and bitcoin: URIs)</source>
<translation>Forespør betalinger (genererer QR koder og bitcoin: URIs)</translation>
</message>
<message>
- <location line="+27"/>
+ <location line="+29"/>
<location line="+2"/>
<source>&amp;About Bitcoin Core</source>
<translation>&amp;Om Bitcoin Core</translation>
</message>
<message>
- <location line="+34"/>
- <source>&amp;Used sending addresses...</source>
- <translation>Br&amp;ukte utsendingsadresser...</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+35"/>
<source>Show the list of used sending addresses and labels</source>
<translation>Vis listen av brukte utsendingsadresser og merkelapper</translation>
</message>
<message>
- <location line="+1"/>
- <source>Used &amp;receiving addresses...</source>
- <translation>B&amp;rukte mottaksadresser...</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Show the list of used receiving addresses and labels</source>
<translation>Vis listen over bruke mottaksadresser og merkelapper</translation>
</message>
<message>
+ <location line="+3"/>
+ <source>Open a bitcoin: URI or payment request</source>
+ <translation>Åpne en bitcoin: URI eller betalingsetterspørring</translation>
+ </message>
+ <message>
<location line="+2"/>
- <source>Open URI...</source>
- <translation>Ã…pne URI...</translation>
+ <source>&amp;Command-line options</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
- <source>Open a bitcoin: URI or payment request</source>
- <translation>Åpne en bitcoin: URI eller betalingsetterspørring</translation>
+ <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+126"/>
+ <location line="+159"/>
<location line="+5"/>
<source>Bitcoin client</source>
<translation>Bitcoinklient</translation>
</message>
<message numerus="yes">
- <location line="+133"/>
+ <location line="+142"/>
<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>
@@ -589,7 +602,7 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i
<translation>Lastet %1 blokker med transaksjonshistorikk.</translation>
</message>
<message numerus="yes">
- <location line="+20"/>
+ <location line="+23"/>
<source>%n hour(s)</source>
<translation><numerusform>%n time</numerusform><numerusform>%n timer</numerusform></translation>
</message>
@@ -609,7 +622,7 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i
<translation>%1 bak</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="+21"/>
<source>Last received block was generated %1 ago.</source>
<translation>Siste mottatte blokk ble generert for %1 siden.</translation>
</message>
@@ -634,27 +647,17 @@ Dette produktet inneholder programvare utviklet av OpenSSL prosjektet for bruk i
<translation>Informasjon</translation>
</message>
<message>
- <location line="+77"/>
- <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
- <translation>Denne transaksjonen overstiger størrelsesbegrensningen. Du kan likevel sende den med et gebyr på %1, som går til nodene som prosesserer transaksjonen din og støtter nettverket. Vil du betale gebyret?</translation>
- </message>
- <message>
- <location line="-152"/>
+ <location line="-85"/>
<source>Up to date</source>
<translation>Ajour</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Catching up...</source>
<translation>Kommer ajour...</translation>
</message>
<message>
- <location line="+124"/>
- <source>Confirm transaction fee</source>
- <translation>Bekreft transaksjonsgebyr</translation>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+130"/>
<source>Sent transaction</source>
<translation>Sendt transaksjon</translation>
</message>
@@ -677,7 +680,7 @@ Adresse: %4
</translation>
</message>
<message>
- <location line="+67"/>
+ <location line="+69"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation>Lommeboken er &lt;b&gt;kryptert&lt;/b&gt; og for tiden &lt;b&gt;ulåst&lt;/b&gt;</translation>
</message>
@@ -687,7 +690,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 filename="../bitcoin.cpp" line="+116"/>
+ <location filename="../bitcoin.cpp" line="+438"/>
<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>
@@ -909,7 +912,12 @@ Adresse: %4
<translation>(%1 låst)</translation>
</message>
<message>
- <location line="+171"/>
+ <location line="+31"/>
+ <source>none</source>
+ <translation>ingen</translation>
+ </message>
+ <message>
+ <location line="+140"/>
<source>Dust</source>
<translation>Støv</translation>
</message>
@@ -946,8 +954,8 @@ Adresse: %4
</message>
<message>
<location line="+1"/>
- <source>This label turns red, if the priority is smaller than &quot;medium&quot;</source>
- <translation>Denne merkelappen blir rød, hvis prioriteten er mindre enn &quot;medium&quot;</translation>
+ <source>This label turns red, if the priority is smaller than &quot;medium&quot;.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
@@ -1015,7 +1023,7 @@ Adresse: %4
<translation>&amp;Adresse</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+25"/>
+ <location filename="../editaddressdialog.cpp" line="+28"/>
<source>New receiving address</source>
<translation>Ny mottaksadresse</translation>
</message>
@@ -1084,20 +1092,24 @@ Adresse: %4
</message>
</context>
<context>
- <name>GUIUtil::HelpMessageBox</name>
+ <name>HelpMessageDialog</name>
<message>
- <location filename="../guiutil.cpp" line="+597"/>
- <source>version</source>
- <translation>versjon</translation>
+ <location filename="../forms/helpmessagedialog.ui" line="+19"/>
+ <source>Bitcoin Core - Command-line options</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <location line="+13"/>
+ <location filename="../utilitydialog.cpp" line="+38"/>
<source>Bitcoin Core</source>
<translation>Bitcoin Kjerne</translation>
</message>
<message>
- <location line="-11"/>
+ <location line="+0"/>
+ <source>version</source>
+ <translation>versjon</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Usage:</source>
<translation>Bruk:</translation>
</message>
@@ -1227,7 +1239,7 @@ Adresse: %4
<translation>Innstillinger</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+13"/>
<source>&amp;Main</source>
<translation>&amp;Hoved</translation>
</message>
@@ -1252,7 +1264,52 @@ Adresse: %4
<translation>&amp;Start Bitcoin ved systeminnlogging</translation>
</message>
<message>
- <location line="+35"/>
+ <location line="+9"/>
+ <source>Size of &amp;database cache</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set database cache size in megabytes (default: 25)</source>
+ <translation>Sett størrelse på mellomlager for database i megabytes (standardverdi: 25)</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>MB</source>
+ <translation>MB</translation>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Number of script &amp;verification threads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Connect to the Bitcoin network through a SOCKS proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Connect through SOCKS proxy (default proxy):</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+224"/>
+ <source>Active command-line options that override above options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
<source>Reset all client options to default.</source>
<translation>Tilbakestill alle klient valg til standard</translation>
</message>
@@ -1262,7 +1319,7 @@ Adresse: %4
<translation>&amp;Tilbakestill Instillinger</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="-323"/>
<source>&amp;Network</source>
<translation>&amp;Nettverk</translation>
</message>
@@ -1277,32 +1334,17 @@ Adresse: %4
<translation>Sett opp port vha. &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>Koble til Bitcoin-nettverket gjennom en SOCKS proxy (f.eks. ved tilkobling gjennom Tor).</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>&amp;Connect through SOCKS proxy:</source>
- <translation>&amp;Koble til gjenom SOCKS proxy:</translation>
- </message>
- <message>
- <location line="+9"/>
+ <location line="+19"/>
<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>IP-adresse for mellomtjener (f.eks. 127.0.0.1)</translation>
- </message>
- <message>
- <location line="+7"/>
+ <location line="+32"/>
<source>&amp;Port:</source>
<translation>&amp;Port:</translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+25"/>
<source>Port of the proxy (e.g. 9050)</source>
<translation>Proxyens port (f.eks. 9050)</translation>
</message>
@@ -1387,7 +1429,7 @@ Adresse: %4
<translation>Vis mynt &amp;kontroll funksjoner (kun for eksperter)</translation>
</message>
<message>
- <location line="+71"/>
+ <location line="+136"/>
<source>&amp;OK</source>
<translation>&amp;OK</translation>
</message>
@@ -1397,44 +1439,38 @@ Adresse: %4
<translation>&amp;Avbryt</translation>
</message>
<message>
- <location line="+10"/>
- <source>&amp;Apply</source>
- <translation>&amp;Bruk</translation>
- </message>
- <message>
- <location filename="../optionsdialog.cpp" line="+63"/>
+ <location filename="../optionsdialog.cpp" line="+67"/>
<source>default</source>
<translation>standardverdi</translation>
</message>
<message>
- <location line="+131"/>
+ <location line="+57"/>
+ <source>none</source>
+ <translation>ingen</translation>
+ </message>
+ <message>
+ <location line="+75"/>
<source>Confirm options reset</source>
<translation>Bekreft innstillings tilbakestilling</translation>
</message>
<message>
<location line="+1"/>
- <source>Some settings may require a client restart to take effect.</source>
- <translation>Noen innstillinger kan kreve en gjenstart av klienten for å tas i bruk.</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Do you want to proceed?</source>
- <translation>Vil du fortsette?</translation>
+ <location line="+29"/>
+ <source>Client restart required to activate changes.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
- <location line="+9"/>
- <source>Warning</source>
- <translation>Advarsel</translation>
+ <location line="-29"/>
+ <source>Client will be shutdown, do you want to proceed?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="-9"/>
- <location line="+9"/>
- <source>This setting will take effect after restarting Bitcoin.</source>
- <translation>Denne innstillingen trer i kraft etter omstart av Bitcoin.</translation>
+ <location line="+33"/>
+ <source>This change would require a client restart.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+29"/>
+ <location line="+34"/>
<source>The supplied proxy address is invalid.</source>
<translation>Angitt proxyadresse er ugyldig.</translation>
</message>
@@ -1448,22 +1484,22 @@ Adresse: %4
</message>
<message>
<location line="+50"/>
- <location line="+214"/>
+ <location line="+231"/>
<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="-140"/>
+ <location line="-155"/>
<source>Unconfirmed:</source>
<translation>Ubekreftet</translation>
</message>
<message>
- <location line="-81"/>
+ <location line="-83"/>
<source>Wallet</source>
<translation>Lommebok</translation>
</message>
<message>
- <location line="+49"/>
+ <location line="+51"/>
<source>Confirmed:</source>
<translation>Bekreftet:</translation>
</message>
@@ -1498,7 +1534,7 @@ Adresse: %4
<translation>Din nåværende saldo</translation>
</message>
<message>
- <location line="+56"/>
+ <location line="+71"/>
<source>&lt;b&gt;Recent transactions&lt;/b&gt;</source>
<translation>&lt;b&gt;Siste transaksjoner&lt;/b&gt;</translation>
</message>
@@ -1512,7 +1548,8 @@ Adresse: %4
<context>
<name>PaymentServer</name>
<message>
- <location filename="../paymentserver.cpp" line="+397"/>
+ <location filename="../paymentserver.cpp" line="+403"/>
+ <location line="+13"/>
<source>URI handling</source>
<translation>URI håndtering</translation>
</message>
@@ -1522,24 +1559,52 @@ Adresse: %4
<translation>URI kunne ikke tolkes! Dette kan forårsakes av en ugyldig Bitcoin-adresse eller feil i URI-parametere.</translation>
</message>
<message>
- <location line="+91"/>
+ <location line="+96"/>
<source>Requested payment amount of %1 is too small (considered dust).</source>
<translation>Forespurt betalingsmengde på %1 er for liten (betraktet som støv).</translation>
</message>
<message>
- <location line="-204"/>
- <location line="+195"/>
+ <location line="-221"/>
+ <location line="+212"/>
<location line="+13"/>
+ <location line="+95"/>
+ <location line="+18"/>
+ <location line="+16"/>
<source>Payment request error</source>
<translation>Betalingsforespørsel feil</translation>
</message>
<message>
- <location line="-207"/>
+ <location line="-353"/>
<source>Cannot start bitcoin: click-to-pay handler</source>
<translation>Kan ikke starte Bitcoin: klikk-og-betal håndterer</translation>
</message>
<message>
- <location line="+195"/>
+ <location line="+58"/>
+ <source>Net manager warning</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Your active proxy doesn&apos;t support SOCKS5, which is required for payment requests via proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>Payment request fetch URL is invalid: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Payment request file handling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Payment request file can not be read or processed! This can be caused by an invalid payment request file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+73"/>
<source>Unverified payment requests to custom payment scripts are unsupported.</source>
<translation type="unfinished"/>
</message>
@@ -1549,24 +1614,27 @@ Adresse: %4
<translation>Refundering fra %1</translation>
</message>
<message>
- <location line="+42"/>
+ <location line="+43"/>
<source>Error communicating with %1: %2</source>
<translation>Feil ved å kommunisere med %1: %2</translation>
</message>
<message>
- <location line="+28"/>
+ <location line="+24"/>
+ <source>Payment request can not be parsed or processed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
<source>Bad response from server %1</source>
<translation>DÃ¥rlig svar fra server %1</translation>
</message>
<message>
- <location line="+32"/>
+ <location line="+33"/>
<source>Payment acknowledged</source>
<translation>Betaling erkjent</translation>
</message>
<message>
- <location line="-55"/>
- <location line="+27"/>
- <location line="+17"/>
+ <location line="-11"/>
<source>Network request error</source>
<translation>Nettverksforespørsel feil</translation>
</message>
@@ -1574,18 +1642,18 @@ Adresse: %4
<context>
<name>QObject</name>
<message>
- <location filename="../bitcoin.cpp" line="+119"/>
- <location line="+5"/>
+ <location filename="../bitcoin.cpp" line="+71"/>
+ <location line="+11"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-4"/>
+ <location line="+1"/>
<source>Error: Specified data directory &quot;%1&quot; does not exist.</source>
<translation>Feil: Spesifisert data mappe &quot;%1&quot; finnes ikke.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="-12"/>
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation>Feil: Ugyldig kombinasjon av -regtest og -testnet.</translation>
</message>
@@ -1627,15 +1695,16 @@ Adresse: %4
<location line="+23"/>
<location line="+23"/>
<location line="+36"/>
- <location line="+53"/>
+ <location line="+23"/>
+ <location line="+36"/>
<location line="+23"/>
<location line="+23"/>
- <location filename="../rpcconsole.cpp" line="+360"/>
+ <location filename="../rpcconsole.cpp" line="+359"/>
<source>N/A</source>
<translation>-</translation>
</message>
<message>
- <location line="-217"/>
+ <location line="-223"/>
<source>Client version</source>
<translation>Klientversjon</translation>
</message>
@@ -1650,7 +1719,12 @@ Adresse: %4
<translation>Debug vindu</translation>
</message>
<message>
- <location line="+78"/>
+ <location line="+25"/>
+ <source>General</source>
+ <translation>Generelt</translation>
+ </message>
+ <message>
+ <location line="+53"/>
<source>Using OpenSSL version</source>
<translation>Bruker OpenSSL versjon</translation>
</message>
@@ -1666,16 +1740,16 @@ Adresse: %4
</message>
<message>
<location line="+7"/>
- <source>Number of connections</source>
- <translation>Antall tilkoblinger</translation>
+ <source>Name</source>
+ <translation>Navn</translation>
</message>
<message>
<location line="+23"/>
- <source>On testnet</source>
- <translation>PÃ¥ testnett</translation>
+ <source>Number of connections</source>
+ <translation>Antall tilkoblinger</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+29"/>
<source>Block chain</source>
<translation>Blokkjeden</translation>
</message>
@@ -1700,16 +1774,6 @@ Adresse: %4
<translation>&amp;Ã…pne</translation>
</message>
<message>
- <location line="+16"/>
- <source>Command-line options</source>
- <translation>Kommandolinjevalg</translation>
- </message>
- <message>
- <location line="+10"/>
- <source>&amp;Show</source>
- <translation>&amp;Vis</translation>
- </message>
- <message>
<location line="+24"/>
<source>&amp;Console</source>
<translation>&amp;Konsoll</translation>
@@ -1740,17 +1804,12 @@ Adresse: %4
<translation>Ut:</translation>
</message>
<message>
- <location line="-541"/>
+ <location line="-521"/>
<source>Build date</source>
<translation>Byggedato</translation>
</message>
<message>
- <location line="-79"/>
- <source>Bitcoin Core</source>
- <translation>Bitcoin Kjerne</translation>
- </message>
- <message>
- <location line="+279"/>
+ <location line="+206"/>
<source>Debug log file</source>
<translation>Loggfil for feilsøk</translation>
</message>
@@ -1760,11 +1819,6 @@ Adresse: %4
<translation>Åpne Bitcoin loggfil for feilsøk fra datamappen. Dette kan ta noen sekunder for store loggfiler.</translation>
</message>
<message>
- <location line="+26"/>
- <source>Show the Bitcoin-Core help message to get a list with possible Bitcoin command-line options.</source>
- <translation>Vis Bitcoin-Core hjelpemeldingen for å få en liste over mulig Bitcoin kommandolinje valg.</translation>
- </message>
- <message>
<location line="+76"/>
<source>Clear console</source>
<translation>Tøm konsoll</translation>
@@ -1785,7 +1839,7 @@ Adresse: %4
<translation>Skriv &lt;b&gt;help&lt;/b&gt; for en oversikt over kommandoer.</translation>
</message>
<message>
- <location line="+128"/>
+ <location line="+122"/>
<source>%1 B</source>
<translation>%1 B</translation>
</message>
@@ -1807,17 +1861,17 @@ Adresse: %4
<message>
<location line="+7"/>
<source>%1 m</source>
- <translation type="unfinished"/>
+ <translation>%1 m</translation>
</message>
<message>
<location line="+5"/>
<source>%1 h</source>
- <translation type="unfinished"/>
+ <translation>%1 t</translation>
</message>
<message>
<location line="+2"/>
<source>%1 h %2 m</source>
- <translation type="unfinished"/>
+ <translation>%1 t %2 m</translation>
</message>
</context>
<context>
@@ -1828,12 +1882,7 @@ Adresse: %4
<translation>&amp;Beløp:</translation>
</message>
<message>
- <location line="+19"/>
- <source>The amount to request</source>
- <translation>Mengden å forespør</translation>
- </message>
- <message>
- <location line="-32"/>
+ <location line="-13"/>
<source>&amp;Label:</source>
<translation>&amp;Merkelapp:</translation>
</message>
@@ -1843,12 +1892,7 @@ Adresse: %4
<translation>&amp;Melding:</translation>
</message>
<message>
- <location line="+20"/>
- <source>The message to attach to payment request</source>
- <translation>Meldingen å koblet til betalingsforespørsel</translation>
- </message>
- <message>
- <location line="-37"/>
+ <location line="-17"/>
<source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation>Gjenbruk en av de tidligere brukte mottaksadressene. Gjenbruk av adresser har sikkerhets og personverns utfordringer. Ikke bruk dette med unntak for å gjennopprette en betalingsforespørsel som ble gjort tidligere.</translation>
</message>
@@ -1859,16 +1903,26 @@ Adresse: %4
</message>
<message>
<location line="+27"/>
- <source>The label to associate with the new receiving address</source>
- <translation>Merkelappen som skal kobles til den nye mottaksadressen</translation>
+ <source>An optional label to associate with the new receiving address</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
- <source>Use this form to request payments. All fields are optional.</source>
- <translation>Bruk denne formen for å etterspør betalinger. Alle felter er frivillige.</translation>
+ <location line="+7"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+56"/>
+ <location line="+7"/>
+ <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+39"/>
+ <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+17"/>
<source>Clear all fields of the form.</source>
<translation>Fjern alle felter fra formen.</translation>
</message>
@@ -1884,11 +1938,11 @@ Adresse: %4
</message>
<message>
<location line="+47"/>
- <source>Previously requested payments</source>
- <translation>Tidligere etterspurte betalinger</translation>
+ <source>Requested payments</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+12"/>
+ <location line="+16"/>
<source>Show the selected request (does the same as double clicking an entry)</source>
<translation>Vis den valgte etterspørringen (gjør det samme som å dobbelklikke en oppføring)</translation>
</message>
@@ -1979,7 +2033,7 @@ Adresse: %4
<context>
<name>RecentRequestsTableModel</name>
<message>
- <location filename="../recentrequeststablemodel.cpp" line="+14"/>
+ <location filename="../recentrequeststablemodel.cpp" line="+24"/>
<source>Date</source>
<translation>Dato</translation>
</message>
@@ -1999,7 +2053,7 @@ Adresse: %4
<translation>Beløp</translation>
</message>
<message>
- <location line="+36"/>
+ <location line="+38"/>
<source>(no label)</source>
<translation>(ingen merkelapp)</translation>
</message>
@@ -2014,7 +2068,7 @@ Adresse: %4
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
<location filename="../sendcoinsdialog.cpp" line="+381"/>
- <location line="+81"/>
+ <location line="+80"/>
<source>Send Coins</source>
<translation>Send Bitcoins</translation>
</message>
@@ -2124,7 +2178,7 @@ Adresse: %4
<translation>S&amp;end</translation>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-229"/>
+ <location filename="../sendcoinsdialog.cpp" line="-228"/>
<source>Confirm send coins</source>
<translation>Bekreft sending av bitcoins</translation>
</message>
@@ -2227,22 +2281,22 @@ Adresse: %4
<translation>Transaksjonen ble avvist. Dette kan skje hvis noen av myntene i lommeboken allerede er brukt, f.eks. hvis du kopierte wallet.dat og mynter ble brukt i kopien uten å bli markert som brukt her.</translation>
</message>
<message>
- <location line="+113"/>
+ <location line="+112"/>
<source>Warning: Invalid Bitcoin address</source>
<translation>Advarsel: Ugyldig Bitcoin adresse</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+21"/>
<source>(no label)</source>
<translation>(ingen merkelapp)</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="-11"/>
<source>Warning: Unknown change address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-378"/>
+ <location line="-366"/>
<source>Are you sure you want to send?</source>
<translation>Er du sikker på at du vil sende?</translation>
</message>
@@ -2266,13 +2320,13 @@ Adresse: %4
<name>SendCoinsEntry</name>
<message>
<location filename="../forms/sendcoinsentry.ui" line="+131"/>
- <location line="+501"/>
+ <location line="+521"/>
<location line="+536"/>
<source>A&amp;mount:</source>
<translation>&amp;Beløp:</translation>
</message>
<message>
- <location line="-1132"/>
+ <location line="-1152"/>
<source>Pay &amp;To:</source>
<translation>Betal &amp;Til:</translation>
</message>
@@ -2318,23 +2372,33 @@ Adresse: %4
</message>
<message>
<location line="+7"/>
- <location line="+504"/>
+ <location line="+524"/>
<location line="+536"/>
<source>Remove this entry</source>
<translation>Fjern denne oppføringen</translation>
</message>
<message>
- <location line="-40"/>
+ <location line="-1008"/>
+ <source>Message:</source>
+ <translation>Melding:</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+958"/>
<source>This is a verified payment request.</source>
<translation>Dette er en verifisert betalingsetterspørring</translation>
</message>
<message>
- <location line="-971"/>
+ <location line="-991"/>
<source>Enter a label for this address to add it to the list of used addresses</source>
<translation>Skriv inn en merkelapp for denne adressen for å legge den til listen av brukte adresser</translation>
</message>
<message>
- <location line="+439"/>
+ <location line="+459"/>
<source>This is an unverified payment request.</source>
<translation>Dette er en uverifisert betalingsetterspørring</translation>
</message>
@@ -2357,6 +2421,19 @@ Adresse: %4
</message>
</context>
<context>
+ <name>ShutdownWindow</name>
+ <message>
+ <location filename="../utilitydialog.cpp" line="+48"/>
+ <source>Bitcoin Core is shutting down...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Do not shut down the computer until this window disappears.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>SignVerifyMessageDialog</name>
<message>
<location filename="../forms/signverifymessagedialog.ui" line="+14"/>
@@ -2364,7 +2441,7 @@ Adresse: %4
<translation>Signaturer - Signer / Verifiser en melding</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+10"/>
<source>&amp;Sign Message</source>
<translation>&amp;Signér Melding</translation>
</message>
@@ -2552,7 +2629,7 @@ Adresse: %4
<context>
<name>SplashScreen</name>
<message>
- <location filename="../splashscreen.cpp" line="+26"/>
+ <location filename="../splashscreen.cpp" line="+28"/>
<source>Bitcoin Core</source>
<translation>Bitcoin Kjerne</translation>
</message>
@@ -2572,7 +2649,7 @@ Adresse: %4
<message>
<location filename="../trafficgraphwidget.cpp" line="+79"/>
<source>KB/s</source>
- <translation type="unfinished"/>
+ <translation>KB/s</translation>
</message>
</context>
<context>
@@ -2651,12 +2728,12 @@ Adresse: %4
<location line="+12"/>
<location line="+45"/>
<location line="+17"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Credit</source>
<translation>Kredit</translation>
</message>
<message numerus="yes">
- <location line="-120"/>
+ <location line="-125"/>
<source>matures in %n more block(s)</source>
<translation><numerusform>blir moden om %n blokk</numerusform><numerusform>blir moden om %n blokker</numerusform></translation>
</message>
@@ -2669,12 +2746,12 @@ Adresse: %4
<location line="+44"/>
<location line="+8"/>
<location line="+15"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Debit</source>
<translation>Debet</translation>
</message>
<message>
- <location line="-57"/>
+ <location line="-62"/>
<source>Transaction fee</source>
<translation>Transaksjonsgebyr</translation>
</message>
@@ -2685,11 +2762,12 @@ Adresse: %4
</message>
<message>
<location line="+6"/>
+ <location line="+9"/>
<source>Message</source>
<translation>Melding</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="-7"/>
<source>Comment</source>
<translation>Kommentar</translation>
</message>
@@ -2699,7 +2777,7 @@ Adresse: %4
<translation>Transaksjons-ID</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+18"/>
<source>Merchant</source>
<translation>Forhandler</translation>
</message>
@@ -2739,7 +2817,7 @@ Adresse: %4
<translation>usann</translation>
</message>
<message>
- <location line="-227"/>
+ <location line="-232"/>
<source>, has not been successfully broadcast yet</source>
<translation>, har ikke blitt kringkastet uten problemer enda.</translation>
</message>
@@ -2789,8 +2867,13 @@ Adresse: %4
<source>Amount</source>
<translation>Beløp</translation>
</message>
+ <message>
+ <location line="+59"/>
+ <source>Immature (%1 confirmations, will be available after %2)</source>
+ <translation type="unfinished"/>
+ </message>
<message numerus="yes">
- <location line="+57"/>
+ <location line="+16"/>
<source>Open for %n more block(s)</source>
<translation><numerusform>Ã…pen for %n blokk til</numerusform><numerusform>Ã…pen for %n blokker til</numerusform></translation>
</message>
@@ -2810,17 +2893,13 @@ Adresse: %4
<translation>Ubekreftet (%1 av %2 bekreftelser)</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="-22"/>
+ <location line="+25"/>
<source>Confirmed (%1 confirmations)</source>
<translation>Bekreftet (%1 bekreftelser)</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>Minet saldo blir tilgjengelig når den modner om %n blokk</numerusform><numerusform>Minet saldo blir tilgjengelig når den modner om %n blokker</numerusform></translation>
- </message>
<message>
- <location line="+5"/>
+ <location line="-22"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation>Denne blokken har ikke blitt mottatt av noen andre noder og vil sannsynligvis ikke bli akseptert!</translation>
</message>
@@ -2830,7 +2909,7 @@ Adresse: %4
<translation>Generert men ikke akseptert</translation>
</message>
<message>
- <location line="+43"/>
+ <location line="+62"/>
<source>Received with</source>
<translation>Mottatt med</translation>
</message>
@@ -3126,7 +3205,7 @@ Adresse: %4
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+217"/>
+ <location filename="../bitcoinstrings.cpp" line="+221"/>
<source>Usage:</source>
<translation>Bruk:</translation>
</message>
@@ -3146,7 +3225,7 @@ Adresse: %4
<translation>Innstillinger:</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+22"/>
<source>Specify configuration file (default: bitcoin.conf)</source>
<translation>Angi konfigurasjonsfil (standardverdi: bitcoin.conf)</translation>
</message>
@@ -3166,7 +3245,7 @@ Adresse: %4
<translation>Sett størrelse på mellomlager for database i megabytes (standardverdi: 25)</translation>
</message>
<message>
- <location line="-27"/>
+ <location line="-26"/>
<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>
@@ -3176,7 +3255,7 @@ Adresse: %4
<translation>Hold maks &lt;n&gt; koblinger åpne til andre noder (standardverdi: 125)</translation>
</message>
<message>
- <location line="-50"/>
+ <location line="-51"/>
<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>
@@ -3186,22 +3265,22 @@ Adresse: %4
<translation>Angi din egen offentlige adresse</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<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="-147"/>
+ <location line="-148"/>
<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="-33"/>
+ <location line="-36"/>
<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="+31"/>
+ <location line="+34"/>
<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>
@@ -3211,7 +3290,7 @@ Adresse: %4
<translation>Ta imot kommandolinje- og JSON-RPC-kommandoer</translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<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>
@@ -3221,12 +3300,12 @@ Adresse: %4
<translation>Bruk testnettverket</translation>
</message>
<message>
- <location line="-117"/>
+ <location line="-118"/>
<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="-92"/>
+ <location line="-95"/>
<source>%s, you must set a rpcpassword in the configuration file:
%s
It is recommended you use the following random password:
@@ -3276,6 +3355,11 @@ For eksempel: varselmelding=echo %%s | mail -s &quot;Bitcoin varsel&quot; admin@
</message>
<message>
<location line="+4"/>
+ <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</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>Feil: Transaksjonen ble avvist! Dette kan skje hvis noen av myntene i lommeboken alerede er blit brukt, som om du brukte en kopi av wallet.dat og myntene ble brukt i kopien, men ikke markert som brukt her.</translation>
</message>
@@ -3381,6 +3465,11 @@ For eksempel: varselmelding=echo %%s | mail -s &quot;Bitcoin varsel&quot; admin@
</message>
<message>
<location line="+1"/>
+ <source>Do not load the wallet and disable wallet RPC calls</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Do you want to rebuild the block database now?</source>
<translation>Ønsker du å gjenopprette blokkdatabasen nå?</translation>
</message>
@@ -3517,7 +3606,7 @@ For eksempel: varselmelding=echo %%s | mail -s &quot;Bitcoin varsel&quot; admin@
<message>
<location line="+15"/>
<source>Not enough file descriptors available.</source>
- <translation type="unfinished"/>
+ <translation>For få fildeskriptorer tilgjengelig.</translation>
</message>
<message>
<location line="+5"/>
@@ -3545,7 +3634,7 @@ For eksempel: varselmelding=echo %%s | mail -s &quot;Bitcoin varsel&quot; admin@
<translation>Send kommando til Bitcoin tjener</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+7"/>
<source>Set maximum block size in bytes (default: %d)</source>
<translation>Sett maks blokkstørrelse i bytes (standardverdi: %d)</translation>
</message>
@@ -3565,7 +3654,12 @@ For eksempel: varselmelding=echo %%s | mail -s &quot;Bitcoin varsel&quot; admin@
<translation>Start Bitcoin tjener</translation>
</message>
<message>
- <location line="+12"/>
+ <location line="+3"/>
+ <source>This is intended for regression testing tools and app development.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Usage (deprecated, use bitcoin-cli):</source>
<translation type="unfinished"/>
</message>
@@ -3590,7 +3684,12 @@ For eksempel: varselmelding=echo %%s | mail -s &quot;Bitcoin varsel&quot; admin@
<translation>Lommebok %s befinner seg utenfor data mappe %s</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="+2"/>
+ <source>Wallet options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source>
<translation type="unfinished"/>
</message>
@@ -3600,12 +3699,12 @@ For eksempel: varselmelding=echo %%s | mail -s &quot;Bitcoin varsel&quot; admin@
<translation>Du må gjenoppbygge databasen med å bruke -reindex for å endre -txindex</translation>
</message>
<message>
- <location line="-78"/>
+ <location line="-79"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation>Importerer blokker fra ekstern blk000?.dat fil</translation>
</message>
<message>
- <location line="-104"/>
+ <location line="-105"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
@@ -3625,7 +3724,7 @@ For eksempel: varselmelding=echo %%s | mail -s &quot;Bitcoin varsel&quot; admin@
<translation type="unfinished"/>
</message>
<message>
- <location line="+88"/>
+ <location line="+89"/>
<source>Information</source>
<translation>Informasjon</translation>
</message>
@@ -3675,11 +3774,6 @@ For eksempel: varselmelding=echo %%s | mail -s &quot;Bitcoin varsel&quot; admin@
<translation>Send spor/debug informasjon til konsollet istedenfor debug.log filen</translation>
</message>
<message>
- <location line="+1"/>
- <source>Send trace/debug info to debugger</source>
- <translation>Send spor/debug informasjon til debugger</translation>
- </message>
- <message>
<location line="+6"/>
<source>Set minimum block size in bytes (default: 0)</source>
<translation>Sett minimum blokkstørrelse i bytes (standardverdi: 0)</translation>
@@ -3692,7 +3786,7 @@ For eksempel: varselmelding=echo %%s | mail -s &quot;Bitcoin varsel&quot; admin@
<message>
<location line="+1"/>
<source>Signing transaction failed</source>
- <translation type="unfinished"/>
+ <translation>Signering av transaksjon feilet</translation>
</message>
<message>
<location line="+2"/>
@@ -3705,7 +3799,7 @@ For eksempel: varselmelding=echo %%s | mail -s &quot;Bitcoin varsel&quot; admin@
<translation>Systemfeil:</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Transaction amount too small</source>
<translation>Transaksjonen er for liten</translation>
</message>
@@ -3735,7 +3829,7 @@ For eksempel: varselmelding=echo %%s | mail -s &quot;Bitcoin varsel&quot; admin@
<translation>Brukernavn for JSON-RPC forbindelser</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Warning</source>
<translation>Advarsel</translation>
</message>
@@ -3755,37 +3849,37 @@ For eksempel: varselmelding=echo %%s | mail -s &quot;Bitcoin varsel&quot; admin@
<translation>wallet.dat korrupt, bergning feilet</translation>
</message>
<message>
- <location line="-57"/>
+ <location line="-58"/>
<source>Password for JSON-RPC connections</source>
<translation>Passord for JSON-RPC forbindelser</translation>
</message>
<message>
- <location line="-69"/>
+ <location line="-70"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation>Tillat JSON-RPC tilkoblinger fra angitt IP-adresse</translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<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="-131"/>
+ <location line="-132"/>
<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="+160"/>
+ <location line="+161"/>
<source>Upgrade wallet to latest format</source>
<translation>Oppgradér lommebok til nyeste format</translation>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<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>
<message>
- <location line="-12"/>
+ <location line="-11"/>
<source>Rescan the block chain for missing wallet transactions</source>
<translation>Se gjennom blokk-kjeden etter manglende lommeboktransaksjoner</translation>
</message>
@@ -3795,7 +3889,7 @@ For eksempel: varselmelding=echo %%s | mail -s &quot;Bitcoin varsel&quot; admin@
<translation>Bruk OpenSSL (https) for JSON-RPC forbindelser</translation>
</message>
<message>
- <location line="-29"/>
+ <location line="-30"/>
<source>Server certificate file (default: server.cert)</source>
<translation>Servers sertifikat (standardverdi: server.cert)</translation>
</message>
@@ -3810,17 +3904,17 @@ For eksempel: varselmelding=echo %%s | mail -s &quot;Bitcoin varsel&quot; admin@
<translation>Denne hjelpemeldingen</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Unable to bind to %s on this computer (bind returned error %d, %s)</source>
<translation>Kan ikke binde til %s på denne datamaskinen (bind returnerte feil %d, %s)</translation>
</message>
<message>
- <location line="-106"/>
+ <location line="-107"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation>Tillat DNS oppslag for -addnode, -seednode og -connect</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+60"/>
<source>Loading addresses...</source>
<translation>Laster adresser...</translation>
</message>
@@ -3860,7 +3954,7 @@ For eksempel: varselmelding=echo %%s | mail -s &quot;Bitcoin varsel&quot; admin@
<translation>Ukjent -socks proxy versjon angitt: %i</translation>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation>Kunne ikke slå opp -bind adresse: &apos;%s&apos;</translation>
</message>
@@ -3870,7 +3964,7 @@ For eksempel: varselmelding=echo %%s | mail -s &quot;Bitcoin varsel&quot; admin@
<translation>Kunne ikke slå opp -externalip adresse: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+47"/>
+ <location line="+48"/>
<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>
@@ -3890,7 +3984,7 @@ For eksempel: varselmelding=echo %%s | mail -s &quot;Bitcoin varsel&quot; admin@
<translation>Laster blokkindeks...</translation>
</message>
<message>
- <location line="-61"/>
+ <location line="-62"/>
<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>
@@ -3900,12 +3994,12 @@ For eksempel: varselmelding=echo %%s | mail -s &quot;Bitcoin varsel&quot; admin@
<translation>Kan ikke binde til %s på denne datamaskinen. Sannsynligvis kjører Bitcoin allerede.</translation>
</message>
<message>
- <location line="+94"/>
+ <location line="+95"/>
<source>Loading wallet...</source>
<translation>Laster lommebok...</translation>
</message>
<message>
- <location line="-55"/>
+ <location line="-56"/>
<source>Cannot downgrade wallet</source>
<translation>Kan ikke nedgradere lommebok</translation>
</message>
@@ -3915,7 +4009,7 @@ For eksempel: varselmelding=echo %%s | mail -s &quot;Bitcoin varsel&quot; admin@
<translation>Kan ikke skrive standardadresse</translation>
</message>
<message>
- <location line="+66"/>
+ <location line="+67"/>
<source>Rescanning...</source>
<translation>Leser gjennom...</translation>
</message>
@@ -3935,7 +4029,7 @@ For eksempel: varselmelding=echo %%s | mail -s &quot;Bitcoin varsel&quot; admin@
<translation>Feil</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-35"/>
<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 125d92195d..2afdb787bd 100644
--- a/src/qt/locale/bitcoin_nl.ts
+++ b/src/qt/locale/bitcoin_nl.ts
@@ -3,13 +3,13 @@
<name>AboutDialog</name>
<message>
<location filename="../forms/aboutdialog.ui" line="+14"/>
- <source>About Bitcoin</source>
- <translation>Over Bitcoin</translation>
+ <source>About Bitcoin Core</source>
+ <translation>Over Bitcoin Core</translation>
</message>
<message>
<location line="+39"/>
- <source>&lt;b&gt;Bitcoin&lt;/b&gt; version</source>
- <translation>&lt;b&gt;Bitcoin&lt;/b&gt; versie</translation>
+ <source>&lt;b&gt;Bitcoin Core&lt;/b&gt; version</source>
+ <translation>&lt;b&gt; Bitcoin Core&lt;/b&gt; versie</translation>
</message>
<message>
<location line="+57"/>
@@ -27,14 +27,14 @@ Gedistribueerd onder de MIT/X11 software licentie, zie het bijgevoegde bestand C
Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in de OpenSSL Toolkit (http://www.openssl.org/) en cryptografische software gemaakt door Eric Young (eay@cryptsoft.com) en UPnP software geschreven door Thomas Bernard.</translation>
</message>
<message>
- <location filename="../aboutdialog.cpp" line="+14"/>
+ <location filename="../utilitydialog.cpp" line="+29"/>
<source>Copyright</source>
<translation>Auteursrecht</translation>
</message>
<message>
<location line="+0"/>
- <source>The Bitcoin developers</source>
- <translation>De Bitcoin-ontwikkelaars</translation>
+ <source>The Bitcoin Core developers</source>
+ <translation>De Bitcoin Core ontwikkelaars</translation>
</message>
</context>
<context>
@@ -42,7 +42,7 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d
<message>
<location filename="../forms/addressbookpage.ui" line="+30"/>
<source>Double-click to edit address or label</source>
- <translation>Dubbelklik om adres of label te wijzigen</translation>
+ <translation>Dubbelklik om het adres of label te wijzigen</translation>
</message>
<message>
<location line="+27"/>
@@ -52,7 +52,7 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d
<message>
<location line="+3"/>
<source>&amp;New</source>
- <translation type="unfinished"/>
+ <translation>&amp;Nieuw</translation>
</message>
<message>
<location line="+11"/>
@@ -62,15 +62,15 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d
<message>
<location line="+3"/>
<source>&amp;Copy</source>
- <translation type="unfinished"/>
+ <translation>&amp;Kopieer</translation>
</message>
<message>
<location line="+52"/>
<source>C&amp;lose</source>
- <translation type="unfinished"/>
+ <translation>S&amp;luiten</translation>
</message>
<message>
- <location filename="../addressbookpage.cpp" line="+72"/>
+ <location filename="../addressbookpage.cpp" line="+74"/>
<source>&amp;Copy Address</source>
<translation>&amp;Kopiëer Adres</translation>
</message>
@@ -97,27 +97,27 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d
<message>
<location filename="../addressbookpage.cpp" line="-30"/>
<source>Choose the address to send coins to</source>
- <translation type="unfinished"/>
+ <translation>Kies het adres om munten naar te versturen</translation>
</message>
<message>
<location line="+1"/>
<source>Choose the address to receive coins with</source>
- <translation type="unfinished"/>
+ <translation>Kies het adres om munten voor te ontvangen</translation>
</message>
<message>
<location line="+5"/>
<source>C&amp;hoose</source>
- <translation type="unfinished"/>
+ <translation>K&amp;iezen</translation>
</message>
<message>
<location line="+6"/>
<source>Sending addresses</source>
- <translation type="unfinished"/>
+ <translation>Bezig met versturen adressen</translation>
</message>
<message>
<location line="+1"/>
<source>Receiving addresses</source>
- <translation type="unfinished"/>
+ <translation>Adressen ontvangen</translation>
</message>
<message>
<location line="+7"/>
@@ -127,7 +127,7 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d
<message>
<location line="+4"/>
<source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
- <translation type="unfinished"/>
+ <translation>Dit zijn je Bitcoin adressen waar je ermee kunt betalen. We raden je aan om een nieuw ontvangstadres voor elke transactie te gebruiken.</translation>
</message>
<message>
<location line="+7"/>
@@ -140,9 +140,9 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d
<translation>&amp;Bewerk</translation>
</message>
<message>
- <location line="+197"/>
+ <location line="+194"/>
<source>Export Address List</source>
- <translation type="unfinished"/>
+ <translation>Exporteer adreslijst</translation>
</message>
<message>
<location line="+1"/>
@@ -151,19 +151,19 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d
</message>
<message>
<location line="+13"/>
- <source>Error exporting</source>
- <translation>Fout bij exporteren</translation>
+ <source>Exporting Failed</source>
+ <translation>Export Mislukt</translation>
</message>
<message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation>Kon niet schrijven naar bestand %1.</translation>
+ <location line="+1"/>
+ <source>There was an error trying to save the address list to %1.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<name>AddressTableModel</name>
<message>
- <location filename="../addresstablemodel.cpp" line="+164"/>
+ <location filename="../addresstablemodel.cpp" line="+168"/>
<source>Label</source>
<translation>Label</translation>
</message>
@@ -201,7 +201,7 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d
<translation>Herhaal wachtwoord</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="+34"/>
+ <location filename="../askpassphrasedialog.cpp" line="+40"/>
<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>Vul een nieuw wachtwoord in voor uw portemonnee. &lt;br/&gt; Gebruik een wachtwoord van &lt;b&gt;10 of meer lukrake karakters&lt;/b&gt;, of &lt;b&gt; acht of meer woorden&lt;/b&gt; . </translation>
</message>
@@ -322,22 +322,27 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+250"/>
+ <location filename="../bitcoingui.cpp" line="+295"/>
<source>Sign &amp;message...</source>
<translation>&amp;Onderteken bericht...</translation>
</message>
<message>
- <location line="+254"/>
+ <location line="+335"/>
<source>Synchronizing with network...</source>
<translation>Synchroniseren met netwerk...</translation>
</message>
<message>
- <location line="-324"/>
+ <location line="-407"/>
<source>&amp;Overview</source>
<translation>&amp;Overzicht</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="-137"/>
+ <source>Node</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+138"/>
<source>Show general overview of wallet</source>
<translation>Toon algemeen overzicht van de portemonnee</translation>
</message>
@@ -352,7 +357,7 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d
<translation>Blader door transactieverleden</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>E&amp;xit</source>
<translation>&amp;Afsluiten</translation>
</message>
@@ -398,7 +403,22 @@ 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="+10"/>
+ <source>&amp;Sending addresses...</source>
+ <translation>&amp;Adressen aan het versturen.</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Receiving addresses...</source>
+ <translation>&amp;Adressen aan het ontvangen...</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open &amp;URI...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+325"/>
<source>Importing blocks from disk...</source>
<translation>Blokken aan het importeren vanaf harde schijf...</translation>
</message>
@@ -408,12 +428,12 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d
<translation>Bezig met herindexeren van blokken op harde schijf...</translation>
</message>
<message>
- <location line="-322"/>
+ <location line="-405"/>
<source>Send coins to a Bitcoin address</source>
<translation>Verstuur munten naar een Bitcoinadres</translation>
</message>
<message>
- <location line="+47"/>
+ <location line="+49"/>
<source>Modify configuration options for Bitcoin</source>
<translation>Wijzig instellingen van Bitcoin</translation>
</message>
@@ -443,20 +463,17 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d
<translation>&amp;Verifiëer bericht...</translation>
</message>
<message>
- <location line="-180"/>
- <location line="+6"/>
- <location line="+513"/>
+ <location line="+430"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-519"/>
- <location line="+6"/>
+ <location line="-643"/>
<source>Wallet</source>
<translation>Portemonnee</translation>
</message>
<message>
- <location line="+109"/>
+ <location line="+146"/>
<source>&amp;Send</source>
<translation>&amp;Versturen</translation>
</message>
@@ -466,13 +483,7 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d
<translation>&amp;Ontvangen</translation>
</message>
<message>
- <location line="+28"/>
- <location line="+2"/>
- <source>&amp;About Bitcoin</source>
- <translation>&amp;Over Bitcoin</translation>
- </message>
- <message>
- <location line="+14"/>
+ <location line="+46"/>
<location line="+2"/>
<source>&amp;Show / Hide</source>
<translation>&amp;Toon / Verberg</translation>
@@ -498,64 +509,80 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d
<translation>Verifiëer handtekeningen om zeker te zijn dat de berichten zijn ondertekend met de gespecificeerde Bitcoinadressen</translation>
</message>
<message>
- <location line="+35"/>
+ <location line="+48"/>
<source>&amp;File</source>
<translation>&amp;Bestand</translation>
</message>
<message>
- <location line="+10"/>
+ <location line="+14"/>
<source>&amp;Settings</source>
<translation>&amp;Instellingen</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>&amp;Help</source>
<translation>&amp;Hulp</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+15"/>
<source>Tabs toolbar</source>
<translation>Tab-werkbalk</translation>
</message>
<message>
- <location line="-235"/>
- <location line="+294"/>
+ <location line="-284"/>
+ <location line="+376"/>
<source>[testnet]</source>
<translation>[testnetwerk]</translation>
</message>
<message>
- <location line="-177"/>
+ <location line="-401"/>
+ <source>Bitcoin Core</source>
+ <translation>Bitcoin Kern</translation>
+ </message>
+ <message>
+ <location line="+163"/>
<source>Request payments (generates QR codes and bitcoin: URIs)</source>
- <translation type="unfinished"/>
+ <translation>Vraag betaling aan (genereert QR codes en bitcoin: URIs)</translation>
</message>
<message>
- <location line="+63"/>
- <source>&amp;Used sending addresses...</source>
- <translation type="unfinished"/>
+ <location line="+29"/>
+ <location line="+2"/>
+ <source>&amp;About Bitcoin Core</source>
+ <translation>&amp;Over Bitcoin Core</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+35"/>
<source>Show the list of used sending addresses and labels</source>
- <translation type="unfinished"/>
+ <translation>Toon de lijst met gebruikt verzend adressen en labels</translation>
</message>
<message>
- <location line="+1"/>
- <source>Used &amp;receiving addresses...</source>
+ <location line="+2"/>
+ <source>Show the list of used receiving addresses and labels</source>
+ <translation>Toon de lijst met gebruikte ontvangst adressen en labels</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open a bitcoin: URI or payment request</source>
+ <translation>Open een bitcoin: URI of betalingsverzoek</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Command-line options</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
- <source>Show the list of used receiving addresses and labels</source>
+ <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+106"/>
+ <location line="+159"/>
<location line="+5"/>
<source>Bitcoin client</source>
<translation>Bitcoin client</translation>
</message>
<message numerus="yes">
- <location line="+120"/>
+ <location line="+142"/>
<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>
@@ -575,7 +602,7 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d
<translation>%1 blokken van transactiehistorie verwerkt.</translation>
</message>
<message numerus="yes">
- <location line="+20"/>
+ <location line="+23"/>
<source>%n hour(s)</source>
<translation><numerusform>%n uur</numerusform><numerusform>%n uur</numerusform></translation>
</message>
@@ -595,7 +622,7 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d
<translation>%1 achter</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="+21"/>
<source>Last received block was generated %1 ago.</source>
<translation>Laatst ontvangen blok was %1 geleden gegenereerd.</translation>
</message>
@@ -620,27 +647,17 @@ Dit product bevat software ontwikkeld door het OpenSSL Project voor gebruik in d
<translation>Informatie</translation>
</message>
<message>
- <location line="+77"/>
- <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="-152"/>
+ <location line="-85"/>
<source>Up to date</source>
<translation>Bijgewerkt</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Catching up...</source>
<translation>Aan het bijwerken...</translation>
</message>
<message>
- <location line="+124"/>
- <source>Confirm transaction fee</source>
- <translation>Bevestig transactiekosten</translation>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+130"/>
<source>Sent transaction</source>
<translation>Verzonden transactie</translation>
</message>
@@ -663,17 +680,7 @@ Adres: %4
</translation>
</message>
<message>
- <location line="+34"/>
- <source>URI handling</source>
- <translation>URI-behandeling</translation>
- </message>
- <message>
- <location line="+0"/>
- <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>
- <message>
- <location line="+45"/>
+ <location line="+69"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation>Portemonnee is &lt;b&gt;versleuteld&lt;/b&gt; en momenteel &lt;b&gt;geopend&lt;/b&gt;</translation>
</message>
@@ -683,7 +690,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 filename="../bitcoin.cpp" line="+110"/>
+ <location filename="../bitcoin.cpp" line="+438"/>
<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>
@@ -691,12 +698,304 @@ Adres: %4
<context>
<name>ClientModel</name>
<message>
- <location filename="../clientmodel.cpp" line="+115"/>
+ <location filename="../clientmodel.cpp" line="+119"/>
<source>Network Alert</source>
<translation>Netwerkwaarschuwing</translation>
</message>
</context>
<context>
+ <name>CoinControlDialog</name>
+ <message>
+ <location filename="../forms/coincontroldialog.ui" line="+14"/>
+ <source>Coin Control Address Selection</source>
+ <translation>Coin controle adres selectie</translation>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>Quantity:</source>
+ <translation>Kwantiteit</translation>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Bytes:</source>
+ <translation>Bytes:</translation>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>Amount:</source>
+ <translation>Bedrag:</translation>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Priority:</source>
+ <translation>Prioriteit:</translation>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>Fee:</source>
+ <translation>Vergoeding:</translation>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Low Output:</source>
+ <translation>Lage uitvoer:</translation>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>After Fee:</source>
+ <translation>Na vergoeding:</translation>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Change:</source>
+ <translation>Wijzigen:</translation>
+ </message>
+ <message>
+ <location line="+63"/>
+ <source>(un)select all</source>
+ <translation>(de)selecteer alles</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Tree mode</source>
+ <translation>Boom modus</translation>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>List mode</source>
+ <translation>Lijst modus</translation>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>Amount</source>
+ <translation>Bedrag</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Address</source>
+ <translation>Adres</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Date</source>
+ <translation>Datum</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Confirmations</source>
+ <translation>Bevestigingen</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Confirmed</source>
+ <translation>Bevestigd</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Priority</source>
+ <translation>Prioriteit</translation>
+ </message>
+ <message>
+ <location filename="../coincontroldialog.cpp" line="+42"/>
+ <source>Copy address</source>
+ <translation>Kopieer adres</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy label</source>
+ <translation>Kopieer label</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+26"/>
+ <source>Copy amount</source>
+ <translation>Kopieer bedrag</translation>
+ </message>
+ <message>
+ <location line="-25"/>
+ <source>Copy transaction ID</source>
+ <translation>Kopieer transactie-ID</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Lock unspent</source>
+ <translation>Blokeer niet gebruikte</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Unlock unspent</source>
+ <translation>Deblokkeer ongebruikte</translation>
+ </message>
+ <message>
+ <location line="+22"/>
+ <source>Copy quantity</source>
+ <translation>Kopieer aantal</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Copy fee</source>
+ <translation>Kopieer vergoeding</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy after fee</source>
+ <translation>Kopieer na vergoeding</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy bytes</source>
+ <translation>Kopieer bytes</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy priority</source>
+ <translation>Kopieer prioriteit</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy low output</source>
+ <translation>Kopieer lage uitvoer</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy change</source>
+ <translation>Kopieer wijzig</translation>
+ </message>
+ <message>
+ <location line="+323"/>
+ <source>highest</source>
+ <translation>hoogste</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>higher</source>
+ <translation>hoger</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>high</source>
+ <translation>hoog</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>medium-high</source>
+ <translation>gemiddeld hoog</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>medium</source>
+ <translation>gemiddeld</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>low-medium</source>
+ <translation>laag gemiddeld</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>low</source>
+ <translation>laag</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>lower</source>
+ <translation>lager</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>lowest</source>
+ <translation>laagste</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>(%1 locked)</source>
+ <translation>(%1 geblokeerd)</translation>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>none</source>
+ <translation>geen</translation>
+ </message>
+ <message>
+ <location line="+140"/>
+ <source>Dust</source>
+ <translation>Stof</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>yes</source>
+ <translation>ja</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>no</source>
+ <translation>nee</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>This label turns red, if the transaction size is greater than 1000 bytes.</source>
+ <translation>Dit label wordt rood, als de transactie grootte meer dan 1000 bytes is.</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+5"/>
+ <source>This means a fee of at least %1 per kB is required.</source>
+ <translation>Dit betekent dat een vergoeding van minimaal %1 per kB nodig is.</translation>
+ </message>
+ <message>
+ <location line="-4"/>
+ <source>Can vary +/- 1 byte per input.</source>
+ <translation>Kan +/- byte per invoer variëren.</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Transactions with higher priority are more likely to get included into a block.</source>
+ <translation>Transacties met een hogere prioriteit zullen eerder in een block gezet worden.</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>This label turns red, if the priority is smaller than &quot;medium&quot;.</source>
+ <translation>Als dit label rood is, is de prioriteit minder dan &quot;medium&quot;.</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>This label turns red, if any recipient receives an amount smaller than %1.</source>
+ <translation>Dit label wordt rood, als een ontvanger een bedrag van minder dan %1 gekregen heeft.</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+4"/>
+ <source>This means a fee of at least %1 is required.</source>
+ <translation>Dit betekend dat een minimale vergoeding van %1 nodig is.</translation>
+ </message>
+ <message>
+ <location line="-3"/>
+ <source>Amounts below 0.546 times the minimum relay fee are shown as dust.</source>
+ <translation>Bedragen beneden 0.546 keer het minimum relais vergoeding, worden als stof aangemerkt.</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>This label turns red, if the change is smaller than %1.</source>
+ <translation>Dit label wordt rood, als de wijziging is kleiner dan %1.</translation>
+ </message>
+ <message>
+ <location line="+43"/>
+ <location line="+66"/>
+ <source>(no label)</source>
+ <translation>(geen label)</translation>
+ </message>
+ <message>
+ <location line="-9"/>
+ <source>change from %1 (%2)</source>
+ <translation>wijzig van %1 (%2)</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>(change)</source>
+ <translation>(wijzig)</translation>
+ </message>
+</context>
+<context>
<name>EditAddressDialog</name>
<message>
<location filename="../forms/editaddressdialog.ui" line="+14"/>
@@ -711,12 +1010,12 @@ Adres: %4
<message>
<location line="+10"/>
<source>The label associated with this address list entry</source>
- <translation type="unfinished"/>
+ <translation>Het label dat bij dit adres item hoort</translation>
</message>
<message>
<location line="+17"/>
<source>The address associated with this address list entry. This can only be modified for sending addresses.</source>
- <translation type="unfinished"/>
+ <translation>Het adres dat bij dit adres item hoort. Dit kan alleen bewerkt worden voor verstuur adressen.</translation>
</message>
<message>
<location line="-10"/>
@@ -724,7 +1023,7 @@ Adres: %4
<translation>&amp;Adres</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+21"/>
+ <location filename="../editaddressdialog.cpp" line="+28"/>
<source>New receiving address</source>
<translation>Nieuw ontvangstadres</translation>
</message>
@@ -767,7 +1066,7 @@ Adres: %4
<context>
<name>FreespaceChecker</name>
<message>
- <location filename="../intro.cpp" line="+61"/>
+ <location filename="../intro.cpp" line="+65"/>
<source>A new data directory will be created.</source>
<translation>Een nieuwe gegevensmap wordt aangemaakt.</translation>
</message>
@@ -793,15 +1092,19 @@ Adres: %4
</message>
</context>
<context>
- <name>GUIUtil::HelpMessageBox</name>
+ <name>HelpMessageDialog</name>
<message>
- <location filename="../guiutil.cpp" line="+558"/>
- <location line="+13"/>
- <source>Bitcoin-Qt</source>
- <translation>Bitcoin-Qt</translation>
+ <location filename="../forms/helpmessagedialog.ui" line="+19"/>
+ <source>Bitcoin Core - Command-line options</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="-13"/>
+ <location filename="../utilitydialog.cpp" line="+38"/>
+ <source>Bitcoin Core</source>
+ <translation>Bitcoin Kern</translation>
+ </message>
+ <message>
+ <location line="+0"/>
<source>version</source>
<translation>versie</translation>
</message>
@@ -850,18 +1153,18 @@ Adres: %4
</message>
<message>
<location line="+9"/>
- <source>Welcome to Bitcoin-Qt.</source>
- <translation>Welkom bij Bitcoin-Qt.</translation>
+ <source>Welcome to Bitcoin Core.</source>
+ <translation>Welkom bij Bitcoin Core</translation>
</message>
<message>
<location line="+26"/>
- <source>As this is the first time the program is launched, you can choose where Bitcoin-Qt will store its data.</source>
- <translation>Gezien dit de eerste keer is dat dit programma is gestart, kun je kiezen waar Bitcoin-Qt zijn gegevens zal opslaan.</translation>
+ <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
+ <translation>Omdat dit de eerste keer is dat het programma gestart is, kan je nu kiezen waar Bitcoin Core de data moet opslaan.</translation>
</message>
<message>
<location line="+10"/>
- <source>Bitcoin-Qt will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
- <translation>Bitcoin-Qt zal een kopie van de Bitcoin blok keten downloaden en opslaan. Tenminste %1GB aan gegevens zal worden opgeslagen in deze folder, en dit zal toenemen over tijd. De portemonnee zal ook opgeslagen worden in deze folder.</translation>
+ <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
+ <translation>Bitcoin Core zal een kopie van de Bitcoin blok keten downloaden en opslaan. Tenminste %1 GB aan data wordt opgeslagen in deze map en het zal groeien in de tijd. De portemonnee ook in deze map.</translation>
</message>
<message>
<location line="+10"/>
@@ -874,7 +1177,17 @@ Adres: %4
<translation>Gebruik een persoonlijke gegevensmap:</translation>
</message>
<message>
- <location filename="../intro.cpp" line="+105"/>
+ <location filename="../intro.cpp" line="+85"/>
+ <source>Bitcoin</source>
+ <translation>Bitcoin</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error: Specified data directory &quot;%1&quot; can not be created.</source>
+ <translation>Fout: Opgegeven gegevensmap &quot;%1&quot; kan niet aangemaakt worden.</translation>
+ </message>
+ <message>
+ <location line="+19"/>
<source>Error</source>
<translation>Fout</translation>
</message>
@@ -890,6 +1203,34 @@ Adres: %4
</message>
</context>
<context>
+ <name>OpenURIDialog</name>
+ <message>
+ <location filename="../forms/openuridialog.ui" line="+14"/>
+ <source>Open URI</source>
+ <translation>Open URI</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Open payment request from URI or file</source>
+ <translation>Open betalingsverzoek via URI of bestand</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>URI:</source>
+ <translation>URI:</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Select payment request file</source>
+ <translation>Selecteer betalingsverzoek bestand</translation>
+ </message>
+ <message>
+ <location filename="../openuridialog.cpp" line="+47"/>
+ <source>Select payment request file to open</source>
+ <translation>Selecteer betalingsverzoek bestand om te openen</translation>
+ </message>
+</context>
+<context>
<name>OptionsDialog</name>
<message>
<location filename="../forms/optionsdialog.ui" line="+14"/>
@@ -897,7 +1238,7 @@ Adres: %4
<translation>Opties</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+13"/>
<source>&amp;Main</source>
<translation>&amp;Algemeen</translation>
</message>
@@ -922,7 +1263,52 @@ Adres: %4
<translation>Start &amp;Bitcoin bij het inloggen in het systeem</translation>
</message>
<message>
- <location line="+35"/>
+ <location line="+9"/>
+ <source>Size of &amp;database cache</source>
+ <translation>Grootte van de &amp;database cache</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set database cache size in megabytes (default: 25)</source>
+ <translation>Stel databankcachegrootte in in megabytes (standaard: 25)</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>MB</source>
+ <translation>MB</translation>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Number of script &amp;verification threads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
+ <translation>Stel het aantal threads voor scriptverificatie in (max 16, 0 = auto, &lt;0 = laat zoveel cores vrij, standaard: 0)</translation>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Connect to the Bitcoin network through a SOCKS proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Connect through SOCKS proxy (default proxy):</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
+ <translation>IP-adres van de proxy (bijv. IPv4: 127.0.0.1 / IPv6: ::1)</translation>
+ </message>
+ <message>
+ <location line="+224"/>
+ <source>Active command-line options that override above options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
<source>Reset all client options to default.</source>
<translation>Reset alle clientopties naar de standaardinstellingen.</translation>
</message>
@@ -932,7 +1318,7 @@ Adres: %4
<translation>&amp;Reset Opties</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="-323"/>
<source>&amp;Network</source>
<translation>&amp;Netwerk</translation>
</message>
@@ -947,32 +1333,17 @@ Adres: %4
<translation>Portmapping via &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>Verbind met het Bitcoin-netwerk via een SOCKS-proxy (bijv. wanneer u via Tor wilt verbinden)</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>&amp;Connect through SOCKS proxy:</source>
- <translation>&amp;Verbind via een SOCKS-proxy</translation>
- </message>
- <message>
- <location line="+9"/>
+ <location line="+19"/>
<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>IP-adres van de proxy (bijv. 127.0.0.1)</translation>
- </message>
- <message>
- <location line="+7"/>
+ <location line="+32"/>
<source>&amp;Port:</source>
<translation>&amp;Poort:</translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+25"/>
<source>Port of the proxy (e.g. 9050)</source>
<translation>Poort van de proxy (bijv. 9050)</translation>
</message>
@@ -1047,7 +1418,17 @@ Adres: %4
<translation>Toon a&amp;dressen in de transactielijst</translation>
</message>
<message>
- <location line="+71"/>
+ <location line="+7"/>
+ <source>Whether to show coin control features or not.</source>
+ <translation>Munt controle functies weergeven of niet.</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Display coin &amp;control features (experts only)</source>
+ <translation>Toon munt &amp;controle functions (alleen voor experts)</translation>
+ </message>
+ <message>
+ <location line="+136"/>
<source>&amp;OK</source>
<translation>&amp;OK</translation>
</message>
@@ -1057,44 +1438,38 @@ Adres: %4
<translation>Ann&amp;uleren</translation>
</message>
<message>
- <location line="+10"/>
- <source>&amp;Apply</source>
- <translation>&amp;Toepassen</translation>
- </message>
- <message>
- <location filename="../optionsdialog.cpp" line="+58"/>
+ <location filename="../optionsdialog.cpp" line="+67"/>
<source>default</source>
<translation>standaard</translation>
</message>
<message>
- <location line="+130"/>
+ <location line="+57"/>
+ <source>none</source>
+ <translation>geen</translation>
+ </message>
+ <message>
+ <location line="+75"/>
<source>Confirm options reset</source>
<translation>Bevestig reset opties</translation>
</message>
<message>
<location line="+1"/>
- <source>Some settings may require a client restart to take effect.</source>
- <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> Wilt u doorgaan?</translation>
+ <location line="+29"/>
+ <source>Client restart required to activate changes.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
- <location line="+9"/>
- <source>Warning</source>
- <translation>Waarschuwing</translation>
+ <location line="-29"/>
+ <source>Client will be shutdown, do you want to proceed?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="-9"/>
- <location line="+9"/>
- <source>This setting will take effect after restarting Bitcoin.</source>
- <translation>Deze instelling zal pas van kracht worden na het herstarten van Bitcoin.</translation>
+ <location line="+33"/>
+ <source>This change would require a client restart.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+29"/>
+ <location line="+34"/>
<source>The supplied proxy address is invalid.</source>
<translation>Het opgegeven proxyadres is ongeldig.</translation>
</message>
@@ -1108,22 +1483,22 @@ Adres: %4
</message>
<message>
<location line="+50"/>
- <location line="+202"/>
+ <location line="+231"/>
<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="-131"/>
+ <location line="-155"/>
<source>Unconfirmed:</source>
<translation>Onbevestigd:</translation>
</message>
<message>
- <location line="-78"/>
+ <location line="-83"/>
<source>Wallet</source>
<translation>Portemonnee</translation>
</message>
<message>
- <location line="+49"/>
+ <location line="+51"/>
<source>Confirmed:</source>
<translation>Bevestigd:</translation>
</message>
@@ -1133,12 +1508,12 @@ Adres: %4
<translation>Uw beschikbare saldo</translation>
</message>
<message>
- <location line="+29"/>
+ <location line="+32"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation>De som van de transacties die nog bevestigd moeten worden, en nog niet meetellen in uw beschikbare saldo</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+16"/>
<source>Immature:</source>
<translation>Immatuur:</translation>
</message>
@@ -1148,7 +1523,7 @@ Adres: %4
<translation>Gedolven saldo dat nog niet tot wasdom is gekomen</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+16"/>
<source>Total:</source>
<translation>Totaal:</translation>
</message>
@@ -1158,12 +1533,12 @@ Adres: %4
<translation>Uw totale saldo</translation>
</message>
<message>
- <location line="+53"/>
+ <location line="+71"/>
<source>&lt;b&gt;Recent transactions&lt;/b&gt;</source>
<translation>&lt;b&gt;Recente transacties&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../overviewpage.cpp" line="+116"/>
+ <location filename="../overviewpage.cpp" line="+120"/>
<location line="+1"/>
<source>out of sync</source>
<translation>niet gesynchroniseerd</translation>
@@ -1172,7 +1547,8 @@ Adres: %4
<context>
<name>PaymentServer</name>
<message>
- <location filename="../paymentserver.cpp" line="+392"/>
+ <location filename="../paymentserver.cpp" line="+403"/>
+ <location line="+13"/>
<source>URI handling</source>
<translation>URI-behandeling</translation>
</message>
@@ -1182,45 +1558,82 @@ Adres: %4
<translation>URI kan niet worden geïnterpreteerd. Dit kan komen door een ongeldig Bitcoinadres of misvormde URI-parameters.</translation>
</message>
<message>
- <location line="+69"/>
+ <location line="+96"/>
<source>Requested payment amount of %1 is too small (considered dust).</source>
- <translation type="unfinished"/>
+ <translation>Het gevraagde betalingsbedrag van 1% is te weinig (beschouwd als stof).</translation>
</message>
<message>
- <location line="+4"/>
- <location line="+37"/>
+ <location line="-221"/>
+ <location line="+212"/>
+ <location line="+13"/>
+ <location line="+95"/>
+ <location line="+18"/>
+ <location line="+16"/>
<source>Payment request error</source>
<translation>Fout bij betalingsverzoek</translation>
</message>
<message>
+ <location line="-353"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
+ <translation>Kan bitcoin niet starten: click-to-pay handler</translation>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Net manager warning</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+1"/>
- <source>Insecure requests to custom payment scripts unsupported</source>
- <translation>Onbeveiligde verzoeken naar aangepaste betalingsscripts worden niet ondersteund</translation>
+ <source>Your active proxy doesn&apos;t support SOCKS5, which is required for payment requests via proxy.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+38"/>
- <source>Refund from %1</source>
+ <location line="+52"/>
+ <source>Payment request fetch URL is invalid: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
+ <location line="+27"/>
+ <source>Payment request file handling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Payment request file can not be read or processed! This can be caused by an invalid payment request file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+73"/>
+ <source>Unverified payment requests to custom payment scripts are unsupported.</source>
+ <translation>Niet-geverifieerde betalingsverzoeken naar aangepaste betaling scripts worden niet ondersteund.</translation>
+ </message>
+ <message>
+ <location line="+59"/>
+ <source>Refund from %1</source>
+ <translation>Restitutie van 1%</translation>
+ </message>
+ <message>
+ <location line="+43"/>
<source>Error communicating with %1: %2</source>
<translation>Fout bij communiceren met %1: %2</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+24"/>
+ <source>Payment request can not be parsed or processed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
<source>Bad response from server %1</source>
<translation>Ongeldige respons van server %1</translation>
</message>
<message>
- <location line="+32"/>
+ <location line="+33"/>
<source>Payment acknowledged</source>
<translation>Betaling bevestigd</translation>
</message>
<message>
- <location line="-58"/>
- <location line="+30"/>
- <location line="+17"/>
+ <location line="-11"/>
<source>Network request error</source>
<translation>Netwerkfout bij verzoek</translation>
</message>
@@ -1228,39 +1641,33 @@ Adres: %4
<context>
<name>QObject</name>
<message>
- <location filename="../bitcoin.cpp" line="+114"/>
- <location line="+5"/>
- <location filename="../intro.cpp" line="-32"/>
+ <location filename="../bitcoin.cpp" line="+71"/>
+ <location line="+11"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-4"/>
+ <location line="+1"/>
<source>Error: Specified data directory &quot;%1&quot; does not exist.</source>
<translation>Fout: Opgegeven gegevensmap &quot;%1&quot; bestaat niet.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="-12"/>
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation>Fout: Ongeldige combinatie van -regtest en -testnet</translation>
</message>
- <message>
- <location filename="../intro.cpp" line="+1"/>
- <source>Error: Specified data directory &quot;%1&quot; can not be created.</source>
- <translation>Fout: Opgegeven gegevensmap &quot;%1&quot; kan niet aangemaakt worden.</translation>
- </message>
</context>
<context>
<name>QRImageWidget</name>
<message>
- <location filename="../receiverequestdialog.cpp" line="+32"/>
+ <location filename="../receiverequestdialog.cpp" line="+36"/>
<source>&amp;Save Image...</source>
- <translation type="unfinished"/>
+ <translation>&amp;Afbeelding opslaan...</translation>
</message>
<message>
<location line="+3"/>
<source>&amp;Copy Image</source>
- <translation type="unfinished"/>
+ <translation>&amp;Afbeelding kopiëren</translation>
</message>
<message>
<location line="+28"/>
@@ -1269,8 +1676,8 @@ Adres: %4
</message>
<message>
<location line="+0"/>
- <source>PNG Images (*.png)</source>
- <translation>PNG-Afbeeldingen (*.png)</translation>
+ <source>PNG Image (*.png)</source>
+ <translation>PNG afbeelding (*.png)</translation>
</message>
</context>
<context>
@@ -1287,15 +1694,16 @@ Adres: %4
<location line="+23"/>
<location line="+23"/>
<location line="+36"/>
- <location line="+53"/>
+ <location line="+23"/>
+ <location line="+36"/>
<location line="+23"/>
<location line="+23"/>
- <location filename="../rpcconsole.cpp" line="+352"/>
+ <location filename="../rpcconsole.cpp" line="+359"/>
<source>N/A</source>
<translation>N.v.t.</translation>
</message>
<message>
- <location line="-217"/>
+ <location line="-223"/>
<source>Client version</source>
<translation>Clientversie</translation>
</message>
@@ -1305,7 +1713,17 @@ Adres: %4
<translation>&amp;Informatie</translation>
</message>
<message>
- <location line="+68"/>
+ <location line="-10"/>
+ <source>Debug window</source>
+ <translation>Debug venster</translation>
+ </message>
+ <message>
+ <location line="+25"/>
+ <source>General</source>
+ <translation>Algemeen</translation>
+ </message>
+ <message>
+ <location line="+53"/>
<source>Using OpenSSL version</source>
<translation>Gebruikt OpenSSL versie</translation>
</message>
@@ -1321,16 +1739,16 @@ Adres: %4
</message>
<message>
<location line="+7"/>
- <source>Number of connections</source>
- <translation>Aantal connecties</translation>
+ <source>Name</source>
+ <translation>Naam</translation>
</message>
<message>
<location line="+23"/>
- <source>On testnet</source>
- <translation>Op testnet</translation>
+ <source>Number of connections</source>
+ <translation>Aantal connecties</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+29"/>
<source>Block chain</source>
<translation>Blokketen</translation>
</message>
@@ -1355,21 +1773,6 @@ Adres: %4
<translation>&amp;Open</translation>
</message>
<message>
- <location line="+16"/>
- <source>Command-line options</source>
- <translation>Commandoregel-opties</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>Toon het BitcoinQt-hulpbericht voor een lijst met mogelijke Bitcoin commandoregel-opties.</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>&amp;Show</source>
- <translation>&amp;Toon</translation>
- </message>
- <message>
<location line="+24"/>
<source>&amp;Console</source>
<translation>&amp;Console</translation>
@@ -1377,45 +1780,35 @@ Adres: %4
<message>
<location line="+72"/>
<source>&amp;Network Traffic</source>
- <translation type="unfinished"/>
+ <translation>&amp;Netwerkverkeer</translation>
</message>
<message>
<location line="+52"/>
<source>&amp;Clear</source>
- <translation type="unfinished"/>
+ <translation>&amp;Wissen</translation>
</message>
<message>
<location line="+13"/>
<source>Totals</source>
- <translation type="unfinished"/>
+ <translation>Totalen</translation>
</message>
<message>
<location line="+64"/>
<source>In:</source>
- <translation type="unfinished"/>
+ <translation>In;</translation>
</message>
<message>
<location line="+80"/>
<source>Out:</source>
- <translation type="unfinished"/>
+ <translation>Uit:</translation>
</message>
<message>
- <location line="-541"/>
+ <location line="-521"/>
<source>Build date</source>
<translation>Bouwdatum</translation>
</message>
<message>
- <location line="-104"/>
- <source>Bitcoin - Debug window</source>
- <translation>Bitcoin-debugscherm</translation>
- </message>
- <message>
- <location line="+25"/>
- <source>Bitcoin Core</source>
- <translation>Bitcoin Kern</translation>
- </message>
- <message>
- <location line="+279"/>
+ <location line="+206"/>
<source>Debug log file</source>
<translation>Debug-logbestand</translation>
</message>
@@ -1425,7 +1818,7 @@ Adres: %4
<translation>Open het Bitcoindebug-logbestand van de huidige datamap. Dit kan een aantal seconden duren voor grote logbestanden.</translation>
</message>
<message>
- <location line="+102"/>
+ <location line="+76"/>
<source>Clear console</source>
<translation>Maak console leeg</translation>
</message>
@@ -1445,102 +1838,127 @@ Adres: %4
<translation>Typ &lt;b&gt;help&lt;/b&gt; voor een overzicht van de beschikbare commando&apos;s.</translation>
</message>
<message>
- <location line="+128"/>
+ <location line="+122"/>
<source>%1 B</source>
- <translation type="unfinished"/>
+ <translation>%1 B</translation>
</message>
<message>
<location line="+2"/>
<source>%1 KB</source>
- <translation type="unfinished"/>
+ <translation>%1 Kb</translation>
</message>
<message>
<location line="+2"/>
<source>%1 MB</source>
- <translation type="unfinished"/>
+ <translation>%1 MB</translation>
</message>
<message>
<location line="+2"/>
<source>%1 GB</source>
- <translation type="unfinished"/>
+ <translation>%1 Gb</translation>
</message>
<message>
<location line="+7"/>
<source>%1 m</source>
- <translation type="unfinished"/>
+ <translation>%1 m</translation>
</message>
<message>
<location line="+5"/>
<source>%1 h</source>
- <translation type="unfinished"/>
+ <translation>%1 uur</translation>
</message>
<message>
<location line="+2"/>
<source>%1 h %2 m</source>
- <translation type="unfinished"/>
+ <translation>%</translation>
</message>
</context>
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+22"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
<source>&amp;Amount:</source>
- <translation type="unfinished"/>
+ <translation>&amp;Bedrag</translation>
</message>
<message>
- <location line="+16"/>
- <source>The amount to request</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+7"/>
+ <location line="-13"/>
<source>&amp;Label:</source>
<translation>&amp;Label:</translation>
</message>
<message>
- <location line="+10"/>
- <source>The label to associate with the receiving address</source>
- <translation type="unfinished"/>
+ <location line="-34"/>
+ <source>&amp;Message:</source>
+ <translation>&amp;Bericht</translation>
</message>
<message>
- <location line="+7"/>
- <source>&amp;Message:</source>
- <translation type="unfinished"/>
+ <location line="-17"/>
+ <source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
+ <translation>Gebruik een van de eerder gebruikte ontvangstadressen opnieuw. Het opnieuw gebruiken van adressen heeft beveiliging- en privacy problemen. Gebruik dit niet, behalve als er eerder een betalingsverzoek opnieuw gegenereerd is.</translation>
</message>
<message>
- <location line="+10"/>
- <source>The message to attach to payment request</source>
- <translation type="unfinished"/>
+ <location line="+3"/>
+ <source>R&amp;euse an existing receiving address (not recommended)</source>
+ <translation>H&amp;ergebruik en bestaand ontvangstadres (niet aanbevolen)</translation>
</message>
<message>
- <location line="+14"/>
- <source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
+ <location line="+27"/>
+ <source>An optional label to associate with the new receiving address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>R&amp;euse an existing receiving address (not recommended)</source>
+ <location line="+7"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+7"/>
- <source>Use this form to request payments. All fields are optional.</source>
+ <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+39"/>
+ <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+17"/>
<source>Clear all fields of the form.</source>
- <translation type="unfinished"/>
+ <translation>Wis alle velden op het formulier.</translation>
</message>
<message>
<location line="+3"/>
<source>Clear</source>
- <translation type="unfinished"/>
+ <translation>Wissen</translation>
</message>
<message>
<location line="+36"/>
<source>&amp;Request payment</source>
- <translation type="unfinished"/>
+ <translation>&amp;Betalingsverzoek</translation>
+ </message>
+ <message>
+ <location line="+47"/>
+ <source>Requested payments</source>
+ <translation>Betalingsverzoeken</translation>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Show the selected request (does the same as double clicking an entry)</source>
+ <translation>Toon het geselecteerde verzoek (doet hetzelfde als dubbelklikken)</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Show</source>
+ <translation>Toon</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Remove the selected entries from the list</source>
+ <translation>Verwijder de geselecteerd items van de lijst</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Remove</source>
+ <translation>Verwijder</translation>
</message>
</context>
<context>
@@ -1553,37 +1971,32 @@ Adres: %4
<message>
<location line="+46"/>
<source>Copy &amp;URI</source>
- <translation type="unfinished"/>
+ <translation>Kopieer &amp;URI</translation>
</message>
<message>
<location line="+7"/>
<source>Copy &amp;Address</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+7"/>
- <source>&amp;Copy Image</source>
- <translation type="unfinished"/>
+ <translation>Kopieer &amp;adres</translation>
</message>
<message>
<location line="+7"/>
<source>&amp;Save Image...</source>
- <translation type="unfinished"/>
+ <translation>&amp;Sla plaatje om...</translation>
</message>
<message>
- <location filename="../receiverequestdialog.cpp" line="+58"/>
+ <location filename="../receiverequestdialog.cpp" line="+56"/>
<source>Request payment to %1</source>
- <translation type="unfinished"/>
+ <translation>Betalingsverzoek tot %1</translation>
</message>
<message>
<location line="+6"/>
<source>Payment information</source>
- <translation type="unfinished"/>
+ <translation>Betalingsinformatie</translation>
</message>
<message>
<location line="+1"/>
<source>URI</source>
- <translation type="unfinished"/>
+ <translation>URI</translation>
</message>
<message>
<location line="+2"/>
@@ -1617,16 +2030,119 @@ Adres: %4
</message>
</context>
<context>
+ <name>RecentRequestsTableModel</name>
+ <message>
+ <location filename="../recentrequeststablemodel.cpp" line="+24"/>
+ <source>Date</source>
+ <translation>Datum</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Label</source>
+ <translation>Label</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Message</source>
+ <translation>Bericht</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Amount</source>
+ <translation>Bedrag</translation>
+ </message>
+ <message>
+ <location line="+38"/>
+ <source>(no label)</source>
+ <translation>(geen label)</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>(no message)</source>
+ <translation>(geen bericht)</translation>
+ </message>
+</context>
+<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+140"/>
- <location line="+213"/>
+ <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location line="+80"/>
<source>Send Coins</source>
<translation>Verstuur munten</translation>
</message>
<message>
- <location line="+50"/>
+ <location line="+76"/>
+ <source>Coin Control Features</source>
+ <translation>Coin controle opties</translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Inputs...</source>
+ <translation>Invoer...</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>automatically selected</source>
+ <translation>automatisch geselecteerd</translation>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Insufficient funds!</source>
+ <translation>Onvoldoende fonds!</translation>
+ </message>
+ <message>
+ <location line="+89"/>
+ <source>Quantity:</source>
+ <translation>Kwantiteit</translation>
+ </message>
+ <message>
+ <location line="+35"/>
+ <source>Bytes:</source>
+ <translation>Bytes:</translation>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Amount:</source>
+ <translation>Bedrag:</translation>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Priority:</source>
+ <translation>Prioriteit:</translation>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Fee:</source>
+ <translation>Vergoeding:</translation>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Low Output:</source>
+ <translation>Lage uitvoer:</translation>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>After Fee:</source>
+ <translation>Na vergoeding:</translation>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Change:</source>
+ <translation>Wijzigen:</translation>
+ </message>
+ <message>
+ <location line="+44"/>
+ <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source>
+ <translation>Als dit is geactiveerd, maar het wijzigingsadres is leeg of ongeldig, dan wordt de wijziging verzonden naar een nieuw gegenereerde adres.</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Custom change address</source>
+ <translation>Maatwerk wijzig adres</translation>
+ </message>
+ <message>
+ <location line="+115"/>
<source>Send to multiple recipients at once</source>
<translation>Verstuur aan verschillende ontvangers ineens</translation>
</message>
@@ -1638,7 +2154,7 @@ Adres: %4
<message>
<location line="+20"/>
<source>Clear all fields of the form.</source>
- <translation type="unfinished"/>
+ <translation>Wis alle velden van het formulier.</translation>
</message>
<message>
<location line="+3"/>
@@ -1651,12 +2167,7 @@ Adres: %4
<translation>Saldo:</translation>
</message>
<message>
- <location line="+10"/>
- <source>123.456 BTC</source>
- <translation>123.456 BTC</translation>
- </message>
- <message>
- <location line="+31"/>
+ <location line="+41"/>
<source>Confirm the send action</source>
<translation>Bevestig de verstuuractie</translation>
</message>
@@ -1666,49 +2177,125 @@ Adres: %4
<translation>&amp;Verstuur</translation>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-154"/>
+ <location filename="../sendcoinsdialog.cpp" line="-228"/>
<source>Confirm send coins</source>
<translation>Bevestig versturen munten</translation>
</message>
<message>
- <location line="-90"/>
+ <location line="-74"/>
<location line="+5"/>
<location line="+5"/>
+ <location line="+4"/>
<source>%1 to %2</source>
- <translation type="unfinished"/>
+ <translation>%1 tot %2</translation>
</message>
<message>
- <location line="+26"/>
+ <location line="-136"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation>Vul een Bitcoinadres in (bijv. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Copy quantity</source>
+ <translation>Kopieer aantal</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation>Kopieer bedrag</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy fee</source>
+ <translation>Kopieer vergoeding</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy after fee</source>
+ <translation>Kopieer na vergoeding</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy bytes</source>
+ <translation>Kopieer bytes</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy priority</source>
+ <translation>Kopieer prioriteit</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy low output</source>
+ <translation>Kopieer lage uitvoer</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy change</source>
+ <translation>Kopieer wijzig</translation>
+ </message>
+ <message>
+ <location line="+170"/>
+ <source>Total Amount %1 (= %2)</source>
+ <translation>Totaal bedrag %1 (= %2)</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>or</source>
+ <translation>of</translation>
+ </message>
+ <message>
+ <location line="+202"/>
<source>The recipient address is not valid, please recheck.</source>
<translation>Het ontvangstadres is niet geldig, controleer uw invoer.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The amount to pay must be larger than 0.</source>
<translation>Het ingevoerde bedrag moet groter zijn dan 0.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The amount exceeds your balance.</source>
<translation>Bedrag is hoger dan uw huidige saldo</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The total exceeds your balance when the %1 transaction fee is included.</source>
<translation>Totaal overschrijdt uw huidige saldo wanneer de %1 transactiekosten worden meegerekend</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+3"/>
<source>Duplicate address found, can only send to each address once per send operation.</source>
<translation>Dubbel adres gevonden, u kunt slechts eenmaal naar een bepaald adres verzenden per verstuurtransactie</translation>
</message>
<message>
+ <location line="+3"/>
+ <source>Transaction creation failed!</source>
+ <translation>Transactie creatie niet gelukt!</translation>
+ </message>
+ <message>
<location line="+4"/>
- <source>Error: Transaction creation failed!</source>
- <translation>Fout: Aanmaak transactie mislukt!</translation>
+ <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
+ <translation>De transactie was afgewezen. Dit kan gebeuren als u eerder uitgegeven munten opnieuw wilt versturen, zoals wanneer u een kopie van uw wallet.dat heeft gebruikt en in de kopie deze munten zijn gemarkeerd als uitgegeven, maar in de huidige nog niet.</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+112"/>
+ <source>Warning: Invalid Bitcoin address</source>
+ <translation>Waarschuwing: Ongeldig Bitcoin adres</translation>
+ </message>
+ <message>
+ <location line="+21"/>
+ <source>(no label)</source>
+ <translation>(geen label)</translation>
+ </message>
+ <message>
+ <location line="-11"/>
+ <source>Warning: Unknown change address</source>
+ <translation>Waarschuwing: Onbekende adres wijziging</translation>
+ </message>
+ <message>
+ <location line="-366"/>
<source>Are you sure you want to send?</source>
<translation>Weet u zeker dat u wilt verzenden?</translation>
</message>
@@ -1718,17 +2305,7 @@ Adres: %4
<translation>toegevoegd als transactiekosten</translation>
</message>
<message>
- <location line="+6"/>
- <source>Total Amount %1</source>
- <translation>Totaalbedrag %1</translation>
- </message>
- <message>
- <location line="+20"/>
- <source>Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
- <translation>Fout: De transactie was afgewezen. Dit kan gebeuren als u eerder uitgegeven munten opnieuw wilt versturen, zoals wanneer u een kopie van uw portemonneebestand (wallet.dat) heeft gebruikt en in de kopie deze munten zijn uitgegeven, maar in de huidige portemonnee deze nog niet als zodanig zijn gemarkeerd.</translation>
- </message>
- <message>
- <location line="+144"/>
+ <location line="+170"/>
<source>Payment request expired</source>
<translation>Betalingsverzoek verlopen</translation>
</message>
@@ -1741,39 +2318,44 @@ Adres: %4
<context>
<name>SendCoinsEntry</name>
<message>
- <location filename="../forms/sendcoinsentry.ui" line="+33"/>
- <location line="+585"/>
+ <location filename="../forms/sendcoinsentry.ui" line="+131"/>
+ <location line="+521"/>
+ <location line="+536"/>
<source>A&amp;mount:</source>
<translation>Bedra&amp;g:</translation>
</message>
<message>
- <location line="-572"/>
- <location line="+585"/>
+ <location line="-1152"/>
<source>Pay &amp;To:</source>
<translation>Betaal &amp;Aan:</translation>
</message>
<message>
- <location line="-551"/>
+ <location line="+18"/>
<source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>Het adres waaraan u wilt betalen (bijv. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location filename="../sendcoinsentry.cpp" line="+28"/>
+ <location filename="../sendcoinsentry.cpp" line="+30"/>
<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>
<message>
- <location filename="../forms/sendcoinsentry.ui" line="-18"/>
+ <location filename="../forms/sendcoinsentry.ui" line="+57"/>
<source>&amp;Label:</source>
<translation>&amp;Label:</translation>
</message>
<message>
- <location line="+28"/>
+ <location line="-50"/>
<source>Choose previously used address</source>
- <translation type="unfinished"/>
+ <translation>Kies een eerder gebruikt adres</translation>
</message>
<message>
- <location line="+10"/>
+ <location line="-40"/>
+ <source>This is a normal payment.</source>
+ <translation>Dit is een normale betaling.</translation>
+ </message>
+ <message>
+ <location line="+50"/>
<source>Alt+A</source>
<translation>Alt+A</translation>
</message>
@@ -1789,16 +2371,45 @@ Adres: %4
</message>
<message>
<location line="+7"/>
- <source>Remove this recipient</source>
- <translation>Verwijder deze ontvanger</translation>
+ <location line="+524"/>
+ <location line="+536"/>
+ <source>Remove this entry</source>
+ <translation>Verwijder deze toevoeging</translation>
</message>
<message>
- <location line="+16"/>
- <source>Enter a label for this address to add it to the list of used addresses</source>
+ <location line="-1008"/>
+ <source>Message:</source>
+ <translation>Bericht:</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+465"/>
+ <location line="+958"/>
+ <source>This is a verified payment request.</source>
+ <translation>Dit is een geverifieerd betalingsverzoek.</translation>
+ </message>
+ <message>
+ <location line="-991"/>
+ <source>Enter a label for this address to add it to the list of used addresses</source>
+ <translation>Vul een label voor dit adres in om het aan de lijst met gebruikte adressen toe te voegen</translation>
+ </message>
+ <message>
+ <location line="+459"/>
+ <source>This is an unverified payment request.</source>
+ <translation>Dit is een ongeverifieerde betalingsverzoek.</translation>
+ </message>
+ <message>
+ <location line="+18"/>
+ <location line="+532"/>
+ <source>Pay To:</source>
+ <translation>Betaal Aan:</translation>
+ </message>
+ <message>
+ <location line="-498"/>
+ <location line="+536"/>
<source>Memo:</source>
<translation>Memo:</translation>
</message>
@@ -1809,6 +2420,19 @@ Adres: %4
</message>
</context>
<context>
+ <name>ShutdownWindow</name>
+ <message>
+ <location filename="../utilitydialog.cpp" line="+48"/>
+ <source>Bitcoin Core is shutting down...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Do not shut down the computer until this window disappears.</source>
+ <translation>Sluit de computer niet af totdat dit venster verdwenen is.</translation>
+ </message>
+</context>
+<context>
<name>SignVerifyMessageDialog</name>
<message>
<location filename="../forms/signverifymessagedialog.ui" line="+14"/>
@@ -1816,7 +2440,7 @@ Adres: %4
<translation>Handtekeningen - Onderteken een bericht / Verifiëer een handtekening</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+10"/>
<source>&amp;Sign Message</source>
<translation>O&amp;nderteken Bericht</translation>
</message>
@@ -1834,7 +2458,7 @@ Adres: %4
<location line="+10"/>
<location line="+213"/>
<source>Choose previously used address</source>
- <translation type="unfinished"/>
+ <translation>Kies een eerder gebruikt adres</translation>
</message>
<message>
<location line="-203"/>
@@ -1919,7 +2543,7 @@ Adres: %4
<translation>Verwijder alles in de invulvelden</translation>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+27"/>
+ <location filename="../signverifymessagedialog.cpp" line="+29"/>
<location line="+3"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>Vul een Bitcoinadres in (bijv. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
@@ -1935,7 +2559,7 @@ Adres: %4
<translation>Voer Bitcoin-handtekening in</translation>
</message>
<message>
- <location line="+85"/>
+ <location line="+84"/>
<location line="+81"/>
<source>The entered address is invalid.</source>
<translation>Het opgegeven adres is ongeldig.</translation>
@@ -2004,9 +2628,14 @@ Adres: %4
<context>
<name>SplashScreen</name>
<message>
- <location filename="../splashscreen.cpp" line="+23"/>
- <source>The Bitcoin developers</source>
- <translation>De Bitcoin-ontwikkelaars</translation>
+ <location filename="../splashscreen.cpp" line="+28"/>
+ <source>Bitcoin Core</source>
+ <translation>Bitcoin Kern</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>The Bitcoin Core developers</source>
+ <translation>De Bitcoin Core ontwikkelaars</translation>
</message>
<message>
<location line="+1"/>
@@ -2017,15 +2646,15 @@ Adres: %4
<context>
<name>TrafficGraphWidget</name>
<message>
- <location filename="../trafficgraphwidget.cpp" line="+75"/>
+ <location filename="../trafficgraphwidget.cpp" line="+79"/>
<source>KB/s</source>
- <translation type="unfinished"/>
+ <translation>KB/s</translation>
</message>
</context>
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="+22"/>
+ <location filename="../transactiondesc.cpp" line="+28"/>
<source>Open until %1</source>
<translation>Openen totdat %1</translation>
</message>
@@ -2098,12 +2727,12 @@ Adres: %4
<location line="+12"/>
<location line="+45"/>
<location line="+17"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Credit</source>
<translation>Credit</translation>
</message>
<message numerus="yes">
- <location line="-120"/>
+ <location line="-125"/>
<source>matures in %n more block(s)</source>
<translation><numerusform>komt tot wasdom na %n nieuw blok</numerusform><numerusform>komt tot wasdom na %n nieuwe blokken</numerusform></translation>
</message>
@@ -2116,12 +2745,12 @@ Adres: %4
<location line="+44"/>
<location line="+8"/>
<location line="+15"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Debit</source>
<translation>Debet</translation>
</message>
<message>
- <location line="-57"/>
+ <location line="-62"/>
<source>Transaction fee</source>
<translation>Transactiekosten</translation>
</message>
@@ -2132,11 +2761,12 @@ Adres: %4
</message>
<message>
<location line="+6"/>
+ <location line="+9"/>
<source>Message</source>
<translation>Bericht</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="-7"/>
<source>Comment</source>
<translation>Opmerking</translation>
</message>
@@ -2146,14 +2776,14 @@ Adres: %4
<translation>Transactie-ID:</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+18"/>
<source>Merchant</source>
<translation>Handelaar</translation>
</message>
<message>
<location line="+7"/>
<source>Generated coins must mature %1 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>Gegenereerde munten moeten % 1 blokken rijpen voordat ze kunnen worden besteed. Toen dit blok gegenereerd werd, werd het uitgezonden naar het netwerk om aan de blok keten toegevoegd te worden. Als het niet lukt om in de keten toe te voegen, zal de status te veranderen naar &quot;niet geaccepteerd&quot; en het zal deze niet besteedbaar zijn. Dit kan soms gebeuren als een ander knooppunt een blok genereert binnen een paar seconden na die van jou.</translation>
</message>
<message>
<location line="+8"/>
@@ -2186,7 +2816,7 @@ Adres: %4
<translation>onwaar</translation>
</message>
<message>
- <location line="-227"/>
+ <location line="-232"/>
<source>, has not been successfully broadcast yet</source>
<translation>, is nog niet met succes uitgezonden</translation>
</message>
@@ -2217,7 +2847,7 @@ Adres: %4
<context>
<name>TransactionTableModel</name>
<message>
- <location filename="../transactiontablemodel.cpp" line="+227"/>
+ <location filename="../transactiontablemodel.cpp" line="+234"/>
<source>Date</source>
<translation>Datum</translation>
</message>
@@ -2236,8 +2866,13 @@ Adres: %4
<source>Amount</source>
<translation>Bedrag</translation>
</message>
+ <message>
+ <location line="+59"/>
+ <source>Immature (%1 confirmations, will be available after %2)</source>
+ <translation type="unfinished"/>
+ </message>
<message numerus="yes">
- <location line="+57"/>
+ <location line="+16"/>
<source>Open for %n more block(s)</source>
<translation><numerusform>Open voor nog %n blok</numerusform><numerusform>Open voor nog %n blokken</numerusform></translation>
</message>
@@ -2257,17 +2892,13 @@ Adres: %4
<translation>Onbevestigd (%1 van %2 bevestigd)</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="-22"/>
+ <location line="+25"/>
<source>Confirmed (%1 confirmations)</source>
<translation>Bevestigd (%1 bevestigingen)</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>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"/>
+ <location line="-22"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation>Dit blok is niet ontvangen bij andere nodes en zal waarschijnlijk niet worden geaccepteerd!</translation>
</message>
@@ -2277,7 +2908,7 @@ Adres: %4
<translation>Gegenereerd maar niet geaccepteerd</translation>
</message>
<message>
- <location line="+43"/>
+ <location line="+62"/>
<source>Received with</source>
<translation>Ontvangen met</translation>
</message>
@@ -2335,7 +2966,7 @@ Adres: %4
<context>
<name>TransactionView</name>
<message>
- <location filename="../transactionview.cpp" line="+52"/>
+ <location filename="../transactionview.cpp" line="+57"/>
<location line="+16"/>
<source>All</source>
<translation>Alles</translation>
@@ -2396,12 +3027,12 @@ Adres: %4
<translation>Anders</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+6"/>
<source>Enter address or label to search</source>
<translation>Vul adres of label in om te zoeken</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+6"/>
<source>Min amount</source>
<translation>Min. bedrag</translation>
</message>
@@ -2436,17 +3067,37 @@ Adres: %4
<translation>Toon transactiedetails</translation>
</message>
<message>
- <location line="+143"/>
- <source>Export Transaction Data</source>
- <translation>Exporteer transactiegegevens</translation>
+ <location line="+142"/>
+ <source>Export Transaction History</source>
+ <translation>Exporteer Transactieverleden</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+19"/>
+ <source>Exporting Failed</source>
+ <translation>Export Mislukt</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>There was an error trying to save the transaction history to %1.</source>
+ <translation>Er is een fout opgetreden bij het opslaan van het transactieverleden naar %1.</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Exporting Successful</source>
+ <translation>Export Succesvol</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The transaction history was successfully saved to %1.</source>
+ <translation>Het transactieverleden was succesvol bewaard in %1.</translation>
+ </message>
+ <message>
+ <location line="-22"/>
<source>Comma separated file (*.csv)</source>
<translation>Kommagescheiden bestand (*.csv)</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+9"/>
<source>Confirmed</source>
<translation>Bevestigd</translation>
</message>
@@ -2481,17 +3132,7 @@ Adres: %4
<translation>ID</translation>
</message>
<message>
- <location line="+4"/>
- <source>Error exporting</source>
- <translation>Fout bij exporteren</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation>Kon niet schrijven naar bestand %1.</translation>
- </message>
- <message>
- <location line="+100"/>
+ <location line="+107"/>
<source>Range:</source>
<translation>Bereik:</translation>
</message>
@@ -2502,9 +3143,17 @@ Adres: %4
</message>
</context>
<context>
+ <name>WalletFrame</name>
+ <message>
+ <location filename="../walletframe.cpp" line="+26"/>
+ <source>No wallet has been loaded.</source>
+ <translation>Portomonnee werd niet geladen.</translation>
+ </message>
+</context>
+<context>
<name>WalletModel</name>
<message>
- <location filename="../walletmodel.cpp" line="+218"/>
+ <location filename="../walletmodel.cpp" line="+245"/>
<source>Send Coins</source>
<translation>Verstuur munten</translation>
</message>
@@ -2512,7 +3161,7 @@ Adres: %4
<context>
<name>WalletView</name>
<message>
- <location filename="../walletview.cpp" line="+46"/>
+ <location filename="../walletview.cpp" line="+43"/>
<source>&amp;Export</source>
<translation>&amp;Exporteer</translation>
</message>
@@ -2522,65 +3171,60 @@ Adres: %4
<translation>Exporteer de data in de huidige tab naar een bestand</translation>
</message>
<message>
- <location line="+183"/>
+ <location line="+181"/>
<source>Backup Wallet</source>
<translation>Portomonnee backuppen</translation>
</message>
<message>
- <location line="+0"/>
+ <location line="+1"/>
<source>Wallet Data (*.dat)</source>
<translation>Portemonnee-data (*.dat)</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="+6"/>
<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>
+ <source>There was an error trying to save the wallet data to %1.</source>
+ <translation>Er is een fout opgetreden bij het wegschrijven van de portemonnee-data naar %1.</translation>
</message>
<message>
<location line="+4"/>
- <source>Backup Successful</source>
- <translation>Backup Succesvol</translation>
+ <source>The wallet data was successfully saved to %1.</source>
+ <translation>De portemonneedata is succesvol opgeslagen in %1.</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>
+ <source>Backup Successful</source>
+ <translation>Backup Succesvol</translation>
</message>
</context>
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+102"/>
- <source>Bitcoin version</source>
- <translation>Bitcoinversie</translation>
- </message>
- <message>
- <location line="+107"/>
+ <location filename="../bitcoinstrings.cpp" line="+221"/>
<source>Usage:</source>
<translation>Gebruik:</translation>
</message>
<message>
- <location line="-55"/>
+ <location line="-54"/>
<source>List commands</source>
<translation>Lijst van commando&apos;s</translation>
</message>
<message>
- <location line="-13"/>
+ <location line="-14"/>
<source>Get help for a command</source>
<translation>Toon hulp voor een commando</translation>
</message>
<message>
- <location line="+25"/>
+ <location line="+26"/>
<source>Options:</source>
<translation>Opties:</translation>
</message>
<message>
- <location line="+24"/>
+ <location line="+22"/>
<source>Specify configuration file (default: bitcoin.conf)</source>
<translation>Specificeer configuratiebestand (standaard: bitcoin.conf)
</translation>
@@ -2602,7 +3246,7 @@ Adres: %4
<translation>Stel databankcachegrootte in in megabytes (standaard: 25)</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-26"/>
<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>
@@ -2612,7 +3256,7 @@ Adres: %4
<translation>Onderhoud maximaal &lt;n&gt; verbindingen naar peers (standaard: 125)</translation>
</message>
<message>
- <location line="-49"/>
+ <location line="-51"/>
<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>
@@ -2622,37 +3266,37 @@ Adres: %4
<translation>Specificeer uw eigen publieke adres</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<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="-142"/>
+ <location line="-148"/>
<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="-33"/>
+ <location line="-36"/>
<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="+31"/>
+ <location line="+34"/>
<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="+40"/>
+ <location line="+45"/>
<source>Accept command line and JSON-RPC commands</source>
<translation>Aanvaard commandoregel- en JSON-RPC-commando&apos;s</translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<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>
</message>
<message>
- <location line="+40"/>
+ <location line="+39"/>
<source>Use the test network</source>
<translation>Gebruik het testnetwerk</translation>
</message>
@@ -2662,7 +3306,7 @@ Adres: %4
<translation>Accepteer verbindingen van buitenaf (standaard: 1 als geen -proxy of -connect is opgegeven)</translation>
</message>
<message>
- <location line="-87"/>
+ <location line="-95"/>
<source>%s, you must set a rpcpassword in the configuration file:
%s
It is recommended you use the following random password:
@@ -2687,7 +3331,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<message>
<location line="+12"/>
<source>Acceptable ciphers (default: TLSv1.2+HIGH:TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!3DES:@STRENGTH)</source>
- <translation type="unfinished"/>
+ <translation>Aanvaardbare cijfers (standaard: TLSv1.2+HIGH:TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!3DES:@STRENGTH)</translation>
</message>
<message>
<location line="+5"/>
@@ -2711,6 +3355,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+4"/>
+ <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</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>Fout: De transactie was afgewezen! Dit kan gebeuren als sommige munten in uw portemonnee al eerder uitgegeven zijn, zoals wanneer u een kopie van uw wallet.dat heeft gebruikt en in de kopie deze munten zijn uitgegeven, maar in deze portemonnee die munten nog niet als zodanig zijn gemarkeerd.</translation>
</message>
@@ -2725,17 +3374,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<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="+6"/>
+ <location line="+18"/>
<source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
<translation>Dit is een pre-release testversie - gebruik op eigen risico! Gebruik deze niet voor het delven van munten of handelsdoeleinden</translation>
</message>
<message>
<location line="+5"/>
+ <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source>
+ <translation>Gebruik een aparte SOCKS5 proxy om &apos;Tor hidden services&apos; te bereiken (standaard: hetzelfde als -proxy)</translation>
+ </message>
+ <message>
+ <location line="+3"/>
<source>Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source>
<translation>Waarschuwing: -paytxfee is zeer hoog ingesteld. Dit zijn de transactiekosten die u betaalt bij het versturen van een transactie.</translation>
</message>
@@ -2765,17 +3414,27 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Waarschuwing: wallet.dat is corrupt, data is veiliggesteld! Originele wallet.dat is opgeslagen als wallet.{tijdstip}.bak in %s; als uw balans of transacties incorrect zijn dient u een backup terug te zetten.</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="+9"/>
+ <source>&lt;category&gt; can be:</source>
+ <translation>&lt;category&gt; kan zijn:</translation>
+ </message>
+ <message>
+ <location line="+6"/>
<source>Attempt to recover private keys from a corrupt wallet.dat</source>
<translation>Poog de geheime sleutels uit een corrupt wallet.dat bestand terug te halen</translation>
</message>
<message>
<location line="+1"/>
+ <source>Bitcoin Core Daemon</source>
+ <translation>Bitcoin Core Daemon</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Bitcoin RPC client version</source>
- <translation type="unfinished"/>
+ <translation>Bitcoin RPC desktop versie</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
<source>Block creation options:</source>
<translation>Blokcreatie-opties:</translation>
</message>
@@ -2785,9 +3444,14 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Verbind alleen naar de gespecificeerde node(s)</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
+ <source>Connect through SOCKS proxy</source>
+ <translation>Verbind via een SOCKS-proxy</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect to JSON-RPC on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
- <translation type="unfinished"/>
+ <translation>Verbinden met JSON-RPC op &lt;poort&gt; (standaard: 8332 of testnet: 18332)</translation>
</message>
<message>
<location line="+2"/>
@@ -2801,6 +3465,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+1"/>
+ <source>Do not load the wallet and disable wallet RPC calls</source>
+ <translation type="unfinished"/>
+ </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>
@@ -2895,7 +3564,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Schrijven van undo-data mislukt</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
+ <source>Fee per kB to add to transactions you send</source>
+ <translation>Transactiekosten per kB om toe te voegen aan transacties die u verzendt</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<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>
@@ -2915,6 +3589,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Hoe grondig de blokverificatie is (0-4, standaard: 3)</translation>
</message>
<message>
+ <location line="+1"/>
+ <source>If &lt;category&gt; is not supplied, output all debugging information.</source>
+ <translation>Als er geen &lt;category&gt; is opgegeven, laat dan alle debugging informatie zien.</translation>
+ </message>
+ <message>
<location line="+2"/>
<source>Incorrect or no genesis block found. Wrong datadir for network?</source>
<translation>Incorrect of geen genesis-blok gevonden. Verkeerde datamap voor het netwerk?</translation>
@@ -2922,7 +3601,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<message>
<location line="+3"/>
<source>Invalid -onion address: &apos;%s&apos;</source>
- <translation type="unfinished"/>
+ <translation>Ongeldig -onion adres &apos;%s&apos;</translation>
</message>
<message>
<location line="+15"/>
@@ -2930,17 +3609,37 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Niet genoeg file descriptors beschikbaar.</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+5"/>
+ <source>Prepend debug output with timestamp (default: 1)</source>
+ <translation>Prepend debug output met tijdstempel (standaard: 1)</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>RPC client options:</source>
+ <translation>RPC client opties:</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Rebuild block chain index from current blk000??.dat files</source>
<translation>Blok keten opnieuw opbouwen met behulp van huidige blk000??.dat-bestanden</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+5"/>
+ <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source>
+ <translation>Selecteer de versie van de SOCKS-proxy om te gebruiken (4 of 5, standaard is 5)</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Send command to Bitcoin server</source>
- <translation type="unfinished"/>
+ <translation>Stuur commando naar Bitcoin server</translation>
</message>
<message>
- <location line="+10"/>
+ <location line="+7"/>
+ <source>Set maximum block size in bytes (default: %d)</source>
+ <translation>Stel maximum blokgrootte in in bytes (standaard: %d)</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Set the number of threads to service RPC calls (default: 4)</source>
<translation>Stel het aantal threads in om RPC-aanvragen mee te bedienen (standaard: 4)</translation>
</message>
@@ -2952,15 +3651,20 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<message>
<location line="+2"/>
<source>Start Bitcoin server</source>
+ <translation>Start Bitcoin server</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>This is intended for regression testing tools and app development.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+12"/>
+ <location line="+10"/>
<source>Usage (deprecated, use bitcoin-cli):</source>
- <translation type="unfinished"/>
+ <translation>Gebruik (vervangen; gebruik Bitcoin-cli);</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+7"/>
<source>Verifying blocks...</source>
<translation>Blokken aan het controleren...</translation>
</message>
@@ -2971,31 +3675,56 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+1"/>
+ <source>Wait for RPC server to start</source>
+ <translation>Wacht voor RPC server om te starten</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Wallet %s resides outside data directory %s</source>
<translation>Portemonnee %s bevindt zich buiten de gegevensmap %s</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+2"/>
+ <source>Wallet options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source>
+ <translation>Waarschuwing: Afgekeurd argument -debugnet ignored, use -debug=net</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>You need to rebuild the database using -reindex to change -txindex</source>
<translation>Om -txindex te kunnen veranderen dient u de database opnieuw te bouwen met gebruik van -reindex.</translation>
</message>
<message>
- <location line="-78"/>
+ <location line="-79"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation>Importeert blokken van extern blk000??.dat bestand</translation>
</message>
<message>
- <location line="-98"/>
+ <location line="-105"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation>Voer commando uit zodra een waarschuwing is ontvangen of wanneer we een erg lange fork detecteren (%s in commando wordt vervangen door bericht)</translation>
</message>
<message>
- <location line="+17"/>
+ <location line="+14"/>
+ <source>Output debugging information (default: 0, supplying &lt;category&gt; is optional)</source>
+ <translation>Output extra debugginginformatie (standaard: 0, het leveren van &lt;category&gt; is optioneel)</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
+ <translation>Stel maximumgrootte in bytes in voor hoge-prioriteits-/lage-transactiekosten-transacties (standaard: %d)</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
<translation>Stel het aantal threads voor scriptverificatie in (max 16, 0 = auto, &lt;0 = laat zoveel cores vrij, standaard: 0)</translation>
</message>
<message>
- <location line="+83"/>
+ <location line="+89"/>
<source>Information</source>
<translation>Informatie</translation>
</message>
@@ -3035,47 +3764,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Verbind alleen naar nodes in netwerk &lt;net&gt; (IPv4, IPv6 of Tor)</translation>
</message>
<message>
- <location line="+2"/>
- <source>Output extra debugging information. Implies all other -debug* options</source>
- <translation>Output extra debugginginformatie. Impliceert alle andere -debug* opties</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Output extra network debugging information</source>
- <translation>Output extra netwerk-debugginginformatie</translation>
- </message>
- <message>
- <location line="+2"/>
- <source>Prepend debug output with timestamp</source>
- <translation>Voorzie de debuggingsuitvoer van een tijdsaanduiding</translation>
- </message>
- <message>
- <location line="+5"/>
+ <location line="+9"/>
<source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
<translation>SSL-opties: (zie de Bitcoin wiki voor SSL-instructies)</translation>
</message>
<message>
- <location line="+1"/>
- <source>Select the version of socks proxy to use (4-5, default: 5)</source>
- <translation>Selecteer de versie van de SOCKS-proxy om te gebruiken (4 of 5, standaard is 5)</translation>
- </message>
- <message>
- <location line="+3"/>
+ <location line="+4"/>
<source>Send trace/debug info to console instead of debug.log file</source>
<translation>Stuur trace/debug-info naar de console in plaats van het debug.log bestand</translation>
</message>
<message>
- <location line="+1"/>
- <source>Send trace/debug info to debugger</source>
- <translation>Stuur trace/debug-info naar debugger</translation>
- </message>
- <message>
- <location line="+5"/>
- <source>Set maximum block size in bytes (default: 250000)</source>
- <translation>Stel maximum blokgrootte in in bytes (standaard: 250000)</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+6"/>
<source>Set minimum block size in bytes (default: 0)</source>
<translation>Stel minimum blokgrootte in in bytes (standaard: 0)</translation>
</message>
@@ -3100,7 +3799,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Systeemfout:</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Transaction amount too small</source>
<translation>Transactiebedrag te klein</translation>
</message>
@@ -3125,32 +3824,32 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Gebruik UPnP om de luisterende poort te mappen (standaard: 1 als er wordt geluisterd)</translation>
</message>
<message>
- <location line="+1"/>
- <source>Use proxy to reach tor hidden services (default: same as -proxy)</source>
- <translation>Gebruik proxy om &apos;tor hidden services&apos; te bereiken (standaard: hetzelfde als -proxy)</translation>
- </message>
- <message>
<location line="+2"/>
<source>Username for JSON-RPC connections</source>
<translation>Gebruikersnaam voor JSON-RPC-verbindingen</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+7"/>
<source>Warning</source>
<translation>Waarschuwing</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Warning: This version is obsolete, upgrade required!</source>
<translation>Waarschuwing: Deze versie is verouderd, een upgrade is vereist!</translation>
</message>
<message>
<location line="+2"/>
+ <source>version</source>
+ <translation>versie</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>wallet.dat corrupt, salvage failed</source>
<translation>wallet.dat corrupt, veiligstellen mislukt</translation>
</message>
<message>
- <location line="-54"/>
+ <location line="-58"/>
<source>Password for JSON-RPC connections</source>
<translation>Wachtwoord voor JSON-RPC-verbindingen</translation>
</message>
@@ -3160,27 +3859,27 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Sta JSON-RPC verbindingen van opgegeven IP-adres toe</translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<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>
</message>
<message>
- <location line="-126"/>
+ <location line="-132"/>
<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="+155"/>
+ <location line="+161"/>
<source>Upgrade wallet to latest format</source>
<translation>Vernieuw portemonnee naar nieuwste versie</translation>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation>Stel sleutelpoelgrootte in op &lt;n&gt; (standaard: 100)</translation>
</message>
<message>
- <location line="-12"/>
+ <location line="-11"/>
<source>Rescan the block chain for missing wallet transactions</source>
<translation>Doorzoek de blokketen op ontbrekende portemonnee-transacties</translation>
</message>
@@ -3190,7 +3889,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Gebruik OpenSSL (https) voor JSON-RPC-verbindingen</translation>
</message>
<message>
- <location line="-29"/>
+ <location line="-30"/>
<source>Server certificate file (default: server.cert)</source>
<translation>Certificaat-bestand voor server (standaard: server.cert)</translation>
</message>
@@ -3205,27 +3904,22 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Dit helpbericht</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Unable to bind to %s on this computer (bind returned error %d, %s)</source>
<translation>Niet in staat om aan %s te binden op deze computer (bind gaf error %d, %s)</translation>
</message>
<message>
- <location line="-95"/>
- <source>Connect through socks proxy</source>
- <translation>Verbind via een socks-proxy</translation>
- </message>
- <message>
- <location line="-11"/>
+ <location line="-107"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation>Sta DNS-naslag toe voor -addnode, -seednode en -connect</translation>
</message>
<message>
- <location line="+58"/>
+ <location line="+60"/>
<source>Loading addresses...</source>
<translation>Adressen aan het laden...</translation>
</message>
<message>
- <location line="-36"/>
+ <location line="-37"/>
<source>Error loading wallet.dat: Wallet corrupted</source>
<translation>Fout bij laden wallet.dat: Portemonnee corrupt</translation>
</message>
@@ -3245,12 +3939,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Fout bij laden wallet.dat</translation>
</message>
<message>
- <location line="+30"/>
+ <location line="+31"/>
<source>Invalid -proxy address: &apos;%s&apos;</source>
<translation>Ongeldig -proxy adres: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+57"/>
+ <location line="+56"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation>Onbekend netwerk gespecificeerd in -onlynet: &apos;%s&apos;</translation>
</message>
@@ -3260,7 +3954,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Onbekende -socks proxyversie aangegeven: %i</translation>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation>Kan -bind adres niet herleiden: &apos;%s&apos;</translation>
</message>
@@ -3270,7 +3964,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Kan -externlip adres niet herleiden: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+46"/>
+ <location line="+48"/>
<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>
@@ -3290,27 +3984,22 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Blokindex aan het laden...</translation>
</message>
<message>
- <location line="-60"/>
+ <location line="-62"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation>Voeg een node om naar te verbinden toe en probeer de verbinding open te houden</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-32"/>
<source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source>
<translation>Niet in staat om aan %s te binden op deze computer. Bitcoin draait vermoedelijk reeds.</translation>
</message>
<message>
- <location line="+69"/>
- <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="+20"/>
+ <location line="+95"/>
<source>Loading wallet...</source>
<translation>Portemonnee aan het laden...</translation>
</message>
<message>
- <location line="-54"/>
+ <location line="-56"/>
<source>Cannot downgrade wallet</source>
<translation>Kan portemonnee niet downgraden</translation>
</message>
@@ -3320,7 +4009,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Kan standaardadres niet schrijven</translation>
</message>
<message>
- <location line="+66"/>
+ <location line="+67"/>
<source>Rescanning...</source>
<translation>Blokketen aan het doorzoeken...</translation>
</message>
@@ -3340,13 +4029,13 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Fout</translation>
</message>
<message>
- <location line="-33"/>
+ <location line="-35"/>
<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>U dient rpcpassword=&lt;wachtwoord&gt; in te stellen in het configuratiebestand:
%s
-Als het bestand niet bestaat, maak het dan aan, met een alleen-lezen-permissie.</translation>
+Als het bestand niet bestaat, maak het dan aan, met een alleen-lezen permissie.</translation>
</message>
</context>
</TS> \ No newline at end of file
diff --git a/src/qt/locale/bitcoin_pam.ts b/src/qt/locale/bitcoin_pam.ts
index c81146fb1e..781b5c04a5 100644
--- a/src/qt/locale/bitcoin_pam.ts
+++ b/src/qt/locale/bitcoin_pam.ts
@@ -25,14 +25,14 @@ Me-distribute ya lalam na ning lisensya na ning MIT/X11 software, lawan ye ing m
Ing produktung ini atin yang makayabeng software a gewa dareng OpenSSL Project para gamit king OpenSSL Toolkit(http://www.openssl.org/) at cryptographic software a sinulat ng Eric Young (eay@cryptsoft.com) at UPnp software a sinulat ng Thomas Bernard.</translation>
</message>
<message>
- <location filename="../aboutdialog.cpp" line="+19"/>
+ <location filename="../utilitydialog.cpp" line="+29"/>
<source>Copyright</source>
<translation>Karapatan ning Pamangopya</translation>
</message>
<message>
<location line="+0"/>
- <source>The Bitcoin developers</source>
- <translation>Reng ginawa keng Bitcoins</translation>
+ <source>The Bitcoin Core developers</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -149,13 +149,13 @@ Ing produktung ini atin yang makayabeng software a gewa dareng OpenSSL Project p
</message>
<message>
<location line="+13"/>
- <source>Error exporting</source>
- <translation>Atin mali king pamaglipat</translation>
+ <source>Exporting Failed</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation>E ya misulat king file %1.</translation>
+ <location line="+1"/>
+ <source>There was an error trying to save the address list to %1.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -320,22 +320,27 @@ Ing produktung ini atin yang makayabeng software a gewa dareng OpenSSL Project p
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+260"/>
+ <location filename="../bitcoingui.cpp" line="+295"/>
<source>Sign &amp;message...</source>
<translation>I-sign ing &amp;mensayi</translation>
</message>
<message>
- <location line="+290"/>
+ <location line="+335"/>
<source>Synchronizing with network...</source>
<translation>Mag-sychronize ne king network...</translation>
</message>
<message>
- <location line="-360"/>
+ <location line="-407"/>
<source>&amp;Overview</source>
<translation>&amp;Overview</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="-137"/>
+ <source>Node</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+138"/>
<source>Show general overview of wallet</source>
<translation>Ipakit ing kabuuang lawe ning wallet</translation>
</message>
@@ -350,7 +355,7 @@ Ing produktung ini atin yang makayabeng software a gewa dareng OpenSSL Project p
<translation>Lawan ing kasalesayan ning transaksion</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>E&amp;xit</source>
<translation>L&amp;umwal</translation>
</message>
@@ -396,7 +401,22 @@ Ing produktung ini atin yang makayabeng software a gewa dareng OpenSSL Project p
<translation>&amp;Alilan ing Passphrase...</translation>
</message>
<message>
- <location line="+295"/>
+ <location line="+10"/>
+ <source>&amp;Sending addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Receiving addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open &amp;URI...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+325"/>
<source>Importing blocks from disk...</source>
<translation type="unfinished"/>
</message>
@@ -406,14 +426,14 @@ Ing produktung ini atin yang makayabeng software a gewa dareng OpenSSL Project p
<translation type="unfinished"/>
</message>
<message>
- <location line="-358"/>
+ <location line="-405"/>
<source>Send coins to a Bitcoin address</source>
<translation>Magpadalang barya king Bitcoin address</translation>
</message>
<message>
- <location line="+47"/>
+ <location line="+49"/>
<source>Modify configuration options for Bitcoin</source>
- <translation type="unfinished"/>
+ <translation>Alilan ing pipamilian konpigurasion para keng Bitcoin</translation>
</message>
<message>
<location line="+12"/>
@@ -441,18 +461,17 @@ Ing produktung ini atin yang makayabeng software a gewa dareng OpenSSL Project p
<translation>&amp;Beripikan ing message...</translation>
</message>
<message>
- <location line="+375"/>
+ <location line="+430"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-563"/>
- <location line="+10"/>
+ <location line="-643"/>
<source>Wallet</source>
<translation>Wallet</translation>
</message>
<message>
- <location line="+113"/>
+ <location line="+146"/>
<source>&amp;Send</source>
<translation type="unfinished"/>
</message>
@@ -462,7 +481,7 @@ Ing produktung ini atin yang makayabeng software a gewa dareng OpenSSL Project p
<translation type="unfinished"/>
</message>
<message>
- <location line="+44"/>
+ <location line="+46"/>
<location line="+2"/>
<source>&amp;Show / Hide</source>
<translation>&amp;Ipalto / Isalikut</translation>
@@ -488,86 +507,80 @@ Ing produktung ini atin yang makayabeng software a gewa dareng OpenSSL Project p
<translation type="unfinished"/>
</message>
<message>
- <location line="+39"/>
+ <location line="+48"/>
<source>&amp;File</source>
<translation>&amp;File</translation>
</message>
<message>
- <location line="+11"/>
+ <location line="+14"/>
<source>&amp;Settings</source>
<translation>&amp;Pamag-ayus</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>&amp;Help</source>
<translation>&amp;Saup</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+15"/>
<source>Tabs toolbar</source>
<translation>Gamit para king Tabs</translation>
</message>
<message>
- <location line="-244"/>
- <location line="+321"/>
+ <location line="-284"/>
+ <location line="+376"/>
<source>[testnet]</source>
<translation>[testnet]</translation>
</message>
<message>
- <location line="-331"/>
- <location line="+10"/>
+ <location line="-401"/>
<source>Bitcoin Core</source>
<translation>Kapilubluban ning Bitcoin</translation>
</message>
<message>
- <location line="+121"/>
+ <location line="+163"/>
<source>Request payments (generates QR codes and bitcoin: URIs)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+27"/>
+ <location line="+29"/>
<location line="+2"/>
<source>&amp;About Bitcoin Core</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+34"/>
- <source>&amp;Used sending addresses...</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+35"/>
<source>Show the list of used sending addresses and labels</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Used &amp;receiving addresses...</source>
+ <location line="+2"/>
+ <source>Show the list of used receiving addresses and labels</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Show the list of used receiving addresses and labels</source>
+ <location line="+3"/>
+ <source>Open a bitcoin: URI or payment request</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+2"/>
- <source>Open URI...</source>
+ <source>&amp;Command-line options</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
- <source>Open a bitcoin: URI or payment request</source>
+ <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+126"/>
+ <location line="+159"/>
<location line="+5"/>
<source>Bitcoin client</source>
<translation>Bitcoin client</translation>
</message>
<message numerus="yes">
- <location line="+133"/>
+ <location line="+142"/>
<source>%n active connection(s) to Bitcoin network</source>
<translation><numerusform>%n ya ing aktibong koneksion keng Bitcoin network</numerusform><numerusform>%n lareng aktibong koneksion keng Bitcoin network</numerusform></translation>
</message>
@@ -587,7 +600,7 @@ Ing produktung ini atin yang makayabeng software a gewa dareng OpenSSL Project p
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+20"/>
+ <location line="+23"/>
<source>%n hour(s)</source>
<translation><numerusform>%n oras</numerusform><numerusform>%n oras</numerusform></translation>
</message>
@@ -607,7 +620,7 @@ Ing produktung ini atin yang makayabeng software a gewa dareng OpenSSL Project p
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
+ <location line="+21"/>
<source>Last received block was generated %1 ago.</source>
<translation>Ing tatauling block a metanggap, me-generate ya %1 ing milabas</translation>
</message>
@@ -632,27 +645,17 @@ Ing produktung ini atin yang makayabeng software a gewa dareng OpenSSL Project p
<translation>Impormasion</translation>
</message>
<message>
- <location line="+77"/>
- <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>Ing transaksion a ini lampas ya king limitasion naning dagul. Maliari me pa naman ipadala ini,oneng atin bayad a %1, a miras king nodes a magprosesu king transaksion at miras ya naman keng pamaniaup at suporta king network. Buri meng bayaran ing bayad para king transaksion?</translation>
- </message>
- <message>
- <location line="-152"/>
+ <location line="-85"/>
<source>Up to date</source>
<translation>Makatuki ya king aldo</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Catching up...</source>
<translation>Catching up...</translation>
</message>
<message>
- <location line="+124"/>
- <source>Confirm transaction fee</source>
- <translation>Kumpirman ing bayad king transaksion</translation>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+130"/>
<source>Sent transaction</source>
<translation>Mipadalang transaksion</translation>
</message>
@@ -675,7 +678,7 @@ Address: %4
</translation>
</message>
<message>
- <location line="+67"/>
+ <location line="+69"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation>Maka-&lt;b&gt;encrypt&lt;/b&gt; ya ing wallet at kasalukuyan yang maka-&lt;b&gt;unlocked&lt;/b&gt;</translation>
</message>
@@ -685,7 +688,7 @@ Address: %4
<translation>Maka-&lt;b&gt;encrypt&lt;/b&gt; ya ing wallet at kasalukuyan yang maka-&lt;b&gt;locked&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+116"/>
+ <location filename="../bitcoin.cpp" line="+438"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation>Atin kamalian a milyari. Ali ne magsilbing sumulung pa ing Bitcoin at kailangan na ng tuknang.</translation>
</message>
@@ -907,7 +910,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+171"/>
+ <location line="+31"/>
+ <source>none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+140"/>
<source>Dust</source>
<translation type="unfinished"/>
</message>
@@ -944,7 +952,7 @@ Address: %4
</message>
<message>
<location line="+1"/>
- <source>This label turns red, if the priority is smaller than &quot;medium&quot;</source>
+ <source>This label turns red, if the priority is smaller than &quot;medium&quot;.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1013,7 +1021,7 @@ Address: %4
<translation>&amp;Address</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+25"/>
+ <location filename="../editaddressdialog.cpp" line="+28"/>
<source>New receiving address</source>
<translation>Bayung address king pamagtanggap</translation>
</message>
@@ -1082,20 +1090,24 @@ Address: %4
</message>
</context>
<context>
- <name>GUIUtil::HelpMessageBox</name>
+ <name>HelpMessageDialog</name>
<message>
- <location filename="../guiutil.cpp" line="+597"/>
- <source>version</source>
- <translation>bersion</translation>
+ <location filename="../forms/helpmessagedialog.ui" line="+19"/>
+ <source>Bitcoin Core - Command-line options</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <location line="+13"/>
+ <location filename="../utilitydialog.cpp" line="+38"/>
<source>Bitcoin Core</source>
<translation>Kapilubluban ning Bitcoin</translation>
</message>
<message>
- <location line="-11"/>
+ <location line="+0"/>
+ <source>version</source>
+ <translation>bersion</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Usage:</source>
<translation>Pamanggamit:</translation>
</message>
@@ -1224,7 +1236,7 @@ Address: %4
<translation>Pipamilian</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+13"/>
<source>&amp;Main</source>
<translation>&amp;Pun</translation>
</message>
@@ -1249,7 +1261,52 @@ Address: %4
<translation>&amp;Umpisan ya ing Bitcoin king pamag-log-in na ning sistema.</translation>
</message>
<message>
- <location line="+35"/>
+ <location line="+9"/>
+ <source>Size of &amp;database cache</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set database cache size in megabytes (default: 25)</source>
+ <translation>Ilage ya ing dagul o lati na ing database cache king megabytes (default: 25)</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>MB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Number of script &amp;verification threads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Connect to the Bitcoin network through a SOCKS proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Connect through SOCKS proxy (default proxy):</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+224"/>
+ <source>Active command-line options that override above options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
<source>Reset all client options to default.</source>
<translation type="unfinished"/>
</message>
@@ -1259,7 +1316,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="-323"/>
<source>&amp;Network</source>
<translation>&amp;Network</translation>
</message>
@@ -1274,32 +1331,17 @@ Address: %4
<translation>Mapa ng ning port gamit ing &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;Kumunekta gamit ing SOCKS proxy:</translation>
- </message>
- <message>
- <location line="+9"/>
+ <location line="+19"/>
<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>IP address na ning proxy(e.g. 127.0.0.1)</translation>
- </message>
- <message>
- <location line="+7"/>
+ <location line="+32"/>
<source>&amp;Port:</source>
<translation>&amp;Port:</translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+25"/>
<source>Port of the proxy (e.g. 9050)</source>
<translation>Port na ning proxy(e.g. 9050)</translation>
</message>
@@ -1384,7 +1426,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+71"/>
+ <location line="+136"/>
<source>&amp;OK</source>
<translation>&amp;OK</translation>
</message>
@@ -1394,44 +1436,38 @@ Address: %4
<translation>I-&amp;Cancel</translation>
</message>
<message>
- <location line="+10"/>
- <source>&amp;Apply</source>
- <translation>&amp;Ilage</translation>
- </message>
- <message>
- <location filename="../optionsdialog.cpp" line="+63"/>
+ <location filename="../optionsdialog.cpp" line="+67"/>
<source>default</source>
<translation>default</translation>
</message>
<message>
- <location line="+131"/>
- <source>Confirm options reset</source>
+ <location line="+57"/>
+ <source>none</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Some settings may require a client restart to take effect.</source>
+ <location line="+75"/>
+ <source>Confirm options reset</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>Do you want to proceed?</source>
+ <location line="+1"/>
+ <location line="+29"/>
+ <source>Client restart required to activate changes.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
- <location line="+9"/>
- <source>Warning</source>
- <translation>Kapabaluan</translation>
+ <location line="-29"/>
+ <source>Client will be shutdown, do you want to proceed?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="-9"/>
- <location line="+9"/>
- <source>This setting will take effect after restarting Bitcoin.</source>
- <translation>Ing ayus a ini magsilbi yamu kaibat meng pesibayuan umpisan ing Bitcoin.</translation>
+ <location line="+33"/>
+ <source>This change would require a client restart.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+29"/>
+ <location line="+34"/>
<source>The supplied proxy address is invalid.</source>
<translation>Ing milageng proxy address eya katanggap-tanggap.</translation>
</message>
@@ -1445,22 +1481,22 @@ Address: %4
</message>
<message>
<location line="+50"/>
- <location line="+214"/>
+ <location line="+231"/>
<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>Ing makaltong impormasion mapalyaring luma ne. Ing kekang wallet otomatiku yang mag-synchronize keng Bitcoin network istung mekakonekta ne king network, oneng ing prosesung ini ali ya pa kumpletu.</translation>
</message>
<message>
- <location line="-140"/>
+ <location line="-155"/>
<source>Unconfirmed:</source>
<translation>Ali pa me-kumpirma:</translation>
</message>
<message>
- <location line="-81"/>
+ <location line="-83"/>
<source>Wallet</source>
<translation>Wallet</translation>
</message>
<message>
- <location line="+49"/>
+ <location line="+51"/>
<source>Confirmed:</source>
<translation>Me-kumpirma:</translation>
</message>
@@ -1482,7 +1518,7 @@ Address: %4
<message>
<location line="+13"/>
<source>Mined balance that has not yet matured</source>
- <translation type="unfinished"/>
+ <translation>Reng me-minang balanse a epa meg-matured</translation>
</message>
<message>
<location line="+16"/>
@@ -1495,7 +1531,7 @@ Address: %4
<translation>Ing kekang kasalungsungan kabuuang balanse</translation>
</message>
<message>
- <location line="+56"/>
+ <location line="+71"/>
<source>&lt;b&gt;Recent transactions&lt;/b&gt;</source>
<translation>&lt;b&gt;Reng kapilan pamung transaksion&lt;/b&gt;</translation>
</message>
@@ -1509,7 +1545,8 @@ Address: %4
<context>
<name>PaymentServer</name>
<message>
- <location filename="../paymentserver.cpp" line="+397"/>
+ <location filename="../paymentserver.cpp" line="+403"/>
+ <location line="+13"/>
<source>URI handling</source>
<translation type="unfinished"/>
</message>
@@ -1519,24 +1556,52 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+91"/>
+ <location line="+96"/>
<source>Requested payment amount of %1 is too small (considered dust).</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-204"/>
- <location line="+195"/>
+ <location line="-221"/>
+ <location line="+212"/>
<location line="+13"/>
+ <location line="+95"/>
+ <location line="+18"/>
+ <location line="+16"/>
<source>Payment request error</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-207"/>
+ <location line="-353"/>
<source>Cannot start bitcoin: click-to-pay handler</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+195"/>
+ <location line="+58"/>
+ <source>Net manager warning</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Your active proxy doesn&apos;t support SOCKS5, which is required for payment requests via proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>Payment request fetch URL is invalid: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Payment request file handling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Payment request file can not be read or processed! This can be caused by an invalid payment request file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+73"/>
<source>Unverified payment requests to custom payment scripts are unsupported.</source>
<translation type="unfinished"/>
</message>
@@ -1546,24 +1611,27 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
+ <location line="+43"/>
<source>Error communicating with %1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+28"/>
+ <location line="+24"/>
+ <source>Payment request can not be parsed or processed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
<source>Bad response from server %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+32"/>
+ <location line="+33"/>
<source>Payment acknowledged</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-55"/>
- <location line="+27"/>
- <location line="+17"/>
+ <location line="-11"/>
<source>Network request error</source>
<translation type="unfinished"/>
</message>
@@ -1571,18 +1639,18 @@ Address: %4
<context>
<name>QObject</name>
<message>
- <location filename="../bitcoin.cpp" line="+119"/>
- <location line="+5"/>
+ <location filename="../bitcoin.cpp" line="+71"/>
+ <location line="+11"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-4"/>
+ <location line="+1"/>
<source>Error: Specified data directory &quot;%1&quot; does not exist.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="-12"/>
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation type="unfinished"/>
</message>
@@ -1624,15 +1692,16 @@ Address: %4
<location line="+23"/>
<location line="+23"/>
<location line="+36"/>
- <location line="+53"/>
+ <location line="+23"/>
+ <location line="+36"/>
<location line="+23"/>
<location line="+23"/>
- <location filename="../rpcconsole.cpp" line="+360"/>
+ <location filename="../rpcconsole.cpp" line="+359"/>
<source>N/A</source>
<translation>N/A</translation>
</message>
<message>
- <location line="-217"/>
+ <location line="-223"/>
<source>Client version</source>
<translation>Bersion ning Cliente</translation>
</message>
@@ -1647,7 +1716,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+78"/>
+ <location line="+25"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+53"/>
<source>Using OpenSSL version</source>
<translation>Gagamit bersion na ning OpenSSL</translation>
</message>
@@ -1663,16 +1737,16 @@ Address: %4
</message>
<message>
<location line="+7"/>
- <source>Number of connections</source>
- <translation>Bilang dareng koneksion</translation>
+ <source>Name</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+23"/>
- <source>On testnet</source>
- <translation>King testnet</translation>
+ <source>Number of connections</source>
+ <translation>Bilang dareng koneksion</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+29"/>
<source>Block chain</source>
<translation>Block chain</translation>
</message>
@@ -1697,16 +1771,6 @@ Address: %4
<translation>&amp;Ibuklat</translation>
</message>
<message>
- <location line="+16"/>
- <source>Command-line options</source>
- <translation>Pipamilian command-line</translation>
- </message>
- <message>
- <location line="+10"/>
- <source>&amp;Show</source>
- <translation>&amp;Ipakit</translation>
- </message>
- <message>
<location line="+24"/>
<source>&amp;Console</source>
<translation>&amp;Console</translation>
@@ -1737,17 +1801,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-541"/>
+ <location line="-521"/>
<source>Build date</source>
<translation>Kaaldauan ning pamaglalang</translation>
</message>
<message>
- <location line="-79"/>
- <source>Bitcoin Core</source>
- <translation>Kapilubluban ning Bitcoin</translation>
- </message>
- <message>
- <location line="+279"/>
+ <location line="+206"/>
<source>Debug log file</source>
<translation>Debug log file</translation>
</message>
@@ -1757,11 +1816,6 @@ Address: %4
<translation>Ibuklat ing Bitcoin debug log file menibat king kasalungsungan data directory. Magluat ya ining pilan segundu para kareng mamaragul a log files.</translation>
</message>
<message>
- <location line="+26"/>
- <source>Show the Bitcoin-Core help message to get a list with possible Bitcoin command-line options.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location line="+76"/>
<source>Clear console</source>
<translation>I-Clear ing console</translation>
@@ -1782,7 +1836,7 @@ Address: %4
<translation>I-type ing &lt;b&gt;help&lt;/b&gt; ban akit la reng ati at magsilbing commands.</translation>
</message>
<message>
- <location line="+128"/>
+ <location line="+122"/>
<source>%1 B</source>
<translation type="unfinished"/>
</message>
@@ -1825,12 +1879,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+19"/>
- <source>The amount to request</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="-32"/>
+ <location line="-13"/>
<source>&amp;Label:</source>
<translation>&amp;Label:</translation>
</message>
@@ -1840,12 +1889,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+20"/>
- <source>The message to attach to payment request</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="-37"/>
+ <location line="-17"/>
<source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
@@ -1856,16 +1900,26 @@ Address: %4
</message>
<message>
<location line="+27"/>
- <source>The label to associate with the new receiving address</source>
+ <source>An optional label to associate with the new receiving address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
- <source>Use this form to request payments. All fields are optional.</source>
+ <location line="+7"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+56"/>
+ <location line="+7"/>
+ <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+39"/>
+ <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+17"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"/>
</message>
@@ -1881,11 +1935,11 @@ Address: %4
</message>
<message>
<location line="+47"/>
- <source>Previously requested payments</source>
+ <source>Requested payments</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+12"/>
+ <location line="+16"/>
<source>Show the selected request (does the same as double clicking an entry)</source>
<translation type="unfinished"/>
</message>
@@ -1976,7 +2030,7 @@ Address: %4
<context>
<name>RecentRequestsTableModel</name>
<message>
- <location filename="../recentrequeststablemodel.cpp" line="+14"/>
+ <location filename="../recentrequeststablemodel.cpp" line="+24"/>
<source>Date</source>
<translation>Kaaldauan</translation>
</message>
@@ -1996,7 +2050,7 @@ Address: %4
<translation>Alaga</translation>
</message>
<message>
- <location line="+36"/>
+ <location line="+38"/>
<source>(no label)</source>
<translation>(alang label)</translation>
</message>
@@ -2011,7 +2065,7 @@ Address: %4
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
<location filename="../sendcoinsdialog.cpp" line="+381"/>
- <location line="+81"/>
+ <location line="+80"/>
<source>Send Coins</source>
<translation>Magpadalang Barya</translation>
</message>
@@ -2121,7 +2175,7 @@ Address: %4
<translation>Ipadala</translation>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-229"/>
+ <location filename="../sendcoinsdialog.cpp" line="-228"/>
<source>Confirm send coins</source>
<translation>Kumpirman ing pamagpadalang barya</translation>
</message>
@@ -2224,22 +2278,22 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+113"/>
+ <location line="+112"/>
<source>Warning: Invalid Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+21"/>
<source>(no label)</source>
<translation>(alang label)</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="-11"/>
<source>Warning: Unknown change address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-378"/>
+ <location line="-366"/>
<source>Are you sure you want to send?</source>
<translation type="unfinished"/>
</message>
@@ -2263,13 +2317,13 @@ Address: %4
<name>SendCoinsEntry</name>
<message>
<location filename="../forms/sendcoinsentry.ui" line="+131"/>
- <location line="+501"/>
+ <location line="+521"/>
<location line="+536"/>
<source>A&amp;mount:</source>
<translation>A&amp;laga:</translation>
</message>
<message>
- <location line="-1132"/>
+ <location line="-1152"/>
<source>Pay &amp;To:</source>
<translation>Ibayad &amp;kang:</translation>
</message>
@@ -2315,23 +2369,33 @@ Address: %4
</message>
<message>
<location line="+7"/>
- <location line="+504"/>
+ <location line="+524"/>
<location line="+536"/>
<source>Remove this entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-40"/>
+ <location line="-1008"/>
+ <source>Message:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+958"/>
<source>This is a verified payment request.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-971"/>
+ <location line="-991"/>
<source>Enter a label for this address to add it to the list of used addresses</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+439"/>
+ <location line="+459"/>
<source>This is an unverified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2354,6 +2418,19 @@ Address: %4
</message>
</context>
<context>
+ <name>ShutdownWindow</name>
+ <message>
+ <location filename="../utilitydialog.cpp" line="+48"/>
+ <source>Bitcoin Core is shutting down...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Do not shut down the computer until this window disappears.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>SignVerifyMessageDialog</name>
<message>
<location filename="../forms/signverifymessagedialog.ui" line="+14"/>
@@ -2361,7 +2438,7 @@ Address: %4
<translation>Pirma - Pirman / I-beripika ing mensayi</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+10"/>
<source>&amp;Sign Message</source>
<translation>&amp;Pirman ing Mensayi</translation>
</message>
@@ -2549,7 +2626,7 @@ Address: %4
<context>
<name>SplashScreen</name>
<message>
- <location filename="../splashscreen.cpp" line="+26"/>
+ <location filename="../splashscreen.cpp" line="+28"/>
<source>Bitcoin Core</source>
<translation>Kapilubluban ning Bitcoin</translation>
</message>
@@ -2582,7 +2659,7 @@ Address: %4
<message>
<location line="+6"/>
<source>%1/offline</source>
- <translation type="unfinished"/>
+ <translation>%1/offline</translation>
</message>
<message>
<location line="+2"/>
@@ -2648,12 +2725,12 @@ Address: %4
<location line="+12"/>
<location line="+45"/>
<location line="+17"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Credit</source>
<translation>Credit</translation>
</message>
<message numerus="yes">
- <location line="-120"/>
+ <location line="-125"/>
<source>matures in %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -2666,12 +2743,12 @@ Address: %4
<location line="+44"/>
<location line="+8"/>
<location line="+15"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Debit</source>
<translation>Debit</translation>
</message>
<message>
- <location line="-57"/>
+ <location line="-62"/>
<source>Transaction fee</source>
<translation>Bayad king Transaksion</translation>
</message>
@@ -2682,11 +2759,12 @@ Address: %4
</message>
<message>
<location line="+6"/>
+ <location line="+9"/>
<source>Message</source>
<translation>Mensayi</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="-7"/>
<source>Comment</source>
<translation>Komentu</translation>
</message>
@@ -2696,7 +2774,7 @@ Address: %4
<translation>ID ning Transaksion</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+18"/>
<source>Merchant</source>
<translation type="unfinished"/>
</message>
@@ -2736,7 +2814,7 @@ Address: %4
<translation>e tutu</translation>
</message>
<message>
- <location line="-227"/>
+ <location line="-232"/>
<source>, has not been successfully broadcast yet</source>
<translation>, eya matagumpeng mibalita</translation>
</message>
@@ -2786,8 +2864,13 @@ Address: %4
<source>Amount</source>
<translation>Alaga</translation>
</message>
+ <message>
+ <location line="+59"/>
+ <source>Immature (%1 confirmations, will be available after %2)</source>
+ <translation type="unfinished"/>
+ </message>
<message numerus="yes">
- <location line="+57"/>
+ <location line="+16"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -2807,17 +2890,13 @@ Address: %4
<translation>Ali pa me-kumpirma(%1 kareng %2 kumpirmasion)</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="-22"/>
+ <location line="+25"/>
<source>Confirmed (%1 confirmations)</source>
<translation>Me-kumpirma(%1 kumpirmasion)</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></translation>
- </message>
<message>
- <location line="+5"/>
+ <location line="-22"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation>Ing block a ini ali de atanggap deng aliwa pang nodes ania ali ya magsilbing tanggapan</translation>
</message>
@@ -2827,7 +2906,7 @@ Address: %4
<translation>Me-generate ya oneng ali ya metanggap</translation>
</message>
<message>
- <location line="+43"/>
+ <location line="+62"/>
<source>Received with</source>
<translation>Atanggap kayabe ning</translation>
</message>
@@ -3123,7 +3202,7 @@ Address: %4
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+217"/>
+ <location filename="../bitcoinstrings.cpp" line="+221"/>
<source>Usage:</source>
<translation>Pamanggamit:</translation>
</message>
@@ -3143,7 +3222,7 @@ Address: %4
<translation>Pipamilian:</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+22"/>
<source>Specify configuration file (default: bitcoin.conf)</source>
<translation>Pilinan ing configuration file(default: bitcoin.conf)</translation>
</message>
@@ -3163,7 +3242,7 @@ Address: %4
<translation>Ilage ya ing dagul o lati na ing database cache king megabytes (default: 25)</translation>
</message>
<message>
- <location line="-27"/>
+ <location line="-26"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
<translation>Makiramdam king koneksion king &lt;port&gt;(default: 8333 o testnet: 18333)</translation>
</message>
@@ -3173,7 +3252,7 @@ Address: %4
<translation>Mag-maintain peka &lt;n&gt; koneksion keng peers (default: 125)</translation>
</message>
<message>
- <location line="-50"/>
+ <location line="-51"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation>Kumunekta king note ban ayakua mula reng peer address, at mako king panga konekta</translation>
</message>
@@ -3183,22 +3262,22 @@ Address: %4
<translation>Sabyan me ing kekang pampublikong address</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation>Threshold for disconnecting misbehaving peers (default: 100)</translation>
</message>
<message>
- <location line="-147"/>
+ <location line="-148"/>
<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="-33"/>
+ <location line="-36"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
<translation>Atin kamalian a milyari kabang ayusan ya ing RPC port %u para keng pamakiramdam king IPv4: %s</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation type="unfinished"/>
</message>
@@ -3208,7 +3287,7 @@ Address: %4
<translation>Tumanggap command line at JSON-RPC commands</translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>Gumana king gulut bilang daemon at tumanggap commands</translation>
</message>
@@ -3218,12 +3297,12 @@ Address: %4
<translation>Gamitan ing test network</translation>
</message>
<message>
- <location line="-117"/>
+ <location line="-118"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation>Tumanggap koneksion menibat king kilwal (default: 1 if no -proxy or -connect)</translation>
</message>
<message>
- <location line="-92"/>
+ <location line="-95"/>
<source>%s, you must set a rpcpassword in the configuration file:
%s
It is recommended you use the following random password:
@@ -3264,6 +3343,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+4"/>
+ <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</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>
@@ -3365,6 +3449,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<message>
<location line="+1"/>
<source>Discover own IP address (default: 1 when listening and no -externalip)</source>
+ <translation>I-discover ing sariling IP address (default: 1 istung makiramdam at -externalip)</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Do not load the wallet and disable wallet RPC calls</source>
<translation type="unfinished"/>
</message>
<message>
@@ -3410,7 +3499,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<message>
<location line="+1"/>
<source>Failed to listen on any port. Use -listen=0 if you want this.</source>
- <translation type="unfinished"/>
+ <translation>Memali ya ing pamakiramdam kareng gang nanung port. Gamita me ini -listen=0 nung buri me ini.</translation>
</message>
<message>
<location line="+1"/>
@@ -3533,7 +3622,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+8"/>
+ <location line="+7"/>
<source>Set maximum block size in bytes (default: %d)</source>
<translation type="unfinished"/>
</message>
@@ -3553,7 +3642,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+12"/>
+ <location line="+3"/>
+ <source>This is intended for regression testing tools and app development.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Usage (deprecated, use bitcoin-cli):</source>
<translation type="unfinished"/>
</message>
@@ -3578,7 +3672,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
+ <location line="+2"/>
+ <source>Wallet options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source>
<translation type="unfinished"/>
</message>
@@ -3588,12 +3687,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-78"/>
+ <location line="-79"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-104"/>
+ <location line="-105"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
@@ -3613,7 +3712,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+88"/>
+ <location line="+89"/>
<source>Information</source>
<translation>&amp;Impormasion</translation>
</message>
@@ -3663,11 +3762,6 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Magpadalang trace/debug info okeng console kesa keng debug.log file</translation>
</message>
<message>
- <location line="+1"/>
- <source>Send trace/debug info to debugger</source>
- <translation>Ipadala ing impormasion dareng trace/debug king debugger</translation>
- </message>
- <message>
<location line="+6"/>
<source>Set minimum block size in bytes (default: 0)</source>
<translation>Ilage ing pekaditak a dagul na ning block king bytes (default: 0)</translation>
@@ -3693,7 +3787,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Kamalian ning sistema:</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Transaction amount too small</source>
<translation type="unfinished"/>
</message>
@@ -3705,7 +3799,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<message>
<location line="+1"/>
<source>Transaction too large</source>
- <translation type="unfinished"/>
+ <translation>Maragul yang masiadu ing transaksion</translation>
</message>
<message>
<location line="+8"/>
@@ -3723,7 +3817,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Username para king JSON-RPC koneksion</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Warning</source>
<translation>Kapabaluan</translation>
</message>
@@ -3743,37 +3837,37 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-57"/>
+ <location line="-58"/>
<source>Password for JSON-RPC connections</source>
<translation>Password para king JSON-RPC koneksion</translation>
</message>
<message>
- <location line="-69"/>
+ <location line="-70"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation>Payagan ya i JSON-RPC koneksion para king metung a IP address</translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation>Magpadalang command king node a gagana king &lt;ip&gt;(default: 127.0.0.1)</translation>
</message>
<message>
- <location line="-131"/>
+ <location line="-132"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
- <translation type="unfinished"/>
+ <translation>I-execute ing command istung mialilan ya ing best block (%s in cmd is replaced by block hash)</translation>
</message>
<message>
- <location line="+160"/>
+ <location line="+161"/>
<source>Upgrade wallet to latest format</source>
<translation>I-upgrade ing wallet king pekabayung porma</translation>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation>I-set ing key pool size king &lt;n&gt;(default: 100)</translation>
</message>
<message>
- <location line="-12"/>
+ <location line="-11"/>
<source>Rescan the block chain for missing wallet transactions</source>
<translation>I-scan pasibayu ing block chain para kareng mauaualang transaksion</translation>
</message>
@@ -3783,7 +3877,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Gumamit OpenSSL(https) para king JSON-RPC koneksion</translation>
</message>
<message>
- <location line="-29"/>
+ <location line="-30"/>
<source>Server certificate file (default: server.cert)</source>
<translation>Server certificate file (default: server.cert)</translation>
</message>
@@ -3798,17 +3892,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Ining saup a mensayi</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Unable to bind to %s on this computer (bind returned error %d, %s)</source>
<translation>Ali ya magsilbing mag-bind keng %s kening kompyuter a ini (bind returned error %d, %s)</translation>
</message>
<message>
- <location line="-106"/>
+ <location line="-107"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation>Payagan ing pamaglawe DNS para king -addnode, -seednode and -connect</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+60"/>
<source>Loading addresses...</source>
<translation>Lo-load da ne ing address...</translation>
</message>
@@ -3848,19 +3942,19 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>E kilalang -socks proxy version requested: %i</translation>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
- <translation type="unfinished"/>
+ <translation>Eya me-resolve ing -bind address: &apos;%s&apos;</translation>
</message>
<message>
<location line="+1"/>
<source>Cannot resolve -externalip address: &apos;%s&apos;</source>
- <translation type="unfinished"/>
+ <translation>Eya me-resolve ing -externalip address: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+47"/>
+ <location line="+48"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
- <translation type="unfinished"/>
+ <translation>Eya maliari ing alaga keng -paytxfee=&lt;amount&gt;: &apos;%s&apos;</translation>
</message>
<message>
<location line="+1"/>
@@ -3878,7 +3972,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Lo-load dane ing block index...</translation>
</message>
<message>
- <location line="-61"/>
+ <location line="-62"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation>Magdagdag a node ban kumunekta at subuknan apanatili yang makabuklat ing koneksion</translation>
</message>
@@ -3888,12 +3982,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Eya megsilbing idikit king %s na ning kompyuter a ini. Mapaliaring mamandar ne ing Bitcoin.</translation>
</message>
<message>
- <location line="+94"/>
+ <location line="+95"/>
<source>Loading wallet...</source>
<translation>Lo-load dane ing wallet...</translation>
</message>
<message>
- <location line="-55"/>
+ <location line="-56"/>
<source>Cannot downgrade wallet</source>
<translation>Ali ya magsilbing i-downgrade ing wallet</translation>
</message>
@@ -3903,7 +3997,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Eya misulat ing default address</translation>
</message>
<message>
- <location line="+66"/>
+ <location line="+67"/>
<source>Rescanning...</source>
<translation>I-scan deng pasibayu...</translation>
</message>
@@ -3923,7 +4017,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Mali</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-35"/>
<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 bd18fa3b73..4ea954f5e1 100644
--- a/src/qt/locale/bitcoin_pl.ts
+++ b/src/qt/locale/bitcoin_pl.ts
@@ -27,14 +27,14 @@ Distributed under the MIT/X11 software license, see the accompanying file COPYIN
This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard.</translation>
</message>
<message>
- <location filename="../aboutdialog.cpp" line="+19"/>
+ <location filename="../utilitydialog.cpp" line="+29"/>
<source>Copyright</source>
<translation>Prawo autorskie</translation>
</message>
<message>
<location line="+0"/>
- <source>The Bitcoin developers</source>
- <translation>Deweloperzy Bitcoin</translation>
+ <source>The Bitcoin Core developers</source>
+ <translation>Deweloperzy Bitcoin Core</translation>
</message>
</context>
<context>
@@ -151,13 +151,13 @@ This product includes software developed by the OpenSSL Project for use in the O
</message>
<message>
<location line="+13"/>
- <source>Error exporting</source>
- <translation>BÅ‚Ä…d podczas eksportowania</translation>
+ <source>Exporting Failed</source>
+ <translation>Błąd przy próbie eksportu</translation>
</message>
<message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation>BÅ‚Ä…d zapisu do pliku %1.</translation>
+ <location line="+1"/>
+ <source>There was an error trying to save the address list to %1.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -322,22 +322,27 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+260"/>
+ <location filename="../bitcoingui.cpp" line="+295"/>
<source>Sign &amp;message...</source>
<translation>Podpisz wiado&amp;mość...</translation>
</message>
<message>
- <location line="+290"/>
+ <location line="+335"/>
<source>Synchronizing with network...</source>
<translation>Synchronizacja z sieciÄ…...</translation>
</message>
<message>
- <location line="-360"/>
+ <location line="-407"/>
<source>&amp;Overview</source>
<translation>P&amp;odsumowanie</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="-137"/>
+ <source>Node</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+138"/>
<source>Show general overview of wallet</source>
<translation>Pokazuje ogólny zarys portfela</translation>
</message>
@@ -352,7 +357,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>PrzeglÄ…daj historiÄ™ transakcji</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>E&amp;xit</source>
<translation>&amp;Zakończ</translation>
</message>
@@ -398,7 +403,22 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>&amp;Zmień hasło...</translation>
</message>
<message>
- <location line="+295"/>
+ <location line="+10"/>
+ <source>&amp;Sending addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Receiving addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open &amp;URI...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+325"/>
<source>Importing blocks from disk...</source>
<translation>Importowanie bloków z dysku...</translation>
</message>
@@ -408,12 +428,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Ponowne indeksowanie bloków na dysku...</translation>
</message>
<message>
- <location line="-358"/>
+ <location line="-405"/>
<source>Send coins to a Bitcoin address</source>
<translation>Wyślij monety na adres Bitcoin</translation>
</message>
<message>
- <location line="+47"/>
+ <location line="+49"/>
<source>Modify configuration options for Bitcoin</source>
<translation>Zmienia opcje konfiguracji bitcoina</translation>
</message>
@@ -443,18 +463,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>&amp;Zweryfikuj wiadomość...</translation>
</message>
<message>
- <location line="+375"/>
+ <location line="+430"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-563"/>
- <location line="+10"/>
+ <location line="-643"/>
<source>Wallet</source>
<translation>Portfel</translation>
</message>
<message>
- <location line="+113"/>
+ <location line="+146"/>
<source>&amp;Send</source>
<translation>Wyślij</translation>
</message>
@@ -464,7 +483,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Odbie&amp;rz</translation>
</message>
<message>
- <location line="+44"/>
+ <location line="+46"/>
<location line="+2"/>
<source>&amp;Show / Hide</source>
<translation>&amp;Pokaż / Ukryj</translation>
@@ -490,86 +509,80 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Zweryfikuj wiadomość, aby upewnić się, że została podpisana odpowiednim adresem Bitcoin.</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+48"/>
<source>&amp;File</source>
<translation>&amp;Plik</translation>
</message>
<message>
- <location line="+11"/>
+ <location line="+14"/>
<source>&amp;Settings</source>
<translation>P&amp;referencje</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>&amp;Help</source>
<translation>Pomo&amp;c</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+15"/>
<source>Tabs toolbar</source>
<translation>Pasek zakładek</translation>
</message>
<message>
- <location line="-244"/>
- <location line="+321"/>
+ <location line="-284"/>
+ <location line="+376"/>
<source>[testnet]</source>
<translation>[testnet]</translation>
</message>
<message>
- <location line="-331"/>
- <location line="+10"/>
+ <location line="-401"/>
<source>Bitcoin Core</source>
<translation>Rdzeń BitCoin</translation>
</message>
<message>
- <location line="+121"/>
+ <location line="+163"/>
<source>Request payments (generates QR codes and bitcoin: URIs)</source>
<translation>Żądaj płatności (generuje kod QR oraz bitcoin URI)</translation>
</message>
<message>
- <location line="+27"/>
+ <location line="+29"/>
<location line="+2"/>
<source>&amp;About Bitcoin Core</source>
<translation>&amp;O Bitcoin Core</translation>
</message>
<message>
- <location line="+34"/>
- <source>&amp;Used sending addresses...</source>
- <translation>&amp;Użyte adresy wysyłające</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+35"/>
<source>Show the list of used sending addresses and labels</source>
<translation>Pokaż listę użytych adresów wysyłających i etykiety</translation>
</message>
<message>
- <location line="+1"/>
- <source>Used &amp;receiving addresses...</source>
- <translation>Użyte &amp;adresy odbiorcze</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Show the list of used receiving addresses and labels</source>
<translation>Pokaż listę użytych adresów odbiorczych i etykiety</translation>
</message>
<message>
+ <location line="+3"/>
+ <source>Open a bitcoin: URI or payment request</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+2"/>
- <source>Open URI...</source>
- <translation>Otwórz URI...</translation>
+ <source>&amp;Command-line options</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
- <source>Open a bitcoin: URI or payment request</source>
+ <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+126"/>
+ <location line="+159"/>
<location line="+5"/>
<source>Bitcoin client</source>
<translation>Bitcoin klient</translation>
</message>
<message numerus="yes">
- <location line="+133"/>
+ <location line="+142"/>
<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>
@@ -589,7 +602,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Pobrano %1 bloków z historią transakcji.</translation>
</message>
<message numerus="yes">
- <location line="+20"/>
+ <location line="+23"/>
<source>%n hour(s)</source>
<translation><numerusform>%n godzina</numerusform><numerusform>%n godzin</numerusform><numerusform>%n godzin</numerusform></translation>
</message>
@@ -609,7 +622,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>%1 do tyłu</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="+21"/>
<source>Last received block was generated %1 ago.</source>
<translation>Ostatni otrzymany blok został wygenerowany %1 temu.</translation>
</message>
@@ -634,27 +647,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Informacja</translation>
</message>
<message>
- <location line="+77"/>
- <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
- <translation>Transakcja przekracza limit. Możesz wysłać ją płacąc prowizję %1, która zostaje przekazana do węzłów, które ją prześlą i pomoże wspierać sieć Bitcoin. Czy chcesz zapłacić prowizję?</translation>
- </message>
- <message>
- <location line="-152"/>
+ <location line="-85"/>
<source>Up to date</source>
<translation>Aktualny</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Catching up...</source>
<translation>Åapanie bloków...</translation>
</message>
<message>
- <location line="+124"/>
- <source>Confirm transaction fee</source>
- <translation>Potwierdź prowizję transakcyjną</translation>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+130"/>
<source>Sent transaction</source>
<translation>Transakcja wysłana</translation>
</message>
@@ -677,7 +680,7 @@ Adres: %4
</translation>
</message>
<message>
- <location line="+67"/>
+ <location line="+69"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation>Portfel jest &lt;b&gt;zaszyfrowany&lt;/b&gt; i obecnie &lt;b&gt;niezablokowany&lt;/b&gt;</translation>
</message>
@@ -687,7 +690,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 filename="../bitcoin.cpp" line="+116"/>
+ <location filename="../bitcoin.cpp" line="+438"/>
<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>
@@ -909,7 +912,12 @@ Adres: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+171"/>
+ <location line="+31"/>
+ <source>none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+140"/>
<source>Dust</source>
<translation type="unfinished"/>
</message>
@@ -946,7 +954,7 @@ Adres: %4
</message>
<message>
<location line="+1"/>
- <source>This label turns red, if the priority is smaller than &quot;medium&quot;</source>
+ <source>This label turns red, if the priority is smaller than &quot;medium&quot;.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1015,7 +1023,7 @@ Adres: %4
<translation>&amp;Adres</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+25"/>
+ <location filename="../editaddressdialog.cpp" line="+28"/>
<source>New receiving address</source>
<translation>Nowy adres odbiorczy</translation>
</message>
@@ -1084,20 +1092,24 @@ Adres: %4
</message>
</context>
<context>
- <name>GUIUtil::HelpMessageBox</name>
+ <name>HelpMessageDialog</name>
<message>
- <location filename="../guiutil.cpp" line="+597"/>
- <source>version</source>
- <translation>wersja</translation>
+ <location filename="../forms/helpmessagedialog.ui" line="+19"/>
+ <source>Bitcoin Core - Command-line options</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <location line="+13"/>
+ <location filename="../utilitydialog.cpp" line="+38"/>
<source>Bitcoin Core</source>
<translation>Rdzeń BitCoin</translation>
</message>
<message>
- <location line="-11"/>
+ <location line="+0"/>
+ <source>version</source>
+ <translation>wersja</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Usage:</source>
<translation>Użycie:</translation>
</message>
@@ -1226,7 +1238,7 @@ Adres: %4
<translation>Opcje</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+13"/>
<source>&amp;Main</source>
<translation>Główne</translation>
</message>
@@ -1251,7 +1263,52 @@ Adres: %4
<translation>Uruchamiaj Bitcoin wraz z zalogowaniem do &amp;systemu</translation>
</message>
<message>
- <location line="+35"/>
+ <location line="+9"/>
+ <source>Size of &amp;database cache</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set database cache size in megabytes (default: 25)</source>
+ <translation>Ustaw rozmiar w megabajtach cache-u bazy danych (domyślnie: 25)</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>MB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Number of script &amp;verification threads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
+ <translation>Ustaw liczbę wątków skryptu weryfikacji (do 16, 0 = auto, &lt;0 = zostawia taką ilość rdzenie wolnych, domyślnie: 0)</translation>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Connect to the Bitcoin network through a SOCKS proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Connect through SOCKS proxy (default proxy):</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+224"/>
+ <source>Active command-line options that override above options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
<source>Reset all client options to default.</source>
<translation>Przywróć domyślne wszystkie ustawienia klienta.</translation>
</message>
@@ -1261,7 +1318,7 @@ Adres: %4
<translation>Z&amp;resetuj Ustawienia</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="-323"/>
<source>&amp;Network</source>
<translation>&amp;Sieć</translation>
</message>
@@ -1276,32 +1333,17 @@ Adres: %4
<translation>Mapuj port używając &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>Podłącz się do sieci Bitcoin przez proxy SOCKS (np. gdy łączysz się poprzez Tor&apos;a)</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>&amp;Connect through SOCKS proxy:</source>
- <translation>&amp;Połącz się przez proxy SOCKS</translation>
- </message>
- <message>
- <location line="+9"/>
+ <location line="+19"/>
<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>Adres IP serwera proxy (np. 127.0.0.1)</translation>
- </message>
- <message>
- <location line="+7"/>
+ <location line="+32"/>
<source>&amp;Port:</source>
<translation>&amp;Port:</translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+25"/>
<source>Port of the proxy (e.g. 9050)</source>
<translation>Port proxy (np. 9050)</translation>
</message>
@@ -1386,7 +1428,7 @@ Adres: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+71"/>
+ <location line="+136"/>
<source>&amp;OK</source>
<translation>&amp;OK</translation>
</message>
@@ -1396,44 +1438,38 @@ Adres: %4
<translation>&amp;Anuluj</translation>
</message>
<message>
- <location line="+10"/>
- <source>&amp;Apply</source>
- <translation>Z&amp;astosuj</translation>
- </message>
- <message>
- <location filename="../optionsdialog.cpp" line="+63"/>
+ <location filename="../optionsdialog.cpp" line="+67"/>
<source>default</source>
<translation>domyślny</translation>
</message>
<message>
- <location line="+131"/>
+ <location line="+57"/>
+ <source>none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+75"/>
<source>Confirm options reset</source>
<translation>Potwierdź reset ustawień</translation>
</message>
<message>
<location line="+1"/>
- <source>Some settings may require a client restart to take effect.</source>
- <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>Czy chcesz kontynuować?</translation>
+ <location line="+29"/>
+ <source>Client restart required to activate changes.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
- <location line="+9"/>
- <source>Warning</source>
- <translation>Ostrzeżenie</translation>
+ <location line="-29"/>
+ <source>Client will be shutdown, do you want to proceed?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="-9"/>
- <location line="+9"/>
- <source>This setting will take effect after restarting Bitcoin.</source>
- <translation>To ustawienie zostanie zastosowane po restarcie Bitcoin</translation>
+ <location line="+33"/>
+ <source>This change would require a client restart.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+29"/>
+ <location line="+34"/>
<source>The supplied proxy address is invalid.</source>
<translation>Adres podanego proxy jest nieprawidłowy</translation>
</message>
@@ -1447,22 +1483,22 @@ Adres: %4
</message>
<message>
<location line="+50"/>
- <location line="+214"/>
+ <location line="+231"/>
<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="-140"/>
+ <location line="-155"/>
<source>Unconfirmed:</source>
<translation>Niepotwierdzone:</translation>
</message>
<message>
- <location line="-81"/>
+ <location line="-83"/>
<source>Wallet</source>
<translation>Portfel</translation>
</message>
<message>
- <location line="+49"/>
+ <location line="+51"/>
<source>Confirmed:</source>
<translation>Potwierdzone:</translation>
</message>
@@ -1497,7 +1533,7 @@ Adres: %4
<translation>Twoje obecne saldo</translation>
</message>
<message>
- <location line="+56"/>
+ <location line="+71"/>
<source>&lt;b&gt;Recent transactions&lt;/b&gt;</source>
<translation>&lt;b&gt;Ostatnie transakcje&lt;/b&gt;</translation>
</message>
@@ -1511,7 +1547,8 @@ Adres: %4
<context>
<name>PaymentServer</name>
<message>
- <location filename="../paymentserver.cpp" line="+397"/>
+ <location filename="../paymentserver.cpp" line="+403"/>
+ <location line="+13"/>
<source>URI handling</source>
<translation>Obsługa URI</translation>
</message>
@@ -1521,24 +1558,52 @@ Adres: %4
<translation>URI nie może zostać przetworzony! Prawdopodobnie błędny adres Bitcoin bądź nieprawidłowe parametry URI.</translation>
</message>
<message>
- <location line="+91"/>
+ <location line="+96"/>
<source>Requested payment amount of %1 is too small (considered dust).</source>
<translation>Żądana kwota %1 jest za niska (uznano za kurz).</translation>
</message>
<message>
- <location line="-204"/>
- <location line="+195"/>
+ <location line="-221"/>
+ <location line="+212"/>
<location line="+13"/>
+ <location line="+95"/>
+ <location line="+18"/>
+ <location line="+16"/>
<source>Payment request error</source>
<translation>Błąd żądania płatności</translation>
</message>
<message>
- <location line="-207"/>
+ <location line="-353"/>
<source>Cannot start bitcoin: click-to-pay handler</source>
<translation>Nie można rozpocząć bitcoin: kliknij-by-zapłacić opiekunowi</translation>
</message>
<message>
- <location line="+195"/>
+ <location line="+58"/>
+ <source>Net manager warning</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Your active proxy doesn&apos;t support SOCKS5, which is required for payment requests via proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>Payment request fetch URL is invalid: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Payment request file handling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Payment request file can not be read or processed! This can be caused by an invalid payment request file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+73"/>
<source>Unverified payment requests to custom payment scripts are unsupported.</source>
<translation type="unfinished"/>
</message>
@@ -1548,24 +1613,27 @@ Adres: %4
<translation>Zwrot z %1</translation>
</message>
<message>
- <location line="+42"/>
+ <location line="+43"/>
<source>Error communicating with %1: %2</source>
<translation>BÅ‚Ä…d komunikacji z %1 : %2</translation>
</message>
<message>
- <location line="+28"/>
+ <location line="+24"/>
+ <source>Payment request can not be parsed or processed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
<source>Bad response from server %1</source>
<translation>Błędna odpowiedź z serwera %1</translation>
</message>
<message>
- <location line="+32"/>
+ <location line="+33"/>
<source>Payment acknowledged</source>
<translation>Płatność potwierdzona</translation>
</message>
<message>
- <location line="-55"/>
- <location line="+27"/>
- <location line="+17"/>
+ <location line="-11"/>
<source>Network request error</source>
<translation>Błąd żądania sieci</translation>
</message>
@@ -1573,18 +1641,18 @@ Adres: %4
<context>
<name>QObject</name>
<message>
- <location filename="../bitcoin.cpp" line="+119"/>
- <location line="+5"/>
+ <location filename="../bitcoin.cpp" line="+71"/>
+ <location line="+11"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-4"/>
+ <location line="+1"/>
<source>Error: Specified data directory &quot;%1&quot; does not exist.</source>
<translation>Błąd: Określony folder danych &quot;%1&quot; nie istnieje.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="-12"/>
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation>BÅ‚Ä…d: Niepoprawna kombinacja -regtest i -testnet.</translation>
</message>
@@ -1626,15 +1694,16 @@ Adres: %4
<location line="+23"/>
<location line="+23"/>
<location line="+36"/>
- <location line="+53"/>
+ <location line="+23"/>
+ <location line="+36"/>
<location line="+23"/>
<location line="+23"/>
- <location filename="../rpcconsole.cpp" line="+360"/>
+ <location filename="../rpcconsole.cpp" line="+359"/>
<source>N/A</source>
<translation>NIEDOSTĘPNE</translation>
</message>
<message>
- <location line="-217"/>
+ <location line="-223"/>
<source>Client version</source>
<translation>Wersja klienta</translation>
</message>
@@ -1649,7 +1718,12 @@ Adres: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+78"/>
+ <location line="+25"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+53"/>
<source>Using OpenSSL version</source>
<translation>Używana wersja OpenSSL</translation>
</message>
@@ -1665,16 +1739,16 @@ Adres: %4
</message>
<message>
<location line="+7"/>
- <source>Number of connections</source>
- <translation>Liczba połączeń</translation>
+ <source>Name</source>
+ <translation>Nazwa</translation>
</message>
<message>
<location line="+23"/>
- <source>On testnet</source>
- <translation>W sieci testowej</translation>
+ <source>Number of connections</source>
+ <translation>Liczba połączeń</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+29"/>
<source>Block chain</source>
<translation>Ciąg bloków</translation>
</message>
@@ -1699,16 +1773,6 @@ Adres: %4
<translation>&amp;Otwórz</translation>
</message>
<message>
- <location line="+16"/>
- <source>Command-line options</source>
- <translation>Opcje konsoli</translation>
- </message>
- <message>
- <location line="+10"/>
- <source>&amp;Show</source>
- <translation>&amp;Pokaż</translation>
- </message>
- <message>
<location line="+24"/>
<source>&amp;Console</source>
<translation>&amp;Konsola</translation>
@@ -1739,17 +1803,12 @@ Adres: %4
<translation>Wyjście:</translation>
</message>
<message>
- <location line="-541"/>
+ <location line="-521"/>
<source>Build date</source>
<translation>Data kompilacji</translation>
</message>
<message>
- <location line="-79"/>
- <source>Bitcoin Core</source>
- <translation>Rdzeń BitCoin</translation>
- </message>
- <message>
- <location line="+279"/>
+ <location line="+206"/>
<source>Debug log file</source>
<translation>Plik logowania debugowania</translation>
</message>
@@ -1759,11 +1818,6 @@ Adres: %4
<translation>Otwórz plik logowania debugowania Bitcoin z obecnego katalogu z danymi. Może to potrwać kilka sekund przy większych plikach.</translation>
</message>
<message>
- <location line="+26"/>
- <source>Show the Bitcoin-Core help message to get a list with possible Bitcoin command-line options.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location line="+76"/>
<source>Clear console</source>
<translation>Wyczyść konsolę</translation>
@@ -1784,7 +1838,7 @@ Adres: %4
<translation>Wpisz &lt;b&gt;help&lt;/b&gt; aby uzyskać listę dostępnych komend</translation>
</message>
<message>
- <location line="+128"/>
+ <location line="+122"/>
<source>%1 B</source>
<translation>%1 B</translation>
</message>
@@ -1827,12 +1881,7 @@ Adres: %4
<translation>&amp;Ilość:</translation>
</message>
<message>
- <location line="+19"/>
- <source>The amount to request</source>
- <translation>Żądana ilość</translation>
- </message>
- <message>
- <location line="-32"/>
+ <location line="-13"/>
<source>&amp;Label:</source>
<translation>&amp;Etykieta:</translation>
</message>
@@ -1842,12 +1891,7 @@ Adres: %4
<translation>&amp;Wiadomość:</translation>
</message>
<message>
- <location line="+20"/>
- <source>The message to attach to payment request</source>
- <translation>Wiadomość dołączana do żądania płatności</translation>
- </message>
- <message>
- <location line="-37"/>
+ <location line="-17"/>
<source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation>Użyj jeden z poprzednio użytych adresów odbiorczych. Podczas ponownego używania adresów występują problemy z bezpieczeństwem i prywatnością. Nie korzystaj z tej opcji, chyba że odtwarzasz żądanie płatności wykonane już wcześniej.</translation>
</message>
@@ -1858,16 +1902,26 @@ Adres: %4
</message>
<message>
<location line="+27"/>
- <source>The label to associate with the new receiving address</source>
+ <source>An optional label to associate with the new receiving address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
- <source>Use this form to request payments. All fields are optional.</source>
- <translation>Użyj tego formularza, aby zażądać płatności. Wszystkie pola są opcjonalne.</translation>
+ <location line="+7"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+56"/>
+ <location line="+7"/>
+ <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+39"/>
+ <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+17"/>
<source>Clear all fields of the form.</source>
<translation>Wyczyść pola formularza</translation>
</message>
@@ -1883,11 +1937,11 @@ Adres: %4
</message>
<message>
<location line="+47"/>
- <source>Previously requested payments</source>
+ <source>Requested payments</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+12"/>
+ <location line="+16"/>
<source>Show the selected request (does the same as double clicking an entry)</source>
<translation type="unfinished"/>
</message>
@@ -1978,7 +2032,7 @@ Adres: %4
<context>
<name>RecentRequestsTableModel</name>
<message>
- <location filename="../recentrequeststablemodel.cpp" line="+14"/>
+ <location filename="../recentrequeststablemodel.cpp" line="+24"/>
<source>Date</source>
<translation>Data</translation>
</message>
@@ -1998,7 +2052,7 @@ Adres: %4
<translation>Kwota</translation>
</message>
<message>
- <location line="+36"/>
+ <location line="+38"/>
<source>(no label)</source>
<translation>(bez etykiety)</translation>
</message>
@@ -2013,7 +2067,7 @@ Adres: %4
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
<location filename="../sendcoinsdialog.cpp" line="+381"/>
- <location line="+81"/>
+ <location line="+80"/>
<source>Send Coins</source>
<translation>Wyślij Monety</translation>
</message>
@@ -2123,7 +2177,7 @@ Adres: %4
<translation>Wy&amp;syłka</translation>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-229"/>
+ <location filename="../sendcoinsdialog.cpp" line="-228"/>
<source>Confirm send coins</source>
<translation>Potwierdź wysyłanie monet</translation>
</message>
@@ -2226,22 +2280,22 @@ Adres: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+113"/>
+ <location line="+112"/>
<source>Warning: Invalid Bitcoin address</source>
<translation>Ostrzeżenie: nieprawidłowy adres Bitcoin</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+21"/>
<source>(no label)</source>
<translation>(bez etykiety)</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="-11"/>
<source>Warning: Unknown change address</source>
<translation>Ostrzeżenie: Nieznany adres</translation>
</message>
<message>
- <location line="-378"/>
+ <location line="-366"/>
<source>Are you sure you want to send?</source>
<translation>Czy na pewno chcesz wysłać?</translation>
</message>
@@ -2265,13 +2319,13 @@ Adres: %4
<name>SendCoinsEntry</name>
<message>
<location filename="../forms/sendcoinsentry.ui" line="+131"/>
- <location line="+501"/>
+ <location line="+521"/>
<location line="+536"/>
<source>A&amp;mount:</source>
<translation>Su&amp;ma:</translation>
</message>
<message>
- <location line="-1132"/>
+ <location line="-1152"/>
<source>Pay &amp;To:</source>
<translation>Zapłać &amp;dla:</translation>
</message>
@@ -2317,23 +2371,33 @@ Adres: %4
</message>
<message>
<location line="+7"/>
- <location line="+504"/>
+ <location line="+524"/>
<location line="+536"/>
<source>Remove this entry</source>
<translation>Usuń ten wpis</translation>
</message>
<message>
- <location line="-40"/>
+ <location line="-1008"/>
+ <source>Message:</source>
+ <translation>Wiadomość:</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+958"/>
<source>This is a verified payment request.</source>
<translation>Zweryfikowano żądanie zapłaty.</translation>
</message>
<message>
- <location line="-971"/>
+ <location line="-991"/>
<source>Enter a label for this address to add it to the list of used addresses</source>
<translation>Wprowadź etykietę dla tego adresu by dodać go do listy użytych adresów</translation>
</message>
<message>
- <location line="+439"/>
+ <location line="+459"/>
<source>This is an unverified payment request.</source>
<translation>To żądanie zapłaty nie zostało zweryfikowane.</translation>
</message>
@@ -2356,6 +2420,19 @@ Adres: %4
</message>
</context>
<context>
+ <name>ShutdownWindow</name>
+ <message>
+ <location filename="../utilitydialog.cpp" line="+48"/>
+ <source>Bitcoin Core is shutting down...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Do not shut down the computer until this window disappears.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>SignVerifyMessageDialog</name>
<message>
<location filename="../forms/signverifymessagedialog.ui" line="+14"/>
@@ -2363,7 +2440,7 @@ Adres: %4
<translation>Podpisy - Podpisz / zweryfikuj wiadomość</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+10"/>
<source>&amp;Sign Message</source>
<translation>Podpi&amp;sz Wiadomość</translation>
</message>
@@ -2551,7 +2628,7 @@ Adres: %4
<context>
<name>SplashScreen</name>
<message>
- <location filename="../splashscreen.cpp" line="+26"/>
+ <location filename="../splashscreen.cpp" line="+28"/>
<source>Bitcoin Core</source>
<translation>Rdzeń BitCoin</translation>
</message>
@@ -2650,12 +2727,12 @@ Adres: %4
<location line="+12"/>
<location line="+45"/>
<location line="+17"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Credit</source>
<translation>Przypisy</translation>
</message>
<message numerus="yes">
- <location line="-120"/>
+ <location line="-125"/>
<source>matures in %n more block(s)</source>
<translation><numerusform>potwierdzona przy %n bloku więcej</numerusform><numerusform>potwierdzona przy %n blokach więcej</numerusform><numerusform>potwierdzona przy %n blokach więcej</numerusform></translation>
</message>
@@ -2668,12 +2745,12 @@ Adres: %4
<location line="+44"/>
<location line="+8"/>
<location line="+15"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Debit</source>
<translation>Debet</translation>
</message>
<message>
- <location line="-57"/>
+ <location line="-62"/>
<source>Transaction fee</source>
<translation>Prowizja transakcji</translation>
</message>
@@ -2684,11 +2761,12 @@ Adres: %4
</message>
<message>
<location line="+6"/>
+ <location line="+9"/>
<source>Message</source>
<translation>Wiadomość</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="-7"/>
<source>Comment</source>
<translation>Komentarz</translation>
</message>
@@ -2698,7 +2776,7 @@ Adres: %4
<translation>ID transakcji</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+18"/>
<source>Merchant</source>
<translation>Kupiec</translation>
</message>
@@ -2738,7 +2816,7 @@ Adres: %4
<translation>fałsz</translation>
</message>
<message>
- <location line="-227"/>
+ <location line="-232"/>
<source>, has not been successfully broadcast yet</source>
<translation>, nie został jeszcze pomyślnie wyemitowany</translation>
</message>
@@ -2788,8 +2866,13 @@ Adres: %4
<source>Amount</source>
<translation>Kwota</translation>
</message>
+ <message>
+ <location line="+59"/>
+ <source>Immature (%1 confirmations, will be available after %2)</source>
+ <translation type="unfinished"/>
+ </message>
<message numerus="yes">
- <location line="+57"/>
+ <location line="+16"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform>Otwórz dla %n następnych bloków</numerusform></translation>
</message>
@@ -2809,17 +2892,13 @@ Adres: %4
<translation>Niezatwierdzony (%1 z %2 potwierdzeń)</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="-22"/>
+ <location line="+25"/>
<source>Confirmed (%1 confirmations)</source>
<translation>Zatwierdzony (%1 potwierdzeń)</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>Balans wydobycia będzie dostępny zaraz po tym, jak dojrzeje. Pozostał %n blok</numerusform><numerusform>Balans wydobycia będzie dostępny zaraz po tym, jak dojrzeje. Pozostało %n bloków</numerusform><numerusform>Balans wydobycia będzie dostępny zaraz po tym, jak dojrzeje. Pozostało %n bloków</numerusform></translation>
- </message>
<message>
- <location line="+5"/>
+ <location line="-22"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation>Ten blok nie został odebrany przez jakikolwiek inny węzeł i prawdopodobnie nie zostanie zaakceptowany!</translation>
</message>
@@ -2829,7 +2908,7 @@ Adres: %4
<translation>Wygenerowano ale nie zaakceptowano</translation>
</message>
<message>
- <location line="+43"/>
+ <location line="+62"/>
<source>Received with</source>
<translation>Otrzymane przez</translation>
</message>
@@ -3125,7 +3204,7 @@ Adres: %4
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+217"/>
+ <location filename="../bitcoinstrings.cpp" line="+221"/>
<source>Usage:</source>
<translation>Użycie:</translation>
</message>
@@ -3145,7 +3224,7 @@ Adres: %4
<translation>Opcje:</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+22"/>
<source>Specify configuration file (default: bitcoin.conf)</source>
<translation>Wskaż plik konfiguracyjny (domyślnie: bitcoin.conf)</translation>
</message>
@@ -3165,7 +3244,7 @@ Adres: %4
<translation>Ustaw rozmiar w megabajtach cache-u bazy danych (domyślnie: 25)</translation>
</message>
<message>
- <location line="-27"/>
+ <location line="-26"/>
<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>
@@ -3175,7 +3254,7 @@ Adres: %4
<translation>Utrzymuj maksymalnie &lt;n&gt; połączeń z peerami (domyślnie: 125)</translation>
</message>
<message>
- <location line="-50"/>
+ <location line="-51"/>
<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>
@@ -3185,22 +3264,22 @@ Adres: %4
<translation>Podaj swój publiczny adres</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<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="-147"/>
+ <location line="-148"/>
<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="-33"/>
+ <location line="-36"/>
<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="+31"/>
+ <location line="+34"/>
<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>
@@ -3210,7 +3289,7 @@ Adres: %4
<translation>Akceptuj linię poleceń oraz polecenia JSON-RPC</translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>Uruchom w tle jako daemon i przyjmuj polecenia</translation>
</message>
@@ -3220,12 +3299,12 @@ Adres: %4
<translation>Użyj sieci testowej</translation>
</message>
<message>
- <location line="-117"/>
+ <location line="-118"/>
<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="-92"/>
+ <location line="-95"/>
<source>%s, you must set a rpcpassword in the configuration file:
%s
It is recommended you use the following random password:
@@ -3275,6 +3354,11 @@ na przykład: alertnotify=echo %%s | mail -s &quot;Alarm Bitcoin&quot; admin@foo
</message>
<message>
<location line="+4"/>
+ <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</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>Błąd: transakcja została odrzucona. Może się to zdarzyć, gdy monety z Twojego portfela zostały już wydane, na przykład gdy używałeś kopii wallet.dat i bitcoiny które tam wydałeś nie zostały jeszcze odjęte z portfela z którego teraz korzystasz.</translation>
</message>
@@ -3380,6 +3464,11 @@ na przykład: alertnotify=echo %%s | mail -s &quot;Alarm Bitcoin&quot; admin@foo
</message>
<message>
<location line="+1"/>
+ <source>Do not load the wallet and disable wallet RPC calls</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Do you want to rebuild the block database now?</source>
<translation>Czy chcesz teraz przebudować bazę bloków?</translation>
</message>
@@ -3544,7 +3633,7 @@ na przykład: alertnotify=echo %%s | mail -s &quot;Alarm Bitcoin&quot; admin@foo
<translation>Wyślij polecenie do serwera Bitcoin</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+7"/>
<source>Set maximum block size in bytes (default: %d)</source>
<translation type="unfinished"/>
</message>
@@ -3564,7 +3653,12 @@ na przykład: alertnotify=echo %%s | mail -s &quot;Alarm Bitcoin&quot; admin@foo
<translation>Startowanie serwera Bitcoin</translation>
</message>
<message>
- <location line="+12"/>
+ <location line="+3"/>
+ <source>This is intended for regression testing tools and app development.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Usage (deprecated, use bitcoin-cli):</source>
<translation>Użycie (przestarzałe, użyj bitcoin-cli):</translation>
</message>
@@ -3589,7 +3683,12 @@ na przykład: alertnotify=echo %%s | mail -s &quot;Alarm Bitcoin&quot; admin@foo
<translation>Portfel %s znajduje siÄ™ poza folderem danych %s</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="+2"/>
+ <source>Wallet options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source>
<translation type="unfinished"/>
</message>
@@ -3599,12 +3698,12 @@ na przykład: alertnotify=echo %%s | mail -s &quot;Alarm Bitcoin&quot; admin@foo
<translation>Musisz przebudować bazę używając parametru -reindex aby zmienić -txindex</translation>
</message>
<message>
- <location line="-78"/>
+ <location line="-79"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation>Importuj bloki z zewnętrznego pliku blk000??.dat</translation>
</message>
<message>
- <location line="-104"/>
+ <location line="-105"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation>Uruchom polecenie przy otrzymaniu odpowiedniego powiadomienia lub gdy zobaczymy naprawdę długie rozgałęzienie (%s w poleceniu jest podstawiane za komunikat)</translation>
</message>
@@ -3624,7 +3723,7 @@ na przykład: alertnotify=echo %%s | mail -s &quot;Alarm Bitcoin&quot; admin@foo
<translation>Ustaw liczbę wątków skryptu weryfikacji (do 16, 0 = auto, &lt;0 = zostawia taką ilość rdzenie wolnych, domyślnie: 0)</translation>
</message>
<message>
- <location line="+88"/>
+ <location line="+89"/>
<source>Information</source>
<translation>Informacja</translation>
</message>
@@ -3674,11 +3773,6 @@ na przykład: alertnotify=echo %%s | mail -s &quot;Alarm Bitcoin&quot; admin@foo
<translation>Wyślij informację/raport do konsoli zamiast do pliku debug.log.</translation>
</message>
<message>
- <location line="+1"/>
- <source>Send trace/debug info to debugger</source>
- <translation>Wyślij informację/raport do debuggera.</translation>
- </message>
- <message>
<location line="+6"/>
<source>Set minimum block size in bytes (default: 0)</source>
<translation>Ustaw minimalny rozmiar bloku w bajtach (domyślnie: 0)</translation>
@@ -3704,7 +3798,7 @@ na przykład: alertnotify=echo %%s | mail -s &quot;Alarm Bitcoin&quot; admin@foo
<translation>BÅ‚Ä…d systemu:</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Transaction amount too small</source>
<translation>Zbyt niska kwota transakcji </translation>
</message>
@@ -3734,7 +3828,7 @@ na przykład: alertnotify=echo %%s | mail -s &quot;Alarm Bitcoin&quot; admin@foo
<translation>Nazwa użytkownika dla połączeń JSON-RPC</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Warning</source>
<translation>Ostrzeżenie</translation>
</message>
@@ -3754,37 +3848,37 @@ na przykład: alertnotify=echo %%s | mail -s &quot;Alarm Bitcoin&quot; admin@foo
<translation>wallet.dat uszkodzony, odtworzenie się nie powiodło</translation>
</message>
<message>
- <location line="-57"/>
+ <location line="-58"/>
<source>Password for JSON-RPC connections</source>
<translation>Hasło do połączeń JSON-RPC</translation>
</message>
<message>
- <location line="-69"/>
+ <location line="-70"/>
<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="+79"/>
+ <location line="+80"/>
<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="-131"/>
+ <location line="-132"/>
<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="+160"/>
+ <location line="+161"/>
<source>Upgrade wallet to latest format</source>
<translation>Zaktualizuj portfel do najnowszego formatu.</translation>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<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>
<message>
- <location line="-12"/>
+ <location line="-11"/>
<source>Rescan the block chain for missing wallet transactions</source>
<translation>Przeskanuj blok łańcuchów żeby znaleźć zaginione transakcje portfela</translation>
</message>
@@ -3794,7 +3888,7 @@ na przykład: alertnotify=echo %%s | mail -s &quot;Alarm Bitcoin&quot; admin@foo
<translation>Użyj OpenSSL (https) do połączeń JSON-RPC</translation>
</message>
<message>
- <location line="-29"/>
+ <location line="-30"/>
<source>Server certificate file (default: server.cert)</source>
<translation>Plik certyfikatu serwera (domyślnie: server.cert)</translation>
</message>
@@ -3809,17 +3903,17 @@ na przykład: alertnotify=echo %%s | mail -s &quot;Alarm Bitcoin&quot; admin@foo
<translation>Ta wiadomość pomocy</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Unable to bind to %s on this computer (bind returned error %d, %s)</source>
<translation>Nie można przywiązać %s na tym komputerze (bind returned error %d, %s)</translation>
</message>
<message>
- <location line="-106"/>
+ <location line="-107"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation>Zezwól -addnode, -seednode i -connect na łączenie się z serwerem DNS</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+60"/>
<source>Loading addresses...</source>
<translation>Wczytywanie adresów...</translation>
</message>
@@ -3859,7 +3953,7 @@ na przykład: alertnotify=echo %%s | mail -s &quot;Alarm Bitcoin&quot; admin@foo
<translation>Nieznana wersja proxy w -socks: %i</translation>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation>Nie można uzyskać adresu -bind: &apos;%s&apos;</translation>
</message>
@@ -3869,7 +3963,7 @@ na przykład: alertnotify=echo %%s | mail -s &quot;Alarm Bitcoin&quot; admin@foo
<translation>Nie można uzyskać adresu -externalip: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+47"/>
+ <location line="+48"/>
<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>
@@ -3889,7 +3983,7 @@ na przykład: alertnotify=echo %%s | mail -s &quot;Alarm Bitcoin&quot; admin@foo
<translation>Åadowanie indeksu bloku...</translation>
</message>
<message>
- <location line="-61"/>
+ <location line="-62"/>
<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>
@@ -3899,12 +3993,12 @@ na przykład: alertnotify=echo %%s | mail -s &quot;Alarm Bitcoin&quot; admin@foo
<translation>Nie można przywiązać %s na tym komputerze. Bitcoin prawdopodobnie już działa.</translation>
</message>
<message>
- <location line="+94"/>
+ <location line="+95"/>
<source>Loading wallet...</source>
<translation>Wczytywanie portfela...</translation>
</message>
<message>
- <location line="-55"/>
+ <location line="-56"/>
<source>Cannot downgrade wallet</source>
<translation>Nie można dezaktualizować portfela</translation>
</message>
@@ -3914,7 +4008,7 @@ na przykład: alertnotify=echo %%s | mail -s &quot;Alarm Bitcoin&quot; admin@foo
<translation>Nie można zapisać domyślnego adresu</translation>
</message>
<message>
- <location line="+66"/>
+ <location line="+67"/>
<source>Rescanning...</source>
<translation>Ponowne skanowanie...</translation>
</message>
@@ -3934,7 +4028,7 @@ na przykład: alertnotify=echo %%s | mail -s &quot;Alarm Bitcoin&quot; admin@foo
<translation>BÅ‚Ä…d</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-35"/>
<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 fd9a57ce72..98960e0667 100644
--- a/src/qt/locale/bitcoin_pt_BR.ts
+++ b/src/qt/locale/bitcoin_pt_BR.ts
@@ -3,13 +3,13 @@
<name>AboutDialog</name>
<message>
<location filename="../forms/aboutdialog.ui" line="+14"/>
- <source>About Bitcoin</source>
- <translation>Sobre o Bitcoin</translation>
+ <source>About Bitcoin Core</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+39"/>
- <source>&lt;b&gt;Bitcoin&lt;/b&gt; version</source>
- <translation>Versão do &lt;b&gt;Bitcoin&lt;/b&gt;</translation>
+ <source>&lt;b&gt;Bitcoin Core&lt;/b&gt; version</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+57"/>
@@ -27,14 +27,14 @@ Distribuido sob a licença de software MIT/X11, veja o arquivo anexo COPYING ou
Este produto inclui software desenvolvido pelo Projeto OpenSSL para uso no OpenSSL Toolkit (http://www.openssl.org/), software de criptografia escrito por Eric Young (eay@cryptsoft.com) e sofware UPnP escrito por Thomas Bernard.</translation>
</message>
<message>
- <location filename="../aboutdialog.cpp" line="+14"/>
+ <location filename="../utilitydialog.cpp" line="+29"/>
<source>Copyright</source>
<translation>Copyright</translation>
</message>
<message>
<location line="+0"/>
- <source>The Bitcoin developers</source>
- <translation>Desenvolvedores do Bitcoin</translation>
+ <source>The Bitcoin Core developers</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -52,7 +52,7 @@ Este produto inclui software desenvolvido pelo Projeto OpenSSL para uso no OpenS
<message>
<location line="+3"/>
<source>&amp;New</source>
- <translation type="unfinished"/>
+ <translation>&amp;Novo</translation>
</message>
<message>
<location line="+11"/>
@@ -62,15 +62,15 @@ Este produto inclui software desenvolvido pelo Projeto OpenSSL para uso no OpenS
<message>
<location line="+3"/>
<source>&amp;Copy</source>
- <translation type="unfinished"/>
+ <translation>&amp;Copiar</translation>
</message>
<message>
<location line="+52"/>
<source>C&amp;lose</source>
- <translation type="unfinished"/>
+ <translation>&amp;Fechar</translation>
</message>
<message>
- <location filename="../addressbookpage.cpp" line="+72"/>
+ <location filename="../addressbookpage.cpp" line="+74"/>
<source>&amp;Copy Address</source>
<translation>&amp;Copiar Endereço</translation>
</message>
@@ -107,17 +107,17 @@ Este produto inclui software desenvolvido pelo Projeto OpenSSL para uso no OpenS
<message>
<location line="+5"/>
<source>C&amp;hoose</source>
- <translation type="unfinished"/>
+ <translation>Escol&amp;ha</translation>
</message>
<message>
<location line="+6"/>
<source>Sending addresses</source>
- <translation type="unfinished"/>
+ <translation>Enviando endereços</translation>
</message>
<message>
<location line="+1"/>
<source>Receiving addresses</source>
- <translation type="unfinished"/>
+ <translation>Recebendo endereços</translation>
</message>
<message>
<location line="+7"/>
@@ -140,7 +140,7 @@ Este produto inclui software desenvolvido pelo Projeto OpenSSL para uso no OpenS
<translation>&amp;Editar</translation>
</message>
<message>
- <location line="+197"/>
+ <location line="+194"/>
<source>Export Address List</source>
<translation type="unfinished"/>
</message>
@@ -151,19 +151,19 @@ Este produto inclui software desenvolvido pelo Projeto OpenSSL para uso no OpenS
</message>
<message>
<location line="+13"/>
- <source>Error exporting</source>
- <translation>Erro ao exportar</translation>
+ <source>Exporting Failed</source>
+ <translation>Exportação Falhou</translation>
</message>
<message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation>Não foi possível gravar no arquivo %1.</translation>
+ <location line="+1"/>
+ <source>There was an error trying to save the address list to %1.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<name>AddressTableModel</name>
<message>
- <location filename="../addresstablemodel.cpp" line="+164"/>
+ <location filename="../addresstablemodel.cpp" line="+168"/>
<source>Label</source>
<translation>Rótulo</translation>
</message>
@@ -201,7 +201,7 @@ Este produto inclui software desenvolvido pelo Projeto OpenSSL para uso no OpenS
<translation>Repita a nova frase de segurança</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="+34"/>
+ <location filename="../askpassphrasedialog.cpp" line="+40"/>
<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>Digite a nova frase de seguraça da sua carteira. &lt;br/&gt; Por favor, use uma frase de &lt;b&gt;10 ou mais caracteres aleatórios,&lt;/b&gt; ou &lt;b&gt;oito ou mais palavras.&lt;/b&gt;</translation>
</message>
@@ -322,22 +322,27 @@ Este produto inclui software desenvolvido pelo Projeto OpenSSL para uso no OpenS
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+250"/>
+ <location filename="../bitcoingui.cpp" line="+295"/>
<source>Sign &amp;message...</source>
<translation>&amp;Assinar Mensagem...</translation>
</message>
<message>
- <location line="+254"/>
+ <location line="+335"/>
<source>Synchronizing with network...</source>
<translation>Sincronizando com a rede...</translation>
</message>
<message>
- <location line="-324"/>
+ <location line="-407"/>
<source>&amp;Overview</source>
<translation>&amp;Visão geral</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="-137"/>
+ <source>Node</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+138"/>
<source>Show general overview of wallet</source>
<translation>Mostrar visão geral da carteira</translation>
</message>
@@ -352,7 +357,7 @@ Este produto inclui software desenvolvido pelo Projeto OpenSSL para uso no OpenS
<translation>Navegar pelo histórico de transações</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>E&amp;xit</source>
<translation>S&amp;air</translation>
</message>
@@ -398,7 +403,22 @@ Este produto inclui software desenvolvido pelo Projeto OpenSSL para uso no OpenS
<translation>&amp;Mudar frase de segurança...</translation>
</message>
<message>
- <location line="+259"/>
+ <location line="+10"/>
+ <source>&amp;Sending addresses...</source>
+ <translation>Enviando endereço&amp;s...</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Receiving addresses...</source>
+ <translation>&amp;Receber endereços...</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open &amp;URI...</source>
+ <translation>Abrir &amp;URI...</translation>
+ </message>
+ <message>
+ <location line="+325"/>
<source>Importing blocks from disk...</source>
<translation>Importando blocos do disco...</translation>
</message>
@@ -408,12 +428,12 @@ Este produto inclui software desenvolvido pelo Projeto OpenSSL para uso no OpenS
<translation>Reindexando blocos no disco...</translation>
</message>
<message>
- <location line="-322"/>
+ <location line="-405"/>
<source>Send coins to a Bitcoin address</source>
<translation>Enviar moedas para um endereço bitcoin</translation>
</message>
<message>
- <location line="+47"/>
+ <location line="+49"/>
<source>Modify configuration options for Bitcoin</source>
<translation>Modificar opções de configuração para bitcoin</translation>
</message>
@@ -443,20 +463,17 @@ Este produto inclui software desenvolvido pelo Projeto OpenSSL para uso no OpenS
<translation>&amp;Verificar mensagem...</translation>
</message>
<message>
- <location line="-180"/>
- <location line="+6"/>
- <location line="+513"/>
+ <location line="+430"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-519"/>
- <location line="+6"/>
+ <location line="-643"/>
<source>Wallet</source>
<translation>Carteira</translation>
</message>
<message>
- <location line="+109"/>
+ <location line="+146"/>
<source>&amp;Send</source>
<translation>&amp;Enviar</translation>
</message>
@@ -466,13 +483,7 @@ Este produto inclui software desenvolvido pelo Projeto OpenSSL para uso no OpenS
<translation>&amp;Receber</translation>
</message>
<message>
- <location line="+28"/>
- <location line="+2"/>
- <source>&amp;About Bitcoin</source>
- <translation>&amp;Sobre o Bitcoin</translation>
- </message>
- <message>
- <location line="+14"/>
+ <location line="+46"/>
<location line="+2"/>
<source>&amp;Show / Hide</source>
<translation>&amp;Exibir/Ocultar</translation>
@@ -498,64 +509,80 @@ Este produto inclui software desenvolvido pelo Projeto OpenSSL para uso no OpenS
<translation>Verificar mensagens para se assegurar que elas foram assinadas pelo dono de Endereços Bitcoin específicos</translation>
</message>
<message>
- <location line="+35"/>
+ <location line="+48"/>
<source>&amp;File</source>
<translation>&amp;Arquivo</translation>
</message>
<message>
- <location line="+10"/>
+ <location line="+14"/>
<source>&amp;Settings</source>
<translation>&amp;Configurações</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>&amp;Help</source>
<translation>&amp;Ajuda</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+15"/>
<source>Tabs toolbar</source>
<translation>Barra de ferramentas</translation>
</message>
<message>
- <location line="-235"/>
- <location line="+294"/>
+ <location line="-284"/>
+ <location line="+376"/>
<source>[testnet]</source>
<translation>[testnet]</translation>
</message>
<message>
- <location line="-177"/>
+ <location line="-401"/>
+ <source>Bitcoin Core</source>
+ <translation>Núcleo Bitcoin</translation>
+ </message>
+ <message>
+ <location line="+163"/>
<source>Request payments (generates QR codes and bitcoin: URIs)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+63"/>
- <source>&amp;Used sending addresses...</source>
+ <location line="+29"/>
+ <location line="+2"/>
+ <source>&amp;About Bitcoin Core</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="+35"/>
<source>Show the list of used sending addresses and labels</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Used &amp;receiving addresses...</source>
+ <location line="+2"/>
+ <source>Show the list of used receiving addresses and labels</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open a bitcoin: URI or payment request</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Command-line options</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
- <source>Show the list of used receiving addresses and labels</source>
+ <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+106"/>
+ <location line="+159"/>
<location line="+5"/>
<source>Bitcoin client</source>
<translation>Cliente Bitcoin</translation>
</message>
<message numerus="yes">
- <location line="+120"/>
+ <location line="+142"/>
<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>
@@ -575,7 +602,7 @@ Este produto inclui software desenvolvido pelo Projeto OpenSSL para uso no OpenS
<translation>Processado %1 blocos do histórico de transações.</translation>
</message>
<message numerus="yes">
- <location line="+20"/>
+ <location line="+23"/>
<source>%n hour(s)</source>
<translation><numerusform>%n hora</numerusform><numerusform>%n horas</numerusform></translation>
</message>
@@ -595,7 +622,7 @@ Este produto inclui software desenvolvido pelo Projeto OpenSSL para uso no OpenS
<translation>%1 atrás</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="+21"/>
<source>Last received block was generated %1 ago.</source>
<translation>Último bloco recebido foi gerado %1 atrás.</translation>
</message>
@@ -620,27 +647,17 @@ Este produto inclui software desenvolvido pelo Projeto OpenSSL para uso no OpenS
<translation>Informação</translation>
</message>
<message>
- <location line="+77"/>
- <source>This transaction is over the size limit. You can still send it for a fee of %1, which goes to the nodes that process your transaction and helps to support the network. Do you want to pay the fee?</source>
- <translation>A transação está acima do tamanho limite. Você ainda enviar ela com uma taxa de %1, que vai para os nós processam sua transação e ajuda a manter a rede. Você quer pagar a taxa?</translation>
- </message>
- <message>
- <location line="-152"/>
+ <location line="-85"/>
<source>Up to date</source>
<translation>Atualizado</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Catching up...</source>
<translation>Recuperando o atraso ...</translation>
</message>
<message>
- <location line="+124"/>
- <source>Confirm transaction fee</source>
- <translation>Confirmar taxa de transação</translation>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+130"/>
<source>Sent transaction</source>
<translation>Transação enviada</translation>
</message>
@@ -662,17 +679,7 @@ Tipo: %3
Endereço: %4</translation>
</message>
<message>
- <location line="+34"/>
- <source>URI handling</source>
- <translation>Manipulação de URI</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
- <translation>URI não pode ser decodificado! Isso pode ter sido causado por um endereço Bitcoin inválido ou por parâmetros URI malformados.</translation>
- </message>
- <message>
- <location line="+45"/>
+ <location line="+69"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation>Carteira está &lt;b&gt;criptografada&lt;/b&gt; e atualmente &lt;b&gt;desbloqueada&lt;/b&gt;</translation>
</message>
@@ -682,7 +689,7 @@ Endereço: %4</translation>
<translation>Carteira está &lt;b&gt;criptografada&lt;/b&gt; e atualmente &lt;b&gt;bloqueada&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+110"/>
+ <location filename="../bitcoin.cpp" line="+438"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation>Um erro fatal ocorreu. Bitcoin não pode continuar em segurança e irá fechar.</translation>
</message>
@@ -690,12 +697,304 @@ Endereço: %4</translation>
<context>
<name>ClientModel</name>
<message>
- <location filename="../clientmodel.cpp" line="+115"/>
+ <location filename="../clientmodel.cpp" line="+119"/>
<source>Network Alert</source>
<translation>Alerta da Rede</translation>
</message>
</context>
<context>
+ <name>CoinControlDialog</name>
+ <message>
+ <location filename="../forms/coincontroldialog.ui" line="+14"/>
+ <source>Coin Control Address Selection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>Quantity:</source>
+ <translation>Quantidade:</translation>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Bytes:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>Amount:</source>
+ <translation>Quantia:</translation>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Priority:</source>
+ <translation>Prioridade:</translation>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>Fee:</source>
+ <translation>Taxa:</translation>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Low Output:</source>
+ <translation>Rendimento baixo:</translation>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>After Fee:</source>
+ <translation>Depois da taxa:</translation>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Change:</source>
+ <translation>trocar</translation>
+ </message>
+ <message>
+ <location line="+63"/>
+ <source>(un)select all</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Tree mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>List mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>Amount</source>
+ <translation>Quantidade</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Address</source>
+ <translation>Endereço</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Date</source>
+ <translation>Data</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Confirmations</source>
+ <translation>Confirmações</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Confirmed</source>
+ <translation>Confirmado</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Priority</source>
+ <translation>Prioridade</translation>
+ </message>
+ <message>
+ <location filename="../coincontroldialog.cpp" line="+42"/>
+ <source>Copy address</source>
+ <translation>Copiar endereço</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy label</source>
+ <translation>Copiar etiqueta</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+26"/>
+ <source>Copy amount</source>
+ <translation>Copiar quantia</translation>
+ </message>
+ <message>
+ <location line="-25"/>
+ <source>Copy transaction ID</source>
+ <translation>Copiar ID da transação</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Lock unspent</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Unlock unspent</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+22"/>
+ <source>Copy quantity</source>
+ <translation>Copiar quantidade</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Copy fee</source>
+ <translation>Copiar taxa</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy after fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy bytes</source>
+ <translation>Copiar bytes</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy low output</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy change</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+323"/>
+ <source>highest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>higher</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>high</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>medium-high</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>medium</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>low-medium</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>low</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>lower</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>lowest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>(%1 locked)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>none</source>
+ <translation>nenhum</translation>
+ </message>
+ <message>
+ <location line="+140"/>
+ <source>Dust</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>yes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>no</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>This label turns red, if the transaction size is greater than 1000 bytes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+5"/>
+ <source>This means a fee of at least %1 per kB is required.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-4"/>
+ <source>Can vary +/- 1 byte per input.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Transactions with higher priority are more likely to get included into a block.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>This label turns red, if the priority is smaller than &quot;medium&quot;.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>This label turns red, if any recipient receives an amount smaller than %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+4"/>
+ <source>This means a fee of at least %1 is required.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-3"/>
+ <source>Amounts below 0.546 times the minimum relay fee are shown as dust.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>This label turns red, if the change is smaller than %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
+ <location line="+66"/>
+ <source>(no label)</source>
+ <translation>(Sem rótulo)</translation>
+ </message>
+ <message>
+ <location line="-9"/>
+ <source>change from %1 (%2)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>(change)</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>EditAddressDialog</name>
<message>
<location filename="../forms/editaddressdialog.ui" line="+14"/>
@@ -723,7 +1022,7 @@ Endereço: %4</translation>
<translation>&amp;Endereço</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+21"/>
+ <location filename="../editaddressdialog.cpp" line="+28"/>
<source>New receiving address</source>
<translation>Novo endereço de recebimento</translation>
</message>
@@ -766,7 +1065,7 @@ Endereço: %4</translation>
<context>
<name>FreespaceChecker</name>
<message>
- <location filename="../intro.cpp" line="+61"/>
+ <location filename="../intro.cpp" line="+65"/>
<source>A new data directory will be created.</source>
<translation>Um novo diretório de dados será criado.</translation>
</message>
@@ -792,15 +1091,19 @@ Endereço: %4</translation>
</message>
</context>
<context>
- <name>GUIUtil::HelpMessageBox</name>
+ <name>HelpMessageDialog</name>
<message>
- <location filename="../guiutil.cpp" line="+558"/>
- <location line="+13"/>
- <source>Bitcoin-Qt</source>
- <translation>Bitcoin-Qt</translation>
+ <location filename="../forms/helpmessagedialog.ui" line="+19"/>
+ <source>Bitcoin Core - Command-line options</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="-13"/>
+ <location filename="../utilitydialog.cpp" line="+38"/>
+ <source>Bitcoin Core</source>
+ <translation>Núcleo Bitcoin</translation>
+ </message>
+ <message>
+ <location line="+0"/>
<source>version</source>
<translation>versão</translation>
</message>
@@ -849,18 +1152,18 @@ Endereço: %4</translation>
</message>
<message>
<location line="+9"/>
- <source>Welcome to Bitcoin-Qt.</source>
- <translation>Bem-vindo ao Bitcoin-Qt.</translation>
+ <source>Welcome to Bitcoin Core.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+26"/>
- <source>As this is the first time the program is launched, you can choose where Bitcoin-Qt will store its data.</source>
- <translation>Como esta é a primeira vez que o programa é executado, você pode escolher onde Bitcoin-Qt vai armazenar seus dados.</translation>
+ <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+10"/>
- <source>Bitcoin-Qt will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
- <translation>O Bitcoin-Qt irá baixar e armazenar uma cópia do block chain do Bitcoin. Pelo menos %1GB de dados serão armazenados neste diretório, e ele crescerá ao longo do tempo. A carteira também será armazenada neste diretório.</translation>
+ <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+10"/>
@@ -873,7 +1176,17 @@ Endereço: %4</translation>
<translation>Use um diretório de dados personalizado:</translation>
</message>
<message>
- <location filename="../intro.cpp" line="+105"/>
+ <location filename="../intro.cpp" line="+85"/>
+ <source>Bitcoin</source>
+ <translation>Bitcoin</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error: Specified data directory &quot;%1&quot; can not be created.</source>
+ <translation>Erro: dados especificados diretório &quot;% 1&quot; não pode ser criado.</translation>
+ </message>
+ <message>
+ <location line="+19"/>
<source>Error</source>
<translation>Erro</translation>
</message>
@@ -889,6 +1202,34 @@ Endereço: %4</translation>
</message>
</context>
<context>
+ <name>OpenURIDialog</name>
+ <message>
+ <location filename="../forms/openuridialog.ui" line="+14"/>
+ <source>Open URI</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Open payment request from URI or file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>URI:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Select payment request file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../openuridialog.cpp" line="+47"/>
+ <source>Select payment request file to open</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OptionsDialog</name>
<message>
<location filename="../forms/optionsdialog.ui" line="+14"/>
@@ -896,7 +1237,7 @@ Endereço: %4</translation>
<translation>Opções</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+13"/>
<source>&amp;Main</source>
<translation>Principal</translation>
</message>
@@ -921,7 +1262,52 @@ Endereço: %4</translation>
<translation>Iniciar Bitcoin no login do sistema</translation>
</message>
<message>
- <location line="+35"/>
+ <location line="+9"/>
+ <source>Size of &amp;database cache</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set database cache size in megabytes (default: 25)</source>
+ <translation>Definir o tamanho do cache do banco de dados em megabytes (padrão: 25)</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>MB</source>
+ <translation>MB</translation>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Number of script &amp;verification threads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
+ <translation>Defina o número de linhas de verificação (até 16, 0 = auto, &lt;0 = deixar muitos núcleos livres, padrão: 0)</translation>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Connect to the Bitcoin network through a SOCKS proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Connect through SOCKS proxy (default proxy):</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+224"/>
+ <source>Active command-line options that override above options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
<source>Reset all client options to default.</source>
<translation>Redefinir todas as opções do cliente para opções padrão.</translation>
</message>
@@ -931,7 +1317,7 @@ Endereço: %4</translation>
<translation>&amp;Redefinir opções</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="-323"/>
<source>&amp;Network</source>
<translation>Rede</translation>
</message>
@@ -946,32 +1332,17 @@ Endereço: %4</translation>
<translation>Mapear porta usando &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>Conectar à rede Bitcoin através de um proxy SOCKS (ex. quando estiver usando através do Tor)</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>&amp;Connect through SOCKS proxy:</source>
- <translation>&amp;Conectar através de um proxy SOCKS:</translation>
- </message>
- <message>
- <location line="+9"/>
+ <location line="+19"/>
<source>Proxy &amp;IP:</source>
<translation>&amp;IP do proxy:</translation>
</message>
<message>
- <location line="+19"/>
- <source>IP address of the proxy (e.g. 127.0.0.1)</source>
- <translation>Endereço &amp;IP do proxy (ex. 127.0.0.1)</translation>
- </message>
- <message>
- <location line="+7"/>
+ <location line="+32"/>
<source>&amp;Port:</source>
<translation>&amp;Porta:</translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+25"/>
<source>Port of the proxy (e.g. 9050)</source>
<translation>Porta do serviço de proxy (ex. 9050)</translation>
</message>
@@ -1046,7 +1417,17 @@ Endereço: %4</translation>
<translation>Mostrar en&amp;dereços na lista de transações</translation>
</message>
<message>
- <location line="+71"/>
+ <location line="+7"/>
+ <source>Whether to show coin control features or not.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Display coin &amp;control features (experts only)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+136"/>
<source>&amp;OK</source>
<translation>&amp;OK</translation>
</message>
@@ -1056,44 +1437,38 @@ Endereço: %4</translation>
<translation>&amp;Cancelar</translation>
</message>
<message>
- <location line="+10"/>
- <source>&amp;Apply</source>
- <translation>&amp;Aplicar</translation>
- </message>
- <message>
- <location filename="../optionsdialog.cpp" line="+58"/>
+ <location filename="../optionsdialog.cpp" line="+67"/>
<source>default</source>
<translation>padrão</translation>
</message>
<message>
- <location line="+130"/>
+ <location line="+57"/>
+ <source>none</source>
+ <translation>nenhum</translation>
+ </message>
+ <message>
+ <location line="+75"/>
<source>Confirm options reset</source>
<translation>Confirmar redefinição de opções</translation>
</message>
<message>
<location line="+1"/>
- <source>Some settings may require a client restart to take effect.</source>
- <translation>Algumas configurações requerem reinicialização para surtirem efeito.</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Do you want to proceed?</source>
- <translation>Você quer continuar?</translation>
+ <location line="+29"/>
+ <source>Client restart required to activate changes.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
- <location line="+9"/>
- <source>Warning</source>
- <translation>Cuidado</translation>
+ <location line="-29"/>
+ <source>Client will be shutdown, do you want to proceed?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="-9"/>
- <location line="+9"/>
- <source>This setting will take effect after restarting Bitcoin.</source>
- <translation>Esta configuração surtirá efeito após reinicializar o aplicativo Bitcoin</translation>
+ <location line="+33"/>
+ <source>This change would require a client restart.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+29"/>
+ <location line="+34"/>
<source>The supplied proxy address is invalid.</source>
<translation>O endereço proxy fornecido é inválido.</translation>
</message>
@@ -1107,22 +1482,22 @@ Endereço: %4</translation>
</message>
<message>
<location line="+50"/>
- <location line="+202"/>
+ <location line="+231"/>
<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 pode estar desatualizada. Sua carteira sincroniza automaticamente com a rede Bitcoin depois que a conexão é estabelecida, mas este processo pode não estar completo ainda.</translation>
</message>
<message>
- <location line="-131"/>
+ <location line="-155"/>
<source>Unconfirmed:</source>
<translation>Não confirmadas:</translation>
</message>
<message>
- <location line="-78"/>
+ <location line="-83"/>
<source>Wallet</source>
<translation>Carteira</translation>
</message>
<message>
- <location line="+49"/>
+ <location line="+51"/>
<source>Confirmed:</source>
<translation>Confirmado:</translation>
</message>
@@ -1132,12 +1507,12 @@ Endereço: %4</translation>
<translation>Seu saldo atual spendable</translation>
</message>
<message>
- <location line="+29"/>
+ <location line="+32"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation>Total de transações que ainda têm de ser confirmados, e ainda não contam para o equilíbrio spendable</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+16"/>
<source>Immature:</source>
<translation>Imaturo:</translation>
</message>
@@ -1147,7 +1522,7 @@ Endereço: %4</translation>
<translation>Saldo minerado que ainda não maturou</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+16"/>
<source>Total:</source>
<translation>Total:</translation>
</message>
@@ -1157,12 +1532,12 @@ Endereço: %4</translation>
<translation>Seu saldo total atual</translation>
</message>
<message>
- <location line="+53"/>
+ <location line="+71"/>
<source>&lt;b&gt;Recent transactions&lt;/b&gt;</source>
<translation>&lt;b&gt;Transações recentes&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../overviewpage.cpp" line="+116"/>
+ <location filename="../overviewpage.cpp" line="+120"/>
<location line="+1"/>
<source>out of sync</source>
<translation>fora de sincronia</translation>
@@ -1171,7 +1546,8 @@ Endereço: %4</translation>
<context>
<name>PaymentServer</name>
<message>
- <location filename="../paymentserver.cpp" line="+392"/>
+ <location filename="../paymentserver.cpp" line="+403"/>
+ <location line="+13"/>
<source>URI handling</source>
<translation>Manipulação de URI</translation>
</message>
@@ -1181,45 +1557,82 @@ Endereço: %4</translation>
<translation>URI não pode ser decodificado! Isso pode ter sido causado por um endereço Bitcoin inválido ou por parâmetros URI malformados.</translation>
</message>
<message>
- <location line="+69"/>
+ <location line="+96"/>
<source>Requested payment amount of %1 is too small (considered dust).</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
- <location line="+37"/>
+ <location line="-221"/>
+ <location line="+212"/>
+ <location line="+13"/>
+ <location line="+95"/>
+ <location line="+18"/>
+ <location line="+16"/>
<source>Payment request error</source>
<translation>Erro no pedido de pagamento</translation>
</message>
<message>
+ <location line="-353"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
+ <translation>Não foi possível iniciar bitcoin: manipulador clique-para-pagar</translation>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Net manager warning</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+1"/>
- <source>Insecure requests to custom payment scripts unsupported</source>
- <translation>Pedidos inseguros para os scripts de pagamento personalizados não suportados</translation>
+ <source>Your active proxy doesn&apos;t support SOCKS5, which is required for payment requests via proxy.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+38"/>
+ <location line="+52"/>
+ <source>Payment request fetch URL is invalid: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Payment request file handling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Payment request file can not be read or processed! This can be caused by an invalid payment request file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+73"/>
+ <source>Unverified payment requests to custom payment scripts are unsupported.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+59"/>
<source>Refund from %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
+ <location line="+43"/>
<source>Error communicating with %1: %2</source>
<translation>Erro na comunicação com% 1:% 2</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+24"/>
+ <source>Payment request can not be parsed or processed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
<source>Bad response from server %1</source>
<translation>Resposta ruim do servidor% 1</translation>
</message>
<message>
- <location line="+32"/>
+ <location line="+33"/>
<source>Payment acknowledged</source>
<translation>Pagamento reconhecido</translation>
</message>
<message>
- <location line="-58"/>
- <location line="+30"/>
- <location line="+17"/>
+ <location line="-11"/>
<source>Network request error</source>
<translation>Erro de solicitação de rede</translation>
</message>
@@ -1227,39 +1640,33 @@ Endereço: %4</translation>
<context>
<name>QObject</name>
<message>
- <location filename="../bitcoin.cpp" line="+114"/>
- <location line="+5"/>
- <location filename="../intro.cpp" line="-32"/>
+ <location filename="../bitcoin.cpp" line="+71"/>
+ <location line="+11"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-4"/>
+ <location line="+1"/>
<source>Error: Specified data directory &quot;%1&quot; does not exist.</source>
<translation>Erro: diretório de dados especificado &quot;% 1&quot; não existe.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="-12"/>
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation>Erro: Combinação inválida de-regtest e testnet.</translation>
</message>
- <message>
- <location filename="../intro.cpp" line="+1"/>
- <source>Error: Specified data directory &quot;%1&quot; can not be created.</source>
- <translation>Erro: dados especificados diretório &quot;% 1&quot; não pode ser criado.</translation>
- </message>
</context>
<context>
<name>QRImageWidget</name>
<message>
- <location filename="../receiverequestdialog.cpp" line="+32"/>
+ <location filename="../receiverequestdialog.cpp" line="+36"/>
<source>&amp;Save Image...</source>
- <translation type="unfinished"/>
+ <translation>&amp;Salvar imagem</translation>
</message>
<message>
<location line="+3"/>
<source>&amp;Copy Image</source>
- <translation type="unfinished"/>
+ <translation>&amp;Copiar Imagem</translation>
</message>
<message>
<location line="+28"/>
@@ -1268,8 +1675,8 @@ Endereço: %4</translation>
</message>
<message>
<location line="+0"/>
- <source>PNG Images (*.png)</source>
- <translation>Imagens PNG (*.png)</translation>
+ <source>PNG Image (*.png)</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1286,15 +1693,16 @@ Endereço: %4</translation>
<location line="+23"/>
<location line="+23"/>
<location line="+36"/>
- <location line="+53"/>
<location line="+23"/>
+ <location line="+36"/>
<location line="+23"/>
- <location filename="../rpcconsole.cpp" line="+352"/>
+ <location line="+23"/>
+ <location filename="../rpcconsole.cpp" line="+359"/>
<source>N/A</source>
<translation>N/A</translation>
</message>
<message>
- <location line="-217"/>
+ <location line="-223"/>
<source>Client version</source>
<translation>Versão do cliente</translation>
</message>
@@ -1304,7 +1712,17 @@ Endereço: %4</translation>
<translation>&amp;Informação</translation>
</message>
<message>
- <location line="+68"/>
+ <location line="-10"/>
+ <source>Debug window</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+25"/>
+ <source>General</source>
+ <translation>Geral</translation>
+ </message>
+ <message>
+ <location line="+53"/>
<source>Using OpenSSL version</source>
<translation>Usando OpenSSL versão</translation>
</message>
@@ -1320,16 +1738,16 @@ Endereço: %4</translation>
</message>
<message>
<location line="+7"/>
- <source>Number of connections</source>
- <translation>Número de conexões</translation>
+ <source>Name</source>
+ <translation>Nome</translation>
</message>
<message>
<location line="+23"/>
- <source>On testnet</source>
- <translation>Na rede de teste</translation>
+ <source>Number of connections</source>
+ <translation>Número de conexões</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+29"/>
<source>Block chain</source>
<translation>Corrente de blocos</translation>
</message>
@@ -1354,21 +1772,6 @@ Endereço: %4</translation>
<translation>&amp;Abrir</translation>
</message>
<message>
- <location line="+16"/>
- <source>Command-line options</source>
- <translation>Opções da linha de comando</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>Mostrar mensagem de ajuda do Bitcoin-Qt para obter uma lista com possíveis opções da linha de comando do Bitcoin.</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>&amp;Show</source>
- <translation>&amp;Mostrar</translation>
- </message>
- <message>
<location line="+24"/>
<source>&amp;Console</source>
<translation>&amp;Console</translation>
@@ -1376,45 +1779,35 @@ Endereço: %4</translation>
<message>
<location line="+72"/>
<source>&amp;Network Traffic</source>
- <translation type="unfinished"/>
+ <translation>Tráfico de Rede</translation>
</message>
<message>
<location line="+52"/>
<source>&amp;Clear</source>
- <translation type="unfinished"/>
+ <translation>&amp;Limpar</translation>
</message>
<message>
<location line="+13"/>
<source>Totals</source>
- <translation type="unfinished"/>
+ <translation>Totais</translation>
</message>
<message>
<location line="+64"/>
<source>In:</source>
- <translation type="unfinished"/>
+ <translation>Entrada:</translation>
</message>
<message>
<location line="+80"/>
<source>Out:</source>
- <translation type="unfinished"/>
+ <translation>Saída:</translation>
</message>
<message>
- <location line="-541"/>
+ <location line="-521"/>
<source>Build date</source>
<translation>Data do &apos;build&apos;</translation>
</message>
<message>
- <location line="-104"/>
- <source>Bitcoin - Debug window</source>
- <translation>Bitcoin - Janela de Depuração</translation>
- </message>
- <message>
- <location line="+25"/>
- <source>Bitcoin Core</source>
- <translation>Núcleo Bitcoin</translation>
- </message>
- <message>
- <location line="+279"/>
+ <location line="+206"/>
<source>Debug log file</source>
<translation>Arquivo de log de Depuração</translation>
</message>
@@ -1424,7 +1817,7 @@ Endereço: %4</translation>
<translation>Abrir o arquivo de log de depuração do Bitcoin do diretório atual de dados. Isso pode levar alguns segundos para arquivos de log grandes.</translation>
</message>
<message>
- <location line="+102"/>
+ <location line="+76"/>
<source>Clear console</source>
<translation>Limpar console</translation>
</message>
@@ -1444,7 +1837,7 @@ Endereço: %4</translation>
<translation>Digite &lt;b&gt;help&lt;/b&gt; para uma visão geral dos comandos disponíveis.</translation>
</message>
<message>
- <location line="+128"/>
+ <location line="+122"/>
<source>%1 B</source>
<translation type="unfinished"/>
</message>
@@ -1482,48 +1875,48 @@ Endereço: %4</translation>
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+22"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
<source>&amp;Amount:</source>
- <translation type="unfinished"/>
+ <translation>Qu&amp;antia:</translation>
</message>
<message>
- <location line="+16"/>
- <source>The amount to request</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+7"/>
+ <location line="-13"/>
<source>&amp;Label:</source>
<translation>&amp;Etiqueta:</translation>
</message>
<message>
- <location line="+10"/>
- <source>The label to associate with the receiving address</source>
- <translation type="unfinished"/>
+ <location line="-34"/>
+ <source>&amp;Message:</source>
+ <translation>&amp;Mensagem</translation>
</message>
<message>
- <location line="+7"/>
- <source>&amp;Message:</source>
+ <location line="-17"/>
+ <source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>The message to attach to payment request</source>
+ <location line="+3"/>
+ <source>R&amp;euse an existing receiving address (not recommended)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
- <source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
+ <location line="+27"/>
+ <source>An optional label to associate with the new receiving address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>R&amp;euse an existing receiving address (not recommended)</source>
+ <location line="+7"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+7"/>
- <source>Use this form to request payments. All fields are optional.</source>
+ <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+39"/>
+ <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1534,11 +1927,36 @@ Endereço: %4</translation>
<message>
<location line="+3"/>
<source>Clear</source>
- <translation type="unfinished"/>
+ <translation>Limpar</translation>
</message>
<message>
<location line="+36"/>
<source>&amp;Request payment</source>
+ <translation>&amp;Requisitar Pagamento</translation>
+ </message>
+ <message>
+ <location line="+47"/>
+ <source>Requested payments</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Show the selected request (does the same as double clicking an entry)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Show</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Remove the selected entries from the list</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Remove</source>
<translation type="unfinished"/>
</message>
</context>
@@ -1552,37 +1970,32 @@ Endereço: %4</translation>
<message>
<location line="+46"/>
<source>Copy &amp;URI</source>
- <translation type="unfinished"/>
+ <translation>Copiar &amp;URI</translation>
</message>
<message>
<location line="+7"/>
<source>Copy &amp;Address</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+7"/>
- <source>&amp;Copy Image</source>
- <translation type="unfinished"/>
+ <translation>&amp;Copiar Endereço</translation>
</message>
<message>
<location line="+7"/>
<source>&amp;Save Image...</source>
- <translation type="unfinished"/>
+ <translation>&amp;Salvar Imagem...</translation>
</message>
<message>
- <location filename="../receiverequestdialog.cpp" line="+58"/>
+ <location filename="../receiverequestdialog.cpp" line="+56"/>
<source>Request payment to %1</source>
- <translation type="unfinished"/>
+ <translation>Requisitar pagamento para %1</translation>
</message>
<message>
<location line="+6"/>
<source>Payment information</source>
- <translation type="unfinished"/>
+ <translation>Informação de pagamento</translation>
</message>
<message>
<location line="+1"/>
<source>URI</source>
- <translation type="unfinished"/>
+ <translation>URI</translation>
</message>
<message>
<location line="+2"/>
@@ -1616,16 +2029,119 @@ Endereço: %4</translation>
</message>
</context>
<context>
+ <name>RecentRequestsTableModel</name>
+ <message>
+ <location filename="../recentrequeststablemodel.cpp" line="+24"/>
+ <source>Date</source>
+ <translation>Data</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Label</source>
+ <translation>Etiqueta</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Message</source>
+ <translation>Mensagem</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Amount</source>
+ <translation>Quantidade</translation>
+ </message>
+ <message>
+ <location line="+38"/>
+ <source>(no label)</source>
+ <translation>(Sem rótulo)</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>(no message)</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+140"/>
- <location line="+213"/>
+ <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location line="+80"/>
<source>Send Coins</source>
<translation>Enviar dinheiro</translation>
</message>
<message>
- <location line="+50"/>
+ <location line="+76"/>
+ <source>Coin Control Features</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Inputs...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>automatically selected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Insufficient funds!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+89"/>
+ <source>Quantity:</source>
+ <translation>Quantidade:</translation>
+ </message>
+ <message>
+ <location line="+35"/>
+ <source>Bytes:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Amount:</source>
+ <translation>Quantia:</translation>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Priority:</source>
+ <translation>Prioridade:</translation>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Fee:</source>
+ <translation>Taxa:</translation>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Low Output:</source>
+ <translation>Rendimento baixo:</translation>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>After Fee:</source>
+ <translation>Depois da taxa:</translation>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Change:</source>
+ <translation>trocar</translation>
+ </message>
+ <message>
+ <location line="+44"/>
+ <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Custom change address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+115"/>
<source>Send to multiple recipients at once</source>
<translation>Enviar para vários destinatários de uma só vez</translation>
</message>
@@ -1650,12 +2166,7 @@ Endereço: %4</translation>
<translation>Saldo:</translation>
</message>
<message>
- <location line="+10"/>
- <source>123.456 BTC</source>
- <translation>123.456 BTC</translation>
- </message>
- <message>
- <location line="+31"/>
+ <location line="+41"/>
<source>Confirm the send action</source>
<translation>Confirmar o envio</translation>
</message>
@@ -1665,49 +2176,125 @@ Endereço: %4</translation>
<translation>Enviar</translation>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-154"/>
+ <location filename="../sendcoinsdialog.cpp" line="-228"/>
<source>Confirm send coins</source>
<translation>Confirmar envio de dinheiro</translation>
</message>
<message>
- <location line="-90"/>
+ <location line="-74"/>
<location line="+5"/>
<location line="+5"/>
+ <location line="+4"/>
<source>%1 to %2</source>
+ <translation>%1 para %2</translation>
+ </message>
+ <message>
+ <location line="-136"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation>Digite um endereço Bitcoin (exemplo: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Copy quantity</source>
+ <translation>Copiar quantidade</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation>Copiar quantia</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy fee</source>
+ <translation>Copiar taxa</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy after fee</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+26"/>
+ <location line="+1"/>
+ <source>Copy bytes</source>
+ <translation>Copiar bytes</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy low output</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy change</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+170"/>
+ <source>Total Amount %1 (= %2)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>or</source>
+ <translation>ou</translation>
+ </message>
+ <message>
+ <location line="+202"/>
<source>The recipient address is not valid, please recheck.</source>
<translation>O endereço do destinatário não é válido, favor verificar.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The amount to pay must be larger than 0.</source>
<translation>A quantidade a ser paga precisa ser maior que 0.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The amount exceeds your balance.</source>
<translation>A quantidade excede seu saldo.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The total exceeds your balance when the %1 transaction fee is included.</source>
<translation>O total excede seu saldo quando uma taxa de transação de %1 é incluída.</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+3"/>
<source>Duplicate address found, can only send to each address once per send operation.</source>
<translation>Endereço duplicado: pode-se enviar para cada endereço apenas uma vez por transação.</translation>
</message>
<message>
+ <location line="+3"/>
+ <source>Transaction creation failed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+4"/>
- <source>Error: Transaction creation failed!</source>
- <translation>Erro: Criação da transação falhou!</translation>
+ <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+15"/>
+ <location line="+112"/>
+ <source>Warning: Invalid Bitcoin address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+21"/>
+ <source>(no label)</source>
+ <translation>(Sem rótulo)</translation>
+ </message>
+ <message>
+ <location line="-11"/>
+ <source>Warning: Unknown change address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-366"/>
<source>Are you sure you want to send?</source>
<translation>Tem certeza que quer enviar?</translation>
</message>
@@ -1717,17 +2304,7 @@ Endereço: %4</translation>
<translation>Adicionado como taxa de transação</translation>
</message>
<message>
- <location line="+6"/>
- <source>Total Amount %1</source>
- <translation>Valor Total %1</translation>
- </message>
- <message>
- <location line="+20"/>
- <source>Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
- <translation>Erro: A transação foi rejeitada. Isso pode acontecer se alguns dos bitcoins de sua carteira já haviam sido gastos, por exemplo se você usou uma cópia do arquivo wallet.dat e alguns bitcoins foram gastos na cópia mas não foram marcados como gastos aqui.</translation>
- </message>
- <message>
- <location line="+144"/>
+ <location line="+170"/>
<source>Payment request expired</source>
<translation>Pedido de pagamento expirado</translation>
</message>
@@ -1740,39 +2317,44 @@ Endereço: %4</translation>
<context>
<name>SendCoinsEntry</name>
<message>
- <location filename="../forms/sendcoinsentry.ui" line="+33"/>
- <location line="+585"/>
+ <location filename="../forms/sendcoinsentry.ui" line="+131"/>
+ <location line="+521"/>
+ <location line="+536"/>
<source>A&amp;mount:</source>
<translation>Q&amp;uantidade:</translation>
</message>
<message>
- <location line="-572"/>
- <location line="+585"/>
+ <location line="-1152"/>
<source>Pay &amp;To:</source>
<translation>Pagar &amp;Para:</translation>
</message>
<message>
- <location line="-551"/>
+ <location line="+18"/>
<source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>O endereço para onde enviar o pagamento (ex. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location filename="../sendcoinsentry.cpp" line="+28"/>
+ <location filename="../sendcoinsentry.cpp" line="+30"/>
<source>Enter a label for this address to add it to your address book</source>
<translation>Digite uma etiqueta para este endereço para adicioná-lo ao catálogo de endereços</translation>
</message>
<message>
- <location filename="../forms/sendcoinsentry.ui" line="-18"/>
+ <location filename="../forms/sendcoinsentry.ui" line="+57"/>
<source>&amp;Label:</source>
<translation>&amp;Etiqueta:</translation>
</message>
<message>
- <location line="+28"/>
+ <location line="-50"/>
<source>Choose previously used address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
+ <location line="-40"/>
+ <source>This is a normal payment.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+50"/>
<source>Alt+A</source>
<translation>Alt+A</translation>
</message>
@@ -1788,16 +2370,45 @@ Endereço: %4</translation>
</message>
<message>
<location line="+7"/>
- <source>Remove this recipient</source>
- <translation>Remover este destinatário</translation>
+ <location line="+524"/>
+ <location line="+536"/>
+ <source>Remove this entry</source>
+ <translation>Remover esta entrada</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="-1008"/>
+ <source>Message:</source>
+ <translation>Mensagem:</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+958"/>
+ <source>This is a verified payment request.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-991"/>
<source>Enter a label for this address to add it to the list of used addresses</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+465"/>
+ <location line="+459"/>
+ <source>This is an unverified payment request.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+18"/>
+ <location line="+532"/>
+ <source>Pay To:</source>
+ <translation>Pague Para:</translation>
+ </message>
+ <message>
+ <location line="-498"/>
+ <location line="+536"/>
<source>Memo:</source>
<translation>Memorizar:</translation>
</message>
@@ -1808,6 +2419,19 @@ Endereço: %4</translation>
</message>
</context>
<context>
+ <name>ShutdownWindow</name>
+ <message>
+ <location filename="../utilitydialog.cpp" line="+48"/>
+ <source>Bitcoin Core is shutting down...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Do not shut down the computer until this window disappears.</source>
+ <translation>Não desligue o computador até esta janela desaparece.</translation>
+ </message>
+</context>
+<context>
<name>SignVerifyMessageDialog</name>
<message>
<location filename="../forms/signverifymessagedialog.ui" line="+14"/>
@@ -1815,7 +2439,7 @@ Endereço: %4</translation>
<translation>Assinaturas - Assinar / Verificar uma mensagem</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+10"/>
<source>&amp;Sign Message</source>
<translation>&amp;Assinar Mensagem</translation>
</message>
@@ -1918,7 +2542,7 @@ Endereço: %4</translation>
<translation>Limpar todos os campos de assinatura da mensagem</translation>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+27"/>
+ <location filename="../signverifymessagedialog.cpp" line="+29"/>
<location line="+3"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>Digite um endereço Bitcoin (exemplo: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
@@ -1934,7 +2558,7 @@ Endereço: %4</translation>
<translation>Entre com a assinatura Bitcoin</translation>
</message>
<message>
- <location line="+85"/>
+ <location line="+84"/>
<location line="+81"/>
<source>The entered address is invalid.</source>
<translation>O endereço fornecido é inválido.</translation>
@@ -2003,9 +2627,14 @@ Endereço: %4</translation>
<context>
<name>SplashScreen</name>
<message>
- <location filename="../splashscreen.cpp" line="+23"/>
- <source>The Bitcoin developers</source>
- <translation>Desenvolvedores do Bitcoin</translation>
+ <location filename="../splashscreen.cpp" line="+28"/>
+ <source>Bitcoin Core</source>
+ <translation>Núcleo Bitcoin</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>The Bitcoin Core developers</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
@@ -2016,7 +2645,7 @@ Endereço: %4</translation>
<context>
<name>TrafficGraphWidget</name>
<message>
- <location filename="../trafficgraphwidget.cpp" line="+75"/>
+ <location filename="../trafficgraphwidget.cpp" line="+79"/>
<source>KB/s</source>
<translation type="unfinished"/>
</message>
@@ -2024,7 +2653,7 @@ Endereço: %4</translation>
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="+22"/>
+ <location filename="../transactiondesc.cpp" line="+28"/>
<source>Open until %1</source>
<translation>Aberto até %1</translation>
</message>
@@ -2097,12 +2726,12 @@ Endereço: %4</translation>
<location line="+12"/>
<location line="+45"/>
<location line="+17"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Credit</source>
<translation>Crédito</translation>
</message>
<message numerus="yes">
- <location line="-120"/>
+ <location line="-125"/>
<source>matures in %n more block(s)</source>
<translation><numerusform>matura em mais %n bloco</numerusform><numerusform>matura em mais %n blocos</numerusform></translation>
</message>
@@ -2115,12 +2744,12 @@ Endereço: %4</translation>
<location line="+44"/>
<location line="+8"/>
<location line="+15"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Debit</source>
<translation>Débito</translation>
</message>
<message>
- <location line="-57"/>
+ <location line="-62"/>
<source>Transaction fee</source>
<translation>Taxa de transação</translation>
</message>
@@ -2131,11 +2760,12 @@ Endereço: %4</translation>
</message>
<message>
<location line="+6"/>
+ <location line="+9"/>
<source>Message</source>
<translation>Mensagem</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="-7"/>
<source>Comment</source>
<translation>Comentário</translation>
</message>
@@ -2145,7 +2775,7 @@ Endereço: %4</translation>
<translation>ID da transação</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+18"/>
<source>Merchant</source>
<translation>Mercador</translation>
</message>
@@ -2185,7 +2815,7 @@ Endereço: %4</translation>
<translation>falso</translation>
</message>
<message>
- <location line="-227"/>
+ <location line="-232"/>
<source>, has not been successfully broadcast yet</source>
<translation>, ainda não foi propagada na rede com sucesso.</translation>
</message>
@@ -2216,7 +2846,7 @@ Endereço: %4</translation>
<context>
<name>TransactionTableModel</name>
<message>
- <location filename="../transactiontablemodel.cpp" line="+227"/>
+ <location filename="../transactiontablemodel.cpp" line="+234"/>
<source>Date</source>
<translation>Data</translation>
</message>
@@ -2235,8 +2865,13 @@ Endereço: %4</translation>
<source>Amount</source>
<translation>Quantidade</translation>
</message>
+ <message>
+ <location line="+59"/>
+ <source>Immature (%1 confirmations, will be available after %2)</source>
+ <translation type="unfinished"/>
+ </message>
<message numerus="yes">
- <location line="+57"/>
+ <location line="+16"/>
<source>Open for %n more block(s)</source>
<translation><numerusform>Abrir para mais %n bloco</numerusform><numerusform>Abrir para mais %n blocos</numerusform></translation>
</message>
@@ -2256,17 +2891,13 @@ Endereço: %4</translation>
<translation>Não confirmado (%1 of %2 confirmações)</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="-22"/>
+ <location line="+25"/>
<source>Confirmed (%1 confirmations)</source>
<translation>Confirmado (%1 confirmações)</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>Saldo minerado vai estar disponível quando ele maturar em mais %n bloco</numerusform><numerusform>Saldo minerado vai estar disponível quando ele maturar em mais %n blocos</numerusform></translation>
- </message>
<message>
- <location line="+5"/>
+ <location line="-22"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation>Este bloco não foi recebido por nenhum outro participante da rede e provavelmente não será aceito!</translation>
</message>
@@ -2276,7 +2907,7 @@ Endereço: %4</translation>
<translation>Gerado mas não aceito</translation>
</message>
<message>
- <location line="+43"/>
+ <location line="+62"/>
<source>Received with</source>
<translation>Recebido por</translation>
</message>
@@ -2334,7 +2965,7 @@ Endereço: %4</translation>
<context>
<name>TransactionView</name>
<message>
- <location filename="../transactionview.cpp" line="+52"/>
+ <location filename="../transactionview.cpp" line="+57"/>
<location line="+16"/>
<source>All</source>
<translation>Todos</translation>
@@ -2395,12 +3026,12 @@ Endereço: %4</translation>
<translation>Outro</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+6"/>
<source>Enter address or label to search</source>
<translation>Procure um endereço ou etiqueta</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+6"/>
<source>Min amount</source>
<translation>Quantidade mínima</translation>
</message>
@@ -2435,17 +3066,37 @@ Endereço: %4</translation>
<translation>Mostrar detalhes da transação</translation>
</message>
<message>
- <location line="+143"/>
- <source>Export Transaction Data</source>
- <translation>Exportar Dados das Transações</translation>
+ <location line="+142"/>
+ <source>Export Transaction History</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="+19"/>
+ <source>Exporting Failed</source>
+ <translation>Exportação Falhou</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>There was an error trying to save the transaction history to %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Exporting Successful</source>
+ <translation>Exportação feita com sucesso</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The transaction history was successfully saved to %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-22"/>
<source>Comma separated file (*.csv)</source>
<translation>Arquivo separado por vírgulas (*. csv)</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+9"/>
<source>Confirmed</source>
<translation>Confirmado</translation>
</message>
@@ -2480,17 +3131,7 @@ Endereço: %4</translation>
<translation>ID</translation>
</message>
<message>
- <location line="+4"/>
- <source>Error exporting</source>
- <translation>Erro ao exportar</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation>Não foi possível gravar no arquivo %1.</translation>
- </message>
- <message>
- <location line="+100"/>
+ <location line="+107"/>
<source>Range:</source>
<translation>Intervalo: </translation>
</message>
@@ -2501,9 +3142,17 @@ Endereço: %4</translation>
</message>
</context>
<context>
+ <name>WalletFrame</name>
+ <message>
+ <location filename="../walletframe.cpp" line="+26"/>
+ <source>No wallet has been loaded.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>WalletModel</name>
<message>
- <location filename="../walletmodel.cpp" line="+218"/>
+ <location filename="../walletmodel.cpp" line="+245"/>
<source>Send Coins</source>
<translation>Send Coins</translation>
</message>
@@ -2511,7 +3160,7 @@ Endereço: %4</translation>
<context>
<name>WalletView</name>
<message>
- <location filename="../walletview.cpp" line="+46"/>
+ <location filename="../walletview.cpp" line="+43"/>
<source>&amp;Export</source>
<translation>&amp;Exportar</translation>
</message>
@@ -2521,65 +3170,60 @@ Endereço: %4</translation>
<translation>Exportar os dados na aba atual para um arquivo</translation>
</message>
<message>
- <location line="+183"/>
+ <location line="+181"/>
<source>Backup Wallet</source>
<translation>Fazer cópia de segurança da Carteira</translation>
</message>
<message>
- <location line="+0"/>
+ <location line="+1"/>
<source>Wallet Data (*.dat)</source>
<translation>Dados da Carteira (*.dat)</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="+6"/>
<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>
+ <source>There was an error trying to save the wallet data to %1.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+4"/>
- <source>Backup Successful</source>
- <translation>Backup feito com sucesso</translation>
+ <source>The wallet data was successfully saved to %1.</source>
+ <translation type="unfinished"/>
</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 na nova localização</translation>
+ <source>Backup Successful</source>
+ <translation>Backup feito com sucesso</translation>
</message>
</context>
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+102"/>
- <source>Bitcoin version</source>
- <translation>Versão do Bitcoin</translation>
- </message>
- <message>
- <location line="+107"/>
+ <location filename="../bitcoinstrings.cpp" line="+221"/>
<source>Usage:</source>
<translation>Uso:</translation>
</message>
<message>
- <location line="-55"/>
+ <location line="-54"/>
<source>List commands</source>
<translation>Lista de comandos</translation>
</message>
<message>
- <location line="-13"/>
+ <location line="-14"/>
<source>Get help for a command</source>
<translation>Obtenha ajuda sobre um comando</translation>
</message>
<message>
- <location line="+25"/>
+ <location line="+26"/>
<source>Options:</source>
<translation>Opções:</translation>
</message>
<message>
- <location line="+24"/>
+ <location line="+22"/>
<source>Specify configuration file (default: bitcoin.conf)</source>
<translation>Especifique um arquivo de configurações (padrão: bitcoin.conf)</translation>
</message>
@@ -2599,7 +3243,7 @@ Endereço: %4</translation>
<translation>Definir o tamanho do cache do banco de dados em megabytes (padrão: 25)</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-26"/>
<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>
@@ -2609,7 +3253,7 @@ Endereço: %4</translation>
<translation>Manter no máximo &lt;n&gt; conexões aos peers (padrão: 125)</translation>
</message>
<message>
- <location line="-49"/>
+ <location line="-51"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation>Conectar a um nó para receber endereços de participantes, e desconectar.</translation>
</message>
@@ -2619,37 +3263,37 @@ Endereço: %4</translation>
<translation>Especificar seu próprio endereço público</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation>Limite para desconectar peers mal comportados (padrão: 100)</translation>
</message>
<message>
- <location line="-142"/>
+ <location line="-148"/>
<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="-33"/>
+ <location line="-36"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
<translation>Um erro ocorreu ao configurar a porta RPC %u para escuta em IPv4: %s</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation>Escutar conexões JSON-RPC na porta &lt;porta&gt; (padrão: 8332 ou testnet: 18332)</translation>
</message>
<message>
- <location line="+40"/>
+ <location line="+45"/>
<source>Accept command line and JSON-RPC commands</source>
<translation>Aceitar linha de comando e comandos JSON-RPC</translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>Rodar em segundo plano como serviço e aceitar comandos</translation>
</message>
<message>
- <location line="+40"/>
+ <location line="+39"/>
<source>Use the test network</source>
<translation>Usar rede de teste</translation>
</message>
@@ -2659,7 +3303,7 @@ Endereço: %4</translation>
<translation>Aceitar conexões externas (padrão: 1 se opções -proxy ou -connect não estiverem presentes)</translation>
</message>
<message>
- <location line="-87"/>
+ <location line="-95"/>
<source>%s, you must set a rpcpassword in the configuration file:
%s
It is recommended you use the following random password:
@@ -2710,6 +3354,11 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+4"/>
+ <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</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>Erro: A transação foi rejeitada. Isso pode acontecer se alguns dos bitcoins de sua carteira já haviam sido gastos, por exemplo se você usou uma cópia do arquivo wallet.dat e alguns bitcoins foram gastos na cópia mas não foram marcados como gastos aqui.</translation>
</message>
@@ -2724,17 +3373,17 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Executar comando quando uma transação da carteira mudar (%s no comando será substituído por TxID)</translation>
</message>
<message>
- <location line="+11"/>
- <source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source>
- <translation>Determinar tamanho máximo de transações de alta-prioridade/baixa-taxa em bytes (padrão: 27000)</translation>
- </message>
- <message>
- <location line="+6"/>
+ <location line="+18"/>
<source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
<translation>Este pode ser um build de teste pré-lançamento - use por sua conta e risco - não use para mineração ou aplicações de comércio.</translation>
</message>
<message>
<location line="+5"/>
+ <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
<source>Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source>
<translation>Cuidado: valor de -paytxfee escolhido é muito alto! Este é o valor da taxa de transação que você irá pagar se enviar a transação.</translation>
</message>
@@ -2764,17 +3413,27 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Aviso: wallet.dat corrompido, dados recuperados! Arquivo wallet.dat original salvo como wallet.{timestamp}.bak em %s; se seu saldo ou transações estiverem incorretos, você deve restauras o backup.</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="+9"/>
+ <source>&lt;category&gt; can be:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
<source>Attempt to recover private keys from a corrupt wallet.dat</source>
<translation>Tentar recuperar chaves privadas de um arquivo wallet.dat corrompido</translation>
</message>
<message>
<location line="+1"/>
+ <source>Bitcoin Core Daemon</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Bitcoin RPC client version</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
<source>Block creation options:</source>
<translation>Opções de criação de blocos:</translation>
</message>
@@ -2784,7 +3443,12 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Conectar apenas a nó(s) específico(s)</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
+ <source>Connect through SOCKS proxy</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect to JSON-RPC on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation type="unfinished"/>
</message>
@@ -2800,6 +3464,11 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+1"/>
+ <source>Do not load the wallet and disable wallet RPC calls</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Do you want to rebuild the block database now?</source>
<translation>Você quer reconstruir o banco de dados de blocos agora?</translation>
</message>
@@ -2894,7 +3563,12 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Falha ao escrever dados para desfazer ações</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
+ <source>Fee per kB to add to transactions you send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Find peers using DNS lookup (default: 1 unless -connect)</source>
<translation>Procurar pares usando consulta de DNS (padrão: 1 a menos que a opção -connect esteja presente)</translation>
</message>
@@ -2914,6 +3588,11 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Quão minuciosa é a verificação dos blocos (0-4, padrão: 3)</translation>
</message>
<message>
+ <location line="+1"/>
+ <source>If &lt;category&gt; is not supplied, output all debugging information.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+2"/>
<source>Incorrect or no genesis block found. Wrong datadir for network?</source>
<translation>Bloco gênese incorreto ou não encontrado. Datadir errado para a rede?</translation>
@@ -2929,17 +3608,37 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Decriptadores de arquivos disponíveis insuficientes.</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+5"/>
+ <source>Prepend debug output with timestamp (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>RPC client options:</source>
+ <translation>Opções de cliente RPC:</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Rebuild block chain index from current blk000??.dat files</source>
<translation>Reconstruir índice de blockchain a partir dos arquivos atuais blk000??.dat</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+5"/>
+ <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Send command to Bitcoin server</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
+ <location line="+7"/>
+ <source>Set maximum block size in bytes (default: %d)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Set the number of threads to service RPC calls (default: 4)</source>
<translation>Defina o número de threads de script de verificação. (Padrão: 4)</translation>
</message>
@@ -2951,15 +3650,20 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<message>
<location line="+2"/>
<source>Start Bitcoin server</source>
+ <translation>Iniciar servidor Bitcoin</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>This is intended for regression testing tools and app development.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+12"/>
+ <location line="+10"/>
<source>Usage (deprecated, use bitcoin-cli):</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+8"/>
+ <location line="+7"/>
<source>Verifying blocks...</source>
<translation>Verificando blocos...</translation>
</message>
@@ -2970,31 +3674,56 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+1"/>
+ <source>Wait for RPC server to start</source>
+ <translation>Aguarde um servidor RPC para iniciar</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Wallet %s resides outside data directory %s</source>
<translation>Carteira de% s reside fora de dados do diretório% s</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+2"/>
+ <source>Wallet options:</source>
+ <translation>Opções da Carteira:</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>You need to rebuild the database using -reindex to change -txindex</source>
<translation>Você precisa reconstruir o banco de dados utilizando-reindexar a mudar-txindex</translation>
</message>
<message>
- <location line="-78"/>
+ <location line="-79"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation>Importar blocos de um arquivo externo blk000??.dat</translation>
</message>
<message>
- <location line="-98"/>
+ <location line="-105"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation>Executa o comando quando um alerta relevante é recebido ou vemos um longo garfo (% s em cmd é substituída pela mensagem)</translation>
</message>
<message>
- <location line="+17"/>
+ <location line="+14"/>
+ <source>Output debugging information (default: 0, supplying &lt;category&gt; is optional)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
<translation>Defina o número de linhas de verificação (até 16, 0 = auto, &lt;0 = deixar muitos núcleos livres, padrão: 0)</translation>
</message>
<message>
- <location line="+83"/>
+ <location line="+89"/>
<source>Information</source>
<translation>Informação</translation>
</message>
@@ -3034,47 +3763,17 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Apenas conectar em nós na rede &lt;net&gt; (IPv4, IPv6, ou Tor)</translation>
</message>
<message>
- <location line="+2"/>
- <source>Output extra debugging information. Implies all other -debug* options</source>
- <translation>Mostrar informações extras de depuração. Implica em outras opções -debug*</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Output extra network debugging information</source>
- <translation>Mostrar informações extras de depuração da rede</translation>
- </message>
- <message>
- <location line="+2"/>
- <source>Prepend debug output with timestamp</source>
- <translation>Pré anexar a saída de debug com estampa de tempo</translation>
- </message>
- <message>
- <location line="+5"/>
+ <location line="+9"/>
<source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
<translation>Opções SSL: (veja a Wiki do Bitcoin para instruções de configuração SSL)</translation>
</message>
<message>
- <location line="+1"/>
- <source>Select the version of socks proxy to use (4-5, default: 5)</source>
- <translation>Escolher versão do proxy socks a ser usada (4-5, padrão: 5)</translation>
- </message>
- <message>
- <location line="+3"/>
+ <location line="+4"/>
<source>Send trace/debug info to console instead of debug.log file</source>
<translation>Mandar informação de trace/debug para o console em vez de para o arquivo debug.log</translation>
</message>
<message>
- <location line="+1"/>
- <source>Send trace/debug info to debugger</source>
- <translation>Mandar informação de trace/debug para o debugger</translation>
- </message>
- <message>
- <location line="+5"/>
- <source>Set maximum block size in bytes (default: 250000)</source>
- <translation>Determinar tamanho máximo de bloco em bytes (padrão: 250000)</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+6"/>
<source>Set minimum block size in bytes (default: 0)</source>
<translation>Determinar tamanho mínimo de bloco em bytes (padrão: 0)</translation>
</message>
@@ -3099,7 +3798,7 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Erro de sistema:</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Transaction amount too small</source>
<translation>Quantidade da transação muito pequena.</translation>
</message>
@@ -3124,32 +3823,32 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Usar UPnP para mapear porta de escuta (padrão: 1 quando estiver escutando)</translation>
</message>
<message>
- <location line="+1"/>
- <source>Use proxy to reach tor hidden services (default: same as -proxy)</source>
- <translation>Usar proxy para alcançar serviços escondidos (padrão: mesmo que -proxy)</translation>
- </message>
- <message>
<location line="+2"/>
<source>Username for JSON-RPC connections</source>
<translation>Nome de usuário para conexões JSON-RPC</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+7"/>
<source>Warning</source>
<translation>Cuidado</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Warning: This version is obsolete, upgrade required!</source>
<translation>Cuidado: Esta versão está obsoleta, atualização exigida!</translation>
</message>
<message>
<location line="+2"/>
+ <source>version</source>
+ <translation>versão</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>wallet.dat corrupt, salvage failed</source>
<translation>wallet.dat corrompido, recuperação falhou</translation>
</message>
<message>
- <location line="-54"/>
+ <location line="-58"/>
<source>Password for JSON-RPC connections</source>
<translation>Senha para conexões JSON-RPC</translation>
</message>
@@ -3159,27 +3858,27 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Permitir conexões JSON-RPC de endereços IP específicos</translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation>Enviar comando para nó rodando em &lt;ip&gt; (pardão: 127.0.0.1)</translation>
</message>
<message>
- <location line="-126"/>
+ <location line="-132"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation>Executar comando quando o melhor bloco mudar (%s no comando será substituído pelo hash do bloco)</translation>
</message>
<message>
- <location line="+155"/>
+ <location line="+161"/>
<source>Upgrade wallet to latest format</source>
<translation>Atualizar carteira para o formato mais recente</translation>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation>Determinar tamanho do pool de endereços para &lt;n&gt; (padrão: 100)</translation>
</message>
<message>
- <location line="-12"/>
+ <location line="-11"/>
<source>Rescan the block chain for missing wallet transactions</source>
<translation>Re-escanear blocos procurando por transações perdidas da carteira</translation>
</message>
@@ -3189,7 +3888,7 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Usar OpenSSL (https) para conexões JSON-RPC</translation>
</message>
<message>
- <location line="-29"/>
+ <location line="-30"/>
<source>Server certificate file (default: server.cert)</source>
<translation>Arquivo de certificado do servidor (padrão: server.cert)</translation>
</message>
@@ -3204,27 +3903,22 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Esta mensagem de ajuda</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Unable to bind to %s on this computer (bind returned error %d, %s)</source>
<translation>Impossível vincular a %s neste computador (bind retornou erro %d, %s)</translation>
</message>
<message>
- <location line="-95"/>
- <source>Connect through socks proxy</source>
- <translation>Conectar através de um proxy socks</translation>
- </message>
- <message>
- <location line="-11"/>
+ <location line="-107"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation>Permitir consultas DNS para -addnode, -seednode e -connect</translation>
</message>
<message>
- <location line="+58"/>
+ <location line="+60"/>
<source>Loading addresses...</source>
<translation>Carregando endereços...</translation>
</message>
<message>
- <location line="-36"/>
+ <location line="-37"/>
<source>Error loading wallet.dat: Wallet corrupted</source>
<translation>Erro ao carregar wallet.dat: Carteira corrompida</translation>
</message>
@@ -3244,12 +3938,12 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Erro ao carregar wallet.dat</translation>
</message>
<message>
- <location line="+30"/>
+ <location line="+31"/>
<source>Invalid -proxy address: &apos;%s&apos;</source>
<translation>Endereço -proxy inválido: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+57"/>
+ <location line="+56"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation>Rede desconhecida especificada em -onlynet: &apos;%s&apos;</translation>
</message>
@@ -3259,7 +3953,7 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Versão desconhecida do proxy -socks requisitada: %i</translation>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation>Impossível encontrar o endereço -bind: &apos;%s&apos;</translation>
</message>
@@ -3269,7 +3963,7 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Impossível encontrar endereço -externalip: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+46"/>
+ <location line="+48"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation>Quantidade inválida para -paytxfee=&lt;quantidade&gt;: &apos;%s&apos;</translation>
</message>
@@ -3289,27 +3983,22 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Carregando índice de blocos...</translation>
</message>
<message>
- <location line="-60"/>
+ <location line="-62"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation>Adicionar um nó com o qual se conectar e tentar manter a conexão ativa</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-32"/>
<source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source>
<translation>Impossível vincular a %s neste computador. O Bitcoin provavelmente já está rodando.</translation>
</message>
<message>
- <location line="+69"/>
- <source>Fee per KB to add to transactions you send</source>
- <translation>Taxa por KB a ser acrescida nas transações que você enviar</translation>
- </message>
- <message>
- <location line="+20"/>
+ <location line="+95"/>
<source>Loading wallet...</source>
<translation>Carregando carteira...</translation>
</message>
<message>
- <location line="-54"/>
+ <location line="-56"/>
<source>Cannot downgrade wallet</source>
<translation>Não é possível fazer downgrade da carteira</translation>
</message>
@@ -3319,7 +4008,7 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Não foi possível escrever no endereço padrão</translation>
</message>
<message>
- <location line="+66"/>
+ <location line="+67"/>
<source>Rescanning...</source>
<translation>Re-escaneando...</translation>
</message>
@@ -3339,7 +4028,7 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Erro</translation>
</message>
<message>
- <location line="-33"/>
+ <location line="-35"/>
<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 983eb86e3b..0786b23f91 100644
--- a/src/qt/locale/bitcoin_pt_PT.ts
+++ b/src/qt/locale/bitcoin_pt_PT.ts
@@ -27,13 +27,13 @@ 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="+19"/>
+ <location filename="../utilitydialog.cpp" line="+29"/>
<source>Copyright</source>
<translation>Copyright</translation>
</message>
<message>
<location line="+0"/>
- <source>The Bitcoin developers</source>
+ <source>The Bitcoin Core developers</source>
<translation>Os programadores Bitcoin</translation>
</message>
</context>
@@ -151,13 +151,13 @@ Este produto inclui software desenvolvido pelo Projecto OpenSSL para uso no Open
</message>
<message>
<location line="+13"/>
- <source>Error exporting</source>
- <translation>Erro ao exportar</translation>
+ <source>Exporting Failed</source>
+ <translation>Exportação falhada</translation>
</message>
<message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation>Não foi possível escrever para o ficheiro %1.</translation>
+ <location line="+1"/>
+ <source>There was an error trying to save the address list to %1.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -322,22 +322,27 @@ Este produto inclui software desenvolvido pelo Projecto OpenSSL para uso no Open
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+260"/>
+ <location filename="../bitcoingui.cpp" line="+295"/>
<source>Sign &amp;message...</source>
<translation>Assinar &amp;mensagem...</translation>
</message>
<message>
- <location line="+290"/>
+ <location line="+335"/>
<source>Synchronizing with network...</source>
<translation>Sincronizando com a rede...</translation>
</message>
<message>
- <location line="-360"/>
+ <location line="-407"/>
<source>&amp;Overview</source>
<translation>Visã&amp;o geral</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="-137"/>
+ <source>Node</source>
+ <translation>Nó</translation>
+ </message>
+ <message>
+ <location line="+138"/>
<source>Show general overview of wallet</source>
<translation>Mostrar visão geral da carteira</translation>
</message>
@@ -352,7 +357,7 @@ 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="+15"/>
+ <location line="+17"/>
<source>E&amp;xit</source>
<translation>Fec&amp;har</translation>
</message>
@@ -398,7 +403,22 @@ Este produto inclui software desenvolvido pelo Projecto OpenSSL para uso no Open
<translation>Mudar &amp;Palavra-passe...</translation>
</message>
<message>
- <location line="+295"/>
+ <location line="+10"/>
+ <source>&amp;Sending addresses...</source>
+ <translation>A &amp;enviar endereços...</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Receiving addresses...</source>
+ <translation>A &amp;receber endereços...</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open &amp;URI...</source>
+ <translation>Abrir &amp;URI...</translation>
+ </message>
+ <message>
+ <location line="+325"/>
<source>Importing blocks from disk...</source>
<translation>Importando blocos do disco...</translation>
</message>
@@ -408,12 +428,12 @@ Este produto inclui software desenvolvido pelo Projecto OpenSSL para uso no Open
<translation>Reindexando blocos no disco...</translation>
</message>
<message>
- <location line="-358"/>
+ <location line="-405"/>
<source>Send coins to a Bitcoin address</source>
<translation>Enviar moedas para um endereço bitcoin</translation>
</message>
<message>
- <location line="+47"/>
+ <location line="+49"/>
<source>Modify configuration options for Bitcoin</source>
<translation>Modificar opções de configuração para bitcoin</translation>
</message>
@@ -443,18 +463,17 @@ Este produto inclui software desenvolvido pelo Projecto OpenSSL para uso no Open
<translation>&amp;Verificar mensagem...</translation>
</message>
<message>
- <location line="+375"/>
+ <location line="+430"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-563"/>
- <location line="+10"/>
+ <location line="-643"/>
<source>Wallet</source>
<translation>Carteira</translation>
</message>
<message>
- <location line="+113"/>
+ <location line="+146"/>
<source>&amp;Send</source>
<translation>&amp;Enviar</translation>
</message>
@@ -464,7 +483,7 @@ Este produto inclui software desenvolvido pelo Projecto OpenSSL para uso no Open
<translation>&amp;Receber</translation>
</message>
<message>
- <location line="+44"/>
+ <location line="+46"/>
<location line="+2"/>
<source>&amp;Show / Hide</source>
<translation>Mo&amp;strar / Ocultar</translation>
@@ -490,86 +509,80 @@ Este produto inclui software desenvolvido pelo Projecto OpenSSL para uso no Open
<translation>Verifique mensagens para assegurar que foram assinadas com o endereço Bitcoin especificado</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+48"/>
<source>&amp;File</source>
<translation>&amp;Ficheiro</translation>
</message>
<message>
- <location line="+11"/>
+ <location line="+14"/>
<source>&amp;Settings</source>
<translation>Con&amp;figurações</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>&amp;Help</source>
<translation>A&amp;juda</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+15"/>
<source>Tabs toolbar</source>
<translation>Barra de separadores</translation>
</message>
<message>
- <location line="-244"/>
- <location line="+321"/>
+ <location line="-284"/>
+ <location line="+376"/>
<source>[testnet]</source>
<translation>[rede de testes]</translation>
</message>
<message>
- <location line="-331"/>
- <location line="+10"/>
+ <location line="-401"/>
<source>Bitcoin Core</source>
<translation>Núcleo Bitcoin</translation>
</message>
<message>
- <location line="+121"/>
+ <location line="+163"/>
<source>Request payments (generates QR codes and bitcoin: URIs)</source>
<translation>Solicitar pagamentos (gera códigos QR)</translation>
</message>
<message>
- <location line="+27"/>
+ <location line="+29"/>
<location line="+2"/>
<source>&amp;About Bitcoin Core</source>
<translation>&amp;Sobre o Núcleo Bitcoin</translation>
</message>
<message>
- <location line="+34"/>
- <source>&amp;Used sending addresses...</source>
- <translation>Endereços de envio &amp;usados</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+35"/>
<source>Show the list of used sending addresses and labels</source>
<translation>Mostrar a lista de endereços de envio e rótulos usados</translation>
</message>
<message>
- <location line="+1"/>
- <source>Used &amp;receiving addresses...</source>
- <translation>Ende&amp;reços de depósito usados</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Show the list of used receiving addresses and labels</source>
<translation>Mostrar a lista de endereços para receber pagamentos e rótulos usados</translation>
</message>
<message>
+ <location line="+3"/>
+ <source>Open a bitcoin: URI or payment request</source>
+ <translation>Abrir bitcoin: link ou pedido de pagamento</translation>
+ </message>
+ <message>
<location line="+2"/>
- <source>Open URI...</source>
- <translation>Abrir link...</translation>
+ <source>&amp;Command-line options</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
- <source>Open a bitcoin: URI or payment request</source>
- <translation>Abrir bitcoin: link ou pedido de pagamento</translation>
+ <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+126"/>
+ <location line="+159"/>
<location line="+5"/>
<source>Bitcoin client</source>
<translation>Cliente Bitcoin</translation>
</message>
<message numerus="yes">
- <location line="+133"/>
+ <location line="+142"/>
<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>
@@ -589,7 +602,7 @@ Este produto inclui software desenvolvido pelo Projecto OpenSSL para uso no Open
<translation>Processados %1 blocos do histórico de transações.</translation>
</message>
<message numerus="yes">
- <location line="+20"/>
+ <location line="+23"/>
<source>%n hour(s)</source>
<translation><numerusform>%n hora</numerusform><numerusform>%n horas</numerusform></translation>
</message>
@@ -609,7 +622,7 @@ Este produto inclui software desenvolvido pelo Projecto OpenSSL para uso no Open
<translation>%1 em atraso</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="+21"/>
<source>Last received block was generated %1 ago.</source>
<translation>Último bloco recebido foi gerado há %1 atrás.</translation>
</message>
@@ -634,27 +647,17 @@ Este produto inclui software desenvolvido pelo Projecto OpenSSL para uso no Open
<translation>Informação</translation>
</message>
<message>
- <location line="+77"/>
- <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="-152"/>
+ <location line="-85"/>
<source>Up to date</source>
<translation>Atualizado</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Catching up...</source>
<translation>Recuperando...</translation>
</message>
<message>
- <location line="+124"/>
- <source>Confirm transaction fee</source>
- <translation>Confirme a taxa de transação</translation>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+130"/>
<source>Sent transaction</source>
<translation>Transação enviada</translation>
</message>
@@ -677,7 +680,7 @@ Endereço: %4
</translation>
</message>
<message>
- <location line="+67"/>
+ <location line="+69"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation>A carteira está &lt;b&gt;encriptada&lt;/b&gt; e atualmente &lt;b&gt;desbloqueada&lt;/b&gt;</translation>
</message>
@@ -687,7 +690,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 filename="../bitcoin.cpp" line="+116"/>
+ <location filename="../bitcoin.cpp" line="+438"/>
<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>
@@ -909,7 +912,12 @@ Endereço: %4
<translation>(%1 bloqueado)</translation>
</message>
<message>
- <location line="+171"/>
+ <location line="+31"/>
+ <source>none</source>
+ <translation>nenhum</translation>
+ </message>
+ <message>
+ <location line="+140"/>
<source>Dust</source>
<translation>Lixo</translation>
</message>
@@ -946,8 +954,8 @@ Endereço: %4
</message>
<message>
<location line="+1"/>
- <source>This label turns red, if the priority is smaller than &quot;medium&quot;</source>
- <translation>Esta legenda fica vermelha se a prioridade é menor do que &quot;médio&quot;.</translation>
+ <source>This label turns red, if the priority is smaller than &quot;medium&quot;.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
@@ -1015,7 +1023,7 @@ Endereço: %4
<translation>E&amp;ndereço</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+25"/>
+ <location filename="../editaddressdialog.cpp" line="+28"/>
<source>New receiving address</source>
<translation>Novo endereço de entrada</translation>
</message>
@@ -1084,20 +1092,24 @@ Endereço: %4
</message>
</context>
<context>
- <name>GUIUtil::HelpMessageBox</name>
+ <name>HelpMessageDialog</name>
<message>
- <location filename="../guiutil.cpp" line="+597"/>
- <source>version</source>
- <translation>versão</translation>
+ <location filename="../forms/helpmessagedialog.ui" line="+19"/>
+ <source>Bitcoin Core - Command-line options</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <location line="+13"/>
+ <location filename="../utilitydialog.cpp" line="+38"/>
<source>Bitcoin Core</source>
<translation>Núcleo Bitcoin</translation>
</message>
<message>
- <location line="-11"/>
+ <location line="+0"/>
+ <source>version</source>
+ <translation>versão</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Usage:</source>
<translation>Utilização:</translation>
</message>
@@ -1227,7 +1239,7 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<translation>Opções</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+13"/>
<source>&amp;Main</source>
<translation>&amp;Principal</translation>
</message>
@@ -1252,7 +1264,52 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<translation>&amp;Começar o Bitcoin ao iniciar o sistema</translation>
</message>
<message>
- <location line="+35"/>
+ <location line="+9"/>
+ <source>Size of &amp;database cache</source>
+ <translation>Tamanho dos temporários da &amp;base de dados</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set database cache size in megabytes (default: 25)</source>
+ <translation>Definir o tamanho da cache de base de dados em megabytes (por defeito: 25)</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>MB</source>
+ <translation>MB</translation>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Number of script &amp;verification threads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
+ <translation>Defina o número de processos de verificação (até 16, 0 = automático, &lt;0 = disponibiliza esse número de núcleos livres, por defeito: 0)</translation>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Connect to the Bitcoin network through a SOCKS proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Connect through SOCKS proxy (default proxy):</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+224"/>
+ <source>Active command-line options that override above options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
<source>Reset all client options to default.</source>
<translation>Repôr todas as opções.</translation>
</message>
@@ -1262,7 +1319,7 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<translation>&amp;Repôr Opções</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="-323"/>
<source>&amp;Network</source>
<translation>&amp;Rede</translation>
</message>
@@ -1277,32 +1334,17 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<translation>Mapear porta usando &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>Ligar à rede Bitcoin através de um proxy SOCKS (p.ex. quando ligar através de Tor).</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>&amp;Connect through SOCKS proxy:</source>
- <translation>Ligar através de proxy SO&amp;CKS:</translation>
- </message>
- <message>
- <location line="+9"/>
+ <location line="+19"/>
<source>Proxy &amp;IP:</source>
<translation>&amp;IP do proxy:</translation>
</message>
<message>
- <location line="+19"/>
- <source>IP address of the proxy (e.g. 127.0.0.1)</source>
- <translation>Endereço IP do proxy (p.ex. 127.0.0.1)</translation>
- </message>
- <message>
- <location line="+7"/>
+ <location line="+32"/>
<source>&amp;Port:</source>
<translation>&amp;Porta:</translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+25"/>
<source>Port of the proxy (e.g. 9050)</source>
<translation>Porta do proxy (p.ex. 9050)</translation>
</message>
@@ -1387,7 +1429,7 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<translation>Mostrar coin &amp; funcionalidades de controlo (apenas para utilizadores experientes)</translation>
</message>
<message>
- <location line="+71"/>
+ <location line="+136"/>
<source>&amp;OK</source>
<translation>&amp;OK</translation>
</message>
@@ -1397,44 +1439,38 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<translation>&amp;Cancelar</translation>
</message>
<message>
- <location line="+10"/>
- <source>&amp;Apply</source>
- <translation>&amp;Aplicar</translation>
- </message>
- <message>
- <location filename="../optionsdialog.cpp" line="+63"/>
+ <location filename="../optionsdialog.cpp" line="+67"/>
<source>default</source>
<translation>padrão</translation>
</message>
<message>
- <location line="+131"/>
+ <location line="+57"/>
+ <source>none</source>
+ <translation>nenhum</translation>
+ </message>
+ <message>
+ <location line="+75"/>
<source>Confirm options reset</source>
<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>Algumas opções requerem o reinício do programa para funcionar.</translation>
+ <location line="+29"/>
+ <source>Client restart required to activate changes.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>Do you want to proceed?</source>
- <translation>Deseja proceder?</translation>
+ <location line="-29"/>
+ <source>Client will be shutdown, do you want to proceed?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
- <location line="+9"/>
- <source>Warning</source>
- <translation>Aviso</translation>
+ <location line="+33"/>
+ <source>This change would require a client restart.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="-9"/>
- <location line="+9"/>
- <source>This setting will take effect after restarting Bitcoin.</source>
- <translation>Esta opção entrará em efeito após reiniciar o Bitcoin.</translation>
- </message>
- <message>
- <location line="+29"/>
+ <location line="+34"/>
<source>The supplied proxy address is invalid.</source>
<translation>O endereço de proxy introduzido é inválido. </translation>
</message>
@@ -1448,22 +1484,22 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
</message>
<message>
<location line="+50"/>
- <location line="+214"/>
+ <location line="+231"/>
<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="-140"/>
+ <location line="-155"/>
<source>Unconfirmed:</source>
<translation>Não confirmado:</translation>
</message>
<message>
- <location line="-81"/>
+ <location line="-83"/>
<source>Wallet</source>
<translation>Carteira</translation>
</message>
<message>
- <location line="+49"/>
+ <location line="+51"/>
<source>Confirmed:</source>
<translation>Confirmado:</translation>
</message>
@@ -1498,7 +1534,7 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<translation>O seu saldo total actual</translation>
</message>
<message>
- <location line="+56"/>
+ <location line="+71"/>
<source>&lt;b&gt;Recent transactions&lt;/b&gt;</source>
<translation>&lt;b&gt;Transações recentes&lt;/b&gt;</translation>
</message>
@@ -1512,7 +1548,8 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<context>
<name>PaymentServer</name>
<message>
- <location filename="../paymentserver.cpp" line="+397"/>
+ <location filename="../paymentserver.cpp" line="+403"/>
+ <location line="+13"/>
<source>URI handling</source>
<translation>Manuseamento URI</translation>
</message>
@@ -1522,24 +1559,52 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<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>
<message>
- <location line="+91"/>
+ <location line="+96"/>
<source>Requested payment amount of %1 is too small (considered dust).</source>
<translation>Quantia requisitada para pagamento de %1 é muito pequena (considerada pó).</translation>
</message>
<message>
- <location line="-204"/>
- <location line="+195"/>
+ <location line="-221"/>
+ <location line="+212"/>
<location line="+13"/>
+ <location line="+95"/>
+ <location line="+18"/>
+ <location line="+16"/>
<source>Payment request error</source>
<translation>Erro no pedido de pagamento</translation>
</message>
<message>
- <location line="-207"/>
+ <location line="-353"/>
<source>Cannot start bitcoin: click-to-pay handler</source>
<translation>Impossível começar o modo clicar-para-pagar com bitcoin:</translation>
</message>
<message>
- <location line="+195"/>
+ <location line="+58"/>
+ <source>Net manager warning</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Your active proxy doesn&apos;t support SOCKS5, which is required for payment requests via proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>Payment request fetch URL is invalid: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Payment request file handling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Payment request file can not be read or processed! This can be caused by an invalid payment request file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+73"/>
<source>Unverified payment requests to custom payment scripts are unsupported.</source>
<translation>Pedidos de pagamento não-verificados para scripts de pagamento personalizadas não é suportado.</translation>
</message>
@@ -1549,24 +1614,27 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<translation>Reembolsar de %1</translation>
</message>
<message>
- <location line="+42"/>
+ <location line="+43"/>
<source>Error communicating with %1: %2</source>
<translation>Erro ao comunicar com %1: %2</translation>
</message>
<message>
- <location line="+28"/>
+ <location line="+24"/>
+ <source>Payment request can not be parsed or processed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
<source>Bad response from server %1</source>
<translation>Má resposta do servidor %1</translation>
</message>
<message>
- <location line="+32"/>
+ <location line="+33"/>
<source>Payment acknowledged</source>
<translation>Pagamento confirmado</translation>
</message>
<message>
- <location line="-55"/>
- <location line="+27"/>
- <location line="+17"/>
+ <location line="-11"/>
<source>Network request error</source>
<translation>Erro de pedido de rede</translation>
</message>
@@ -1574,18 +1642,18 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<context>
<name>QObject</name>
<message>
- <location filename="../bitcoin.cpp" line="+119"/>
- <location line="+5"/>
+ <location filename="../bitcoin.cpp" line="+71"/>
+ <location line="+11"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-4"/>
+ <location line="+1"/>
<source>Error: Specified data directory &quot;%1&quot; does not exist.</source>
<translation>Erro: Pasta de dados especificada &quot;%1&quot; não existe.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="-12"/>
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation>Erro: Combinação inválida de -regtest e -testnet.</translation>
</message>
@@ -1627,15 +1695,16 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<location line="+23"/>
<location line="+23"/>
<location line="+36"/>
- <location line="+53"/>
+ <location line="+23"/>
+ <location line="+36"/>
<location line="+23"/>
<location line="+23"/>
- <location filename="../rpcconsole.cpp" line="+360"/>
+ <location filename="../rpcconsole.cpp" line="+359"/>
<source>N/A</source>
<translation>N/D</translation>
</message>
<message>
- <location line="-217"/>
+ <location line="-223"/>
<source>Client version</source>
<translation>Versão do Cliente</translation>
</message>
@@ -1650,7 +1719,12 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<translation>Janela de depuração</translation>
</message>
<message>
- <location line="+78"/>
+ <location line="+25"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+53"/>
<source>Using OpenSSL version</source>
<translation>Usando versão OpenSSL</translation>
</message>
@@ -1666,16 +1740,16 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
</message>
<message>
<location line="+7"/>
- <source>Number of connections</source>
- <translation>Número de ligações</translation>
+ <source>Name</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+23"/>
- <source>On testnet</source>
- <translation>Em rede de testes</translation>
+ <source>Number of connections</source>
+ <translation>Número de ligações</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+29"/>
<source>Block chain</source>
<translation>Cadeia de blocos</translation>
</message>
@@ -1700,16 +1774,6 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<translation>&amp;Abrir</translation>
</message>
<message>
- <location line="+16"/>
- <source>Command-line options</source>
- <translation>Opções de linha de comandos</translation>
- </message>
- <message>
- <location line="+10"/>
- <source>&amp;Show</source>
- <translation>Mo&amp;strar</translation>
- </message>
- <message>
<location line="+24"/>
<source>&amp;Console</source>
<translation>&amp;Consola</translation>
@@ -1740,17 +1804,12 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<translation>Saída</translation>
</message>
<message>
- <location line="-541"/>
+ <location line="-521"/>
<source>Build date</source>
<translation>Data de construção</translation>
</message>
<message>
- <location line="-79"/>
- <source>Bitcoin Core</source>
- <translation>Núcleo Bitcoin</translation>
- </message>
- <message>
- <location line="+279"/>
+ <location line="+206"/>
<source>Debug log file</source>
<translation>Ficheiro de registo de depuração</translation>
</message>
@@ -1760,11 +1819,6 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<translation>Abrir o ficheiro de registo de depuração da pasta de dados actual. Isto pode demorar alguns segundos para ficheiros de registo maiores.</translation>
</message>
<message>
- <location line="+26"/>
- <source>Show the Bitcoin-Core help message to get a list with possible Bitcoin command-line options.</source>
- <translation>Mostrar o Bitcoin-core mensagem de &quot;ajuda&quot; para obter uma lista com opções de linha-de-comandos para Bitcoin.</translation>
- </message>
- <message>
<location line="+76"/>
<source>Clear console</source>
<translation>Limpar consola</translation>
@@ -1785,7 +1839,7 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<translation>Digite &lt;b&gt;help&lt;/b&gt; para visualizar os comandos disponíveis.</translation>
</message>
<message>
- <location line="+128"/>
+ <location line="+122"/>
<source>%1 B</source>
<translation>%1 B</translation>
</message>
@@ -1828,12 +1882,7 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<translation>&amp;Quantia:</translation>
</message>
<message>
- <location line="+19"/>
- <source>The amount to request</source>
- <translation>Montante a solicitar</translation>
- </message>
- <message>
- <location line="-32"/>
+ <location line="-13"/>
<source>&amp;Label:</source>
<translation>Rótu&amp;lo:</translation>
</message>
@@ -1843,12 +1892,7 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<translation>&amp;Mensagem:</translation>
</message>
<message>
- <location line="+20"/>
- <source>The message to attach to payment request</source>
- <translation>A mensagem a anexar ao pedido de pagamento</translation>
- </message>
- <message>
- <location line="-37"/>
+ <location line="-17"/>
<source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation>Re-utilize uns dos anteriores endereços de recebimento. Reutilizar endereços pode levar a um risco de segurança e de privacidade. Não use isto a não ser que esteja a re-pedir uma solicitação de pagamento feito anteriormente.</translation>
</message>
@@ -1859,16 +1903,26 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
</message>
<message>
<location line="+27"/>
- <source>The label to associate with the new receiving address</source>
- <translation>A legenda para associar com o novo endereço de recebimento.</translation>
+ <source>An optional label to associate with the new receiving address</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
- <source>Use this form to request payments. All fields are optional.</source>
- <translation>Utilize este formulário para solicitar pagamentos. Todos os campos são opcionais.</translation>
+ <location line="+7"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+56"/>
+ <location line="+7"/>
+ <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+39"/>
+ <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+17"/>
<source>Clear all fields of the form.</source>
<translation>Limpar todos os campos do formulário.</translation>
</message>
@@ -1884,11 +1938,11 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
</message>
<message>
<location line="+47"/>
- <source>Previously requested payments</source>
- <translation>Anteriores pedidos de pagamentos.</translation>
+ <source>Requested payments</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+12"/>
+ <location line="+16"/>
<source>Show the selected request (does the same as double clicking an entry)</source>
<translation>Mostrar o pedido seleccionado (Faz o mesmo que clicar 2 vezes numa entrada)</translation>
</message>
@@ -1979,7 +2033,7 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<context>
<name>RecentRequestsTableModel</name>
<message>
- <location filename="../recentrequeststablemodel.cpp" line="+14"/>
+ <location filename="../recentrequeststablemodel.cpp" line="+24"/>
<source>Date</source>
<translation>Data</translation>
</message>
@@ -1999,7 +2053,7 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<translation>Quantia</translation>
</message>
<message>
- <location line="+36"/>
+ <location line="+38"/>
<source>(no label)</source>
<translation>(Sem rótulo)</translation>
</message>
@@ -2014,7 +2068,7 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
<location filename="../sendcoinsdialog.cpp" line="+381"/>
- <location line="+81"/>
+ <location line="+80"/>
<source>Send Coins</source>
<translation>Enviar Moedas</translation>
</message>
@@ -2124,7 +2178,7 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<translation>&amp;Enviar</translation>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-229"/>
+ <location filename="../sendcoinsdialog.cpp" line="-228"/>
<source>Confirm send coins</source>
<translation>Confirme envio de moedas</translation>
</message>
@@ -2227,22 +2281,22 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<translation>Erro: A transação foi rejeitada. Isso poderá acontecer se algumas das moedas na sua carteira já tiverem sido gastas, se por exemplo tiver usado uma cópia do ficheiro wallet.dat e as moedas foram gastas na cópia mas não foram marcadas como gastas aqui.</translation>
</message>
<message>
- <location line="+113"/>
+ <location line="+112"/>
<source>Warning: Invalid Bitcoin address</source>
<translation>Aviso: Endereço Bitcoin inválido</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+21"/>
<source>(no label)</source>
<translation>(Sem rótulo)</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="-11"/>
<source>Warning: Unknown change address</source>
<translation>Aviso: Endereço de alteração desconhecido</translation>
</message>
<message>
- <location line="-378"/>
+ <location line="-366"/>
<source>Are you sure you want to send?</source>
<translation>Tem a certeza que deseja enviar?</translation>
</message>
@@ -2266,13 +2320,13 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<name>SendCoinsEntry</name>
<message>
<location filename="../forms/sendcoinsentry.ui" line="+131"/>
- <location line="+501"/>
+ <location line="+521"/>
<location line="+536"/>
<source>A&amp;mount:</source>
<translation>Qu&amp;antia:</translation>
</message>
<message>
- <location line="-1132"/>
+ <location line="-1152"/>
<source>Pay &amp;To:</source>
<translation>&amp;Pagar A:</translation>
</message>
@@ -2318,23 +2372,33 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
</message>
<message>
<location line="+7"/>
- <location line="+504"/>
+ <location line="+524"/>
<location line="+536"/>
<source>Remove this entry</source>
<translation>Remover esta inscrição</translation>
</message>
<message>
- <location line="-40"/>
+ <location line="-1008"/>
+ <source>Message:</source>
+ <translation>Mensagem:</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+958"/>
<source>This is a verified payment request.</source>
<translation>Este é um pedido de verificação de pagamento.</translation>
</message>
<message>
- <location line="-971"/>
+ <location line="-991"/>
<source>Enter a label for this address to add it to the list of used addresses</source>
<translation>Escreva um rótulo para este endereço para o adicionar à sua lista de endereços usados</translation>
</message>
<message>
- <location line="+439"/>
+ <location line="+459"/>
<source>This is an unverified payment request.</source>
<translation>Este é um pedido de pagamento não-verificado.</translation>
</message>
@@ -2357,6 +2421,19 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
</message>
</context>
<context>
+ <name>ShutdownWindow</name>
+ <message>
+ <location filename="../utilitydialog.cpp" line="+48"/>
+ <source>Bitcoin Core is shutting down...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Do not shut down the computer until this window disappears.</source>
+ <translation>Não desligue o computador enquanto esta janela não desaparecer.</translation>
+ </message>
+</context>
+<context>
<name>SignVerifyMessageDialog</name>
<message>
<location filename="../forms/signverifymessagedialog.ui" line="+14"/>
@@ -2364,7 +2441,7 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<translation>Assinaturas - Assinar / Verificar uma Mensagem</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+10"/>
<source>&amp;Sign Message</source>
<translation>A&amp;ssinar Mensagem</translation>
</message>
@@ -2552,7 +2629,7 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<context>
<name>SplashScreen</name>
<message>
- <location filename="../splashscreen.cpp" line="+26"/>
+ <location filename="../splashscreen.cpp" line="+28"/>
<source>Bitcoin Core</source>
<translation>Núcleo Bitcoin</translation>
</message>
@@ -2651,12 +2728,12 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<location line="+12"/>
<location line="+45"/>
<location line="+17"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Credit</source>
<translation>Crédito</translation>
</message>
<message numerus="yes">
- <location line="-120"/>
+ <location line="-125"/>
<source>matures in %n more block(s)</source>
<translation><numerusform>matura daqui por %n bloco</numerusform><numerusform>matura daqui por %n blocos</numerusform></translation>
</message>
@@ -2669,12 +2746,12 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<location line="+44"/>
<location line="+8"/>
<location line="+15"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Debit</source>
<translation>Débito</translation>
</message>
<message>
- <location line="-57"/>
+ <location line="-62"/>
<source>Transaction fee</source>
<translation>Taxa de transação</translation>
</message>
@@ -2685,11 +2762,12 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
</message>
<message>
<location line="+6"/>
+ <location line="+9"/>
<source>Message</source>
<translation>Mensagem</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="-7"/>
<source>Comment</source>
<translation>Comentário</translation>
</message>
@@ -2699,7 +2777,7 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<translation>ID da Transação</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+18"/>
<source>Merchant</source>
<translation>Comerciante</translation>
</message>
@@ -2739,7 +2817,7 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<translation>falso</translation>
</message>
<message>
- <location line="-227"/>
+ <location line="-232"/>
<source>, has not been successfully broadcast yet</source>
<translation>, ainda não foi transmitida com sucesso</translation>
</message>
@@ -2789,8 +2867,13 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<source>Amount</source>
<translation>Quantia</translation>
</message>
+ <message>
+ <location line="+59"/>
+ <source>Immature (%1 confirmations, will be available after %2)</source>
+ <translation type="unfinished"/>
+ </message>
<message numerus="yes">
- <location line="+57"/>
+ <location line="+16"/>
<source>Open for %n more block(s)</source>
<translation><numerusform>Aberta por mais %n bloco</numerusform><numerusform>Aberta por mais %n blocos</numerusform></translation>
</message>
@@ -2810,17 +2893,13 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<translation>Não confirmada (%1 de %2 confirmações)</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="-22"/>
+ <location line="+25"/>
<source>Confirmed (%1 confirmations)</source>
<translation>Confirmada (%1 confirmação)</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>Saldo minado ficará disponível quando maturar, daqui por %n bloco</numerusform><numerusform>Saldo minado ficará disponível quando maturar, daqui por %n blocos</numerusform></translation>
- </message>
<message>
- <location line="+5"/>
+ <location line="-22"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation>Este bloco não foi recebido por outros nós e provavelmente não será aceite pela rede!</translation>
</message>
@@ -2830,7 +2909,7 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<translation>Gerado mas não aceite</translation>
</message>
<message>
- <location line="+43"/>
+ <location line="+62"/>
<source>Received with</source>
<translation>Recebido com</translation>
</message>
@@ -3126,7 +3205,7 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+217"/>
+ <location filename="../bitcoinstrings.cpp" line="+221"/>
<source>Usage:</source>
<translation>Utilização:</translation>
</message>
@@ -3146,7 +3225,7 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<translation>Opções:</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+22"/>
<source>Specify configuration file (default: bitcoin.conf)</source>
<translation>Especificar ficheiro de configuração (por defeito: bitcoin.conf)</translation>
</message>
@@ -3166,7 +3245,7 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<translation>Definir o tamanho da cache de base de dados em megabytes (por defeito: 25)</translation>
</message>
<message>
- <location line="-27"/>
+ <location line="-26"/>
<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>
@@ -3176,7 +3255,7 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<translation>Manter no máximo &lt;n&gt; ligações a outros nós da rede (por defeito: 125)</translation>
</message>
<message>
- <location line="-50"/>
+ <location line="-51"/>
<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>
@@ -3186,22 +3265,22 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<translation>Especifique o seu endereço público</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<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="-147"/>
+ <location line="-148"/>
<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="-33"/>
+ <location line="-36"/>
<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="+31"/>
+ <location line="+34"/>
<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>
@@ -3211,7 +3290,7 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<translation>Aceitar comandos da consola e JSON-RPC</translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>Correr o processo como um daemon e aceitar comandos</translation>
</message>
@@ -3221,12 +3300,12 @@ A sua &quot;carteira&quot; também irá ser guardada neste directório.</transla
<translation>Utilizar a rede de testes - testnet</translation>
</message>
<message>
- <location line="-117"/>
+ <location line="-118"/>
<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="-92"/>
+ <location line="-95"/>
<source>%s, you must set a rpcpassword in the configuration file:
%s
It is recommended you use the following random password:
@@ -3277,6 +3356,11 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Alerta Bitcoin&quot; admin@foo
</message>
<message>
<location line="+4"/>
+ <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</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>Erro: A transação foi rejeitada. Isso poderá acontecer se algumas das moedas na sua carteira já tiverem sido gastas, se por exemplo tiver usado uma cópia do ficheiro wallet.dat e as moedas foram gastas na cópia mas não foram marcadas como gastas aqui.</translation>
</message>
@@ -3382,6 +3466,11 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Alerta Bitcoin&quot; admin@foo
</message>
<message>
<location line="+1"/>
+ <source>Do not load the wallet and disable wallet RPC calls</source>
+ <translation type="unfinished"/>
+ </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>
@@ -3546,7 +3635,7 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Alerta Bitcoin&quot; admin@foo
<translation>Enviar comando para servidor Bitcoin</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+7"/>
<source>Set maximum block size in bytes (default: %d)</source>
<translation>Definir tamanho máximo de um bloco em bytes (por defeito: 250000)</translation>
</message>
@@ -3566,7 +3655,12 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Alerta Bitcoin&quot; admin@foo
<translation>Começar servidor Bitcoin</translation>
</message>
<message>
- <location line="+12"/>
+ <location line="+3"/>
+ <source>This is intended for regression testing tools and app development.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Usage (deprecated, use bitcoin-cli):</source>
<translation>Utilização (deprecado, use bitcoin-cli)</translation>
</message>
@@ -3591,7 +3685,12 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Alerta Bitcoin&quot; admin@foo
<translation>A carteira %s reside fora da pasta de dados %s</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="+2"/>
+ <source>Wallet options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source>
<translation>Aviso: Argumento obsolote -debugnet ignorado, usar -debug=net</translation>
</message>
@@ -3601,12 +3700,12 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Alerta Bitcoin&quot; admin@foo
<translation>Necessita reconstruir as bases de dados usando -reindex para mudar -txindex</translation>
</message>
<message>
- <location line="-78"/>
+ <location line="-79"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation>Importar blocos de um ficheiro blk000??.dat externo</translation>
</message>
<message>
- <location line="-104"/>
+ <location line="-105"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation>Executar comando quando um alerta relevante for recebido ou em caso de uma divisão longa da cadeia de blocos (no comando, %s é substituído pela mensagem)</translation>
</message>
@@ -3626,7 +3725,7 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Alerta Bitcoin&quot; admin@foo
<translation>Defina o número de processos de verificação (até 16, 0 = automático, &lt;0 = disponibiliza esse número de núcleos livres, por defeito: 0)</translation>
</message>
<message>
- <location line="+88"/>
+ <location line="+89"/>
<source>Information</source>
<translation>Informação</translation>
</message>
@@ -3676,11 +3775,6 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Alerta Bitcoin&quot; admin@foo
<translation>Enviar informação de rastreio/depuração para a consola e não para o ficheiro debug.log</translation>
</message>
<message>
- <location line="+1"/>
- <source>Send trace/debug info to debugger</source>
- <translation>Enviar informação de rastreio/depuração para o depurador</translation>
- </message>
- <message>
<location line="+6"/>
<source>Set minimum block size in bytes (default: 0)</source>
<translation>Definir tamanho minímo de um bloco em bytes (por defeito: 0)</translation>
@@ -3706,7 +3800,7 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Alerta Bitcoin&quot; admin@foo
<translation>Erro de sistema:</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Transaction amount too small</source>
<translation>Quantia da transação é muito baixa</translation>
</message>
@@ -3736,7 +3830,7 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Alerta Bitcoin&quot; admin@foo
<translation>Nome de utilizador para ligações JSON-RPC</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Warning</source>
<translation>Aviso</translation>
</message>
@@ -3756,37 +3850,37 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Alerta Bitcoin&quot; admin@foo
<translation>wallet.dat corrupta, recuperação falhou</translation>
</message>
<message>
- <location line="-57"/>
+ <location line="-58"/>
<source>Password for JSON-RPC connections</source>
<translation>Palavra-passe para ligações JSON-RPC</translation>
</message>
<message>
- <location line="-69"/>
+ <location line="-70"/>
<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="+79"/>
+ <location line="+80"/>
<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="-131"/>
+ <location line="-132"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation>Executar comando quando mudar o melhor bloco (no comando, %s é substituído pela hash do bloco)</translation>
</message>
<message>
- <location line="+160"/>
+ <location line="+161"/>
<source>Upgrade wallet to latest format</source>
<translation>Atualize a carteira para o formato mais recente</translation>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<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>
<message>
- <location line="-12"/>
+ <location line="-11"/>
<source>Rescan the block chain for missing wallet transactions</source>
<translation>Reexaminar a cadeia de blocos para transações em falta na carteira</translation>
</message>
@@ -3796,7 +3890,7 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Alerta Bitcoin&quot; admin@foo
<translation>Usar OpenSSL (https) para ligações JSON-RPC</translation>
</message>
<message>
- <location line="-29"/>
+ <location line="-30"/>
<source>Server certificate file (default: server.cert)</source>
<translation>Ficheiro de certificado do servidor (por defeito: server.cert)</translation>
</message>
@@ -3811,17 +3905,17 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Alerta Bitcoin&quot; admin@foo
<translation>Esta mensagem de ajuda</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Unable to bind to %s on this computer (bind returned error %d, %s)</source>
<translation>Incapaz de vincular a %s neste computador (vínculo retornou erro %d, %s)</translation>
</message>
<message>
- <location line="-106"/>
+ <location line="-107"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation>Permitir procuras DNS para -addnode, -seednode e -connect</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+60"/>
<source>Loading addresses...</source>
<translation>Carregar endereços...</translation>
</message>
@@ -3861,7 +3955,7 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Alerta Bitcoin&quot; admin@foo
<translation>Versão desconhecida de proxy -socks requisitada: %i</translation>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation>Não conseguiu resolver endereço -bind: &apos;%s&apos;</translation>
</message>
@@ -3871,7 +3965,7 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Alerta Bitcoin&quot; admin@foo
<translation>Não conseguiu resolver endereço -externalip: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+47"/>
+ <location line="+48"/>
<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>
@@ -3891,7 +3985,7 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Alerta Bitcoin&quot; admin@foo
<translation>Carregar índice de blocos...</translation>
</message>
<message>
- <location line="-61"/>
+ <location line="-62"/>
<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>
@@ -3901,12 +3995,12 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Alerta Bitcoin&quot; admin@foo
<translation>Incapaz de vincular à porta %s neste computador. Provavelmente o Bitcoin já está a funcionar.</translation>
</message>
<message>
- <location line="+94"/>
+ <location line="+95"/>
<source>Loading wallet...</source>
<translation>Carregar carteira...</translation>
</message>
<message>
- <location line="-55"/>
+ <location line="-56"/>
<source>Cannot downgrade wallet</source>
<translation>Impossível mudar a carteira para uma versão anterior</translation>
</message>
@@ -3916,7 +4010,7 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Alerta Bitcoin&quot; admin@foo
<translation>Impossível escrever endereço por defeito</translation>
</message>
<message>
- <location line="+66"/>
+ <location line="+67"/>
<source>Rescanning...</source>
<translation>Reexaminando...</translation>
</message>
@@ -3936,7 +4030,7 @@ por exemplo: alertnotify=echo %%s | mail -s &quot;Alerta Bitcoin&quot; admin@foo
<translation>Erro</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-35"/>
<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 c6730a901f..aa0a26c2ca 100644
--- a/src/qt/locale/bitcoin_ro_RO.ts
+++ b/src/qt/locale/bitcoin_ro_RO.ts
@@ -3,13 +3,13 @@
<name>AboutDialog</name>
<message>
<location filename="../forms/aboutdialog.ui" line="+14"/>
- <source>About Bitcoin</source>
- <translation>Despre Bitcoin</translation>
+ <source>About Bitcoin Core</source>
+ <translation>Despre Nucleul Bitcoin</translation>
</message>
<message>
<location line="+39"/>
- <source>&lt;b&gt;Bitcoin&lt;/b&gt; version</source>
- <translation>Versiune &lt;b&gt;Bitcoin&lt;/b&gt;</translation>
+ <source>&lt;b&gt;Bitcoin Core&lt;/b&gt; version</source>
+ <translation>&lt;b&gt;Nucleul Bitcoin &lt;/b&gt; versiune</translation>
</message>
<message>
<location line="+57"/>
@@ -27,14 +27,14 @@ Distribuit sub licența de programe MIT/X11, vezi fișierul însoțitor COPYING
Acest produs include programe dezvoltate de către OpenSSL Project pentru a fi folosite în OpenSSL Toolkit (http://www.openssl.org/) și programe criptografice scrise de către Eric Young (eay@cryptsoft.com) și programe UPnP scrise de către Thomas Bernard.</translation>
</message>
<message>
- <location filename="../aboutdialog.cpp" line="+14"/>
+ <location filename="../utilitydialog.cpp" line="+29"/>
<source>Copyright</source>
<translation>Drepturi de autor</translation>
</message>
<message>
<location line="+0"/>
- <source>The Bitcoin developers</source>
- <translation>Dezvoltatorii Bitcoin</translation>
+ <source>The Bitcoin Core developers</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -42,7 +42,7 @@ Acest produs include programe dezvoltate de către OpenSSL Project pentru a fi f
<message>
<location filename="../forms/addressbookpage.ui" line="+30"/>
<source>Double-click to edit address or label</source>
- <translation>Dublu-clic pentru a edita adresa sau eticheta</translation>
+ <translation>Dublu-click pentru a edita adresa sau eticheta</translation>
</message>
<message>
<location line="+27"/>
@@ -52,7 +52,7 @@ Acest produs include programe dezvoltate de către OpenSSL Project pentru a fi f
<message>
<location line="+3"/>
<source>&amp;New</source>
- <translation type="unfinished"/>
+ <translation>&amp;Nou</translation>
</message>
<message>
<location line="+11"/>
@@ -62,15 +62,15 @@ Acest produs include programe dezvoltate de către OpenSSL Project pentru a fi f
<message>
<location line="+3"/>
<source>&amp;Copy</source>
- <translation type="unfinished"/>
+ <translation>&amp;Copiere</translation>
</message>
<message>
<location line="+52"/>
<source>C&amp;lose</source>
- <translation type="unfinished"/>
+ <translation>&amp;Inchidere</translation>
</message>
<message>
- <location filename="../addressbookpage.cpp" line="+72"/>
+ <location filename="../addressbookpage.cpp" line="+74"/>
<source>&amp;Copy Address</source>
<translation>&amp;Copiază adresa</translation>
</message>
@@ -82,7 +82,7 @@ Acest produs include programe dezvoltate de către OpenSSL Project pentru a fi f
<message>
<location line="+27"/>
<source>Export the data in the current tab to a file</source>
- <translation type="unfinished"/>
+ <translation>Exporta datele din tab-ul curent într-un fișier</translation>
</message>
<message>
<location line="+3"/>
@@ -97,37 +97,37 @@ Acest produs include programe dezvoltate de către OpenSSL Project pentru a fi f
<message>
<location filename="../addressbookpage.cpp" line="-30"/>
<source>Choose the address to send coins to</source>
- <translation type="unfinished"/>
+ <translation>Alegeti adresa unde vreti sa trimiteti monezile</translation>
</message>
<message>
<location line="+1"/>
<source>Choose the address to receive coins with</source>
- <translation type="unfinished"/>
+ <translation>Alegeti adresa unde vreti sa primiti monezile</translation>
</message>
<message>
<location line="+5"/>
<source>C&amp;hoose</source>
- <translation type="unfinished"/>
+ <translation>&amp;Alege</translation>
</message>
<message>
<location line="+6"/>
<source>Sending addresses</source>
- <translation type="unfinished"/>
+ <translation>Adresa Destinatarului</translation>
</message>
<message>
<location line="+1"/>
<source>Receiving addresses</source>
- <translation type="unfinished"/>
+ <translation>Adresa pe care primiti</translation>
</message>
<message>
<location line="+7"/>
<source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
- <translation type="unfinished"/>
+ <translation>Acestea sunt adresele dumneavoastra Bitcoin care pot fi folosite la trimiterea platilor. Verificati totdeauna cantitatea si adresa de primire inainte de a trimite monezi.</translation>
</message>
<message>
<location line="+4"/>
<source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
- <translation type="unfinished"/>
+ <translation>Acestea sunt adresele dumneavoastra Bitcoin folosite pentru a primi plati. Este recomandat sa folositi cate o adresa noua de primire pentru fiecare tranzactie in parte.</translation>
</message>
<message>
<location line="+7"/>
@@ -140,9 +140,9 @@ Acest produs include programe dezvoltate de către OpenSSL Project pentru a fi f
<translation>&amp;Editează</translation>
</message>
<message>
- <location line="+197"/>
+ <location line="+194"/>
<source>Export Address List</source>
- <translation type="unfinished"/>
+ <translation>Exportati Agenda</translation>
</message>
<message>
<location line="+1"/>
@@ -151,19 +151,19 @@ Acest produs include programe dezvoltate de către OpenSSL Project pentru a fi f
</message>
<message>
<location line="+13"/>
- <source>Error exporting</source>
- <translation>Eroare la exportare</translation>
+ <source>Exporting Failed</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation>Nu s-a putut scrie în fișierul %1.</translation>
+ <location line="+1"/>
+ <source>There was an error trying to save the address list to %1.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<name>AddressTableModel</name>
<message>
- <location filename="../addresstablemodel.cpp" line="+164"/>
+ <location filename="../addresstablemodel.cpp" line="+168"/>
<source>Label</source>
<translation>Etichetă</translation>
</message>
@@ -201,7 +201,7 @@ Acest produs include programe dezvoltate de către OpenSSL Project pentru a fi f
<translation>Repetă noua frază de acces</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="+34"/>
+ <location filename="../askpassphrasedialog.cpp" line="+40"/>
<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>Introdu noua parolă a portofelului electronic.&lt;br/&gt;Te rog folosește &lt;b&gt;minim 10 caractere aleatoare&lt;/b&gt;, sau &lt;b&gt;minim 8 cuvinte&lt;/b&gt;.</translation>
</message>
@@ -258,7 +258,7 @@ Acest produs include programe dezvoltate de către OpenSSL Project pentru a fi f
<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: Orice copie de siguranta facuta in prealabil portofelului dumneavoastra ar trebui inlocuita cu cea generata cel mai recent fisier criptat al portofelului. Pentru siguranta, copiile de siguranta vechi ale portofelului ne-criptat vor deveni inutile de indata ce veti incepe folosirea noului fisier criptat al portofelului.</translation>
</message>
<message>
<location line="+100"/>
@@ -322,22 +322,27 @@ Acest produs include programe dezvoltate de către OpenSSL Project pentru a fi f
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+250"/>
+ <location filename="../bitcoingui.cpp" line="+295"/>
<source>Sign &amp;message...</source>
<translation>Semnează &amp;mesaj...</translation>
</message>
<message>
- <location line="+254"/>
+ <location line="+335"/>
<source>Synchronizing with network...</source>
<translation>Se sincronizează cu rețeaua...</translation>
</message>
<message>
- <location line="-324"/>
+ <location line="-407"/>
<source>&amp;Overview</source>
<translation>&amp;Imagine de ansamblu</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="-137"/>
+ <source>Node</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+138"/>
<source>Show general overview of wallet</source>
<translation>Arată o stare generală de ansamblu a portofelului</translation>
</message>
@@ -352,7 +357,7 @@ Acest produs include programe dezvoltate de către OpenSSL Project pentru a fi f
<translation>Răsfoiește istoricul tranzacțiilor</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>E&amp;xit</source>
<translation>&amp;Ieșire</translation>
</message>
@@ -398,7 +403,22 @@ Acest produs include programe dezvoltate de către OpenSSL Project pentru a fi f
<translation>S&amp;chimbă parola...</translation>
</message>
<message>
- <location line="+259"/>
+ <location line="+10"/>
+ <source>&amp;Sending addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Receiving addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open &amp;URI...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+325"/>
<source>Importing blocks from disk...</source>
<translation>Importare blocks de pe disk...</translation>
</message>
@@ -408,12 +428,12 @@ Acest produs include programe dezvoltate de către OpenSSL Project pentru a fi f
<translation>Se reindexează blocurile pe disc...</translation>
</message>
<message>
- <location line="-322"/>
+ <location line="-405"/>
<source>Send coins to a Bitcoin address</source>
<translation>Trimite monede către o adresă Bitcoin</translation>
</message>
<message>
- <location line="+47"/>
+ <location line="+49"/>
<source>Modify configuration options for Bitcoin</source>
<translation>Modifică opțiunile de configurare pentru Bitcoin</translation>
</message>
@@ -443,20 +463,17 @@ Acest produs include programe dezvoltate de către OpenSSL Project pentru a fi f
<translation>&amp;Verifică mesajul...</translation>
</message>
<message>
- <location line="-180"/>
- <location line="+6"/>
- <location line="+513"/>
+ <location line="+430"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-519"/>
- <location line="+6"/>
+ <location line="-643"/>
<source>Wallet</source>
<translation>Portofelul</translation>
</message>
<message>
- <location line="+109"/>
+ <location line="+146"/>
<source>&amp;Send</source>
<translation>&amp;Trimite</translation>
</message>
@@ -466,13 +483,7 @@ Acest produs include programe dezvoltate de către OpenSSL Project pentru a fi f
<translation>&amp;Primește</translation>
</message>
<message>
- <location line="+28"/>
- <location line="+2"/>
- <source>&amp;About Bitcoin</source>
- <translation>&amp;Despre Bitcoin</translation>
- </message>
- <message>
- <location line="+14"/>
+ <location line="+46"/>
<location line="+2"/>
<source>&amp;Show / Hide</source>
<translation>Arata/Ascunde</translation>
@@ -498,76 +509,92 @@ Acest produs include programe dezvoltate de către OpenSSL Project pentru a fi f
<translation>Verifică mesaje pentru a te asigura că au fost semnate cu adresa Bitcoin specificată</translation>
</message>
<message>
- <location line="+35"/>
+ <location line="+48"/>
<source>&amp;File</source>
<translation>&amp;Fișier</translation>
</message>
<message>
- <location line="+10"/>
+ <location line="+14"/>
<source>&amp;Settings</source>
<translation>&amp;Setări</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>&amp;Help</source>
<translation>A&amp;jutor</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+15"/>
<source>Tabs toolbar</source>
<translation>Bara de file</translation>
</message>
<message>
- <location line="-235"/>
- <location line="+294"/>
+ <location line="-284"/>
+ <location line="+376"/>
<source>[testnet]</source>
<translation>[testnet]</translation>
</message>
<message>
- <location line="-177"/>
+ <location line="-401"/>
+ <source>Bitcoin Core</source>
+ <translation>Bitcoin Core</translation>
+ </message>
+ <message>
+ <location line="+163"/>
<source>Request payments (generates QR codes and bitcoin: URIs)</source>
- <translation type="unfinished"/>
+ <translation>Cereti plati (genereaza coduri QR si bitcoin-uri: URls)</translation>
</message>
<message>
- <location line="+63"/>
- <source>&amp;Used sending addresses...</source>
- <translation type="unfinished"/>
+ <location line="+29"/>
+ <location line="+2"/>
+ <source>&amp;About Bitcoin Core</source>
+ <translation>&amp;Despre Nucleul Bitcoin</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+35"/>
<source>Show the list of used sending addresses and labels</source>
- <translation type="unfinished"/>
+ <translation>Aratati lista de adrese trimise si etichete folosite.</translation>
</message>
<message>
- <location line="+1"/>
- <source>Used &amp;receiving addresses...</source>
+ <location line="+2"/>
+ <source>Show the list of used receiving addresses and labels</source>
+ <translation>Aratati lista de adrese pentru primire si etichete </translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open a bitcoin: URI or payment request</source>
+ <translation>Deschideti un bitcoin: o adresa URI sau o cerere de plata</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Command-line options</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
- <source>Show the list of used receiving addresses and labels</source>
+ <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+106"/>
+ <location line="+159"/>
<location line="+5"/>
<source>Bitcoin client</source>
<translation>Client Bitcoin</translation>
</message>
<message numerus="yes">
- <location line="+120"/>
+ <location line="+142"/>
<source>%n active connection(s) to Bitcoin network</source>
<translation><numerusform>%n conexiune activă către rețeaua Bitcoin</numerusform><numerusform>%n conexiuni active către rețeaua Bitcoin</numerusform><numerusform>%n de conexiuni active către rețeaua Bitcoin</numerusform></translation>
</message>
<message>
<location line="+22"/>
<source>No block source available...</source>
- <translation type="unfinished"/>
+ <translation>Nici o sursă de bloc disponibil ...</translation>
</message>
<message>
<location line="+12"/>
<source>Processed %1 of %2 (estimated) blocks of transaction history.</source>
- <translation type="unfinished"/>
+ <translation>S-a procesat %1 din %2 block-uri (estimate) din istoria tranzactiei.</translation>
</message>
<message>
<location line="+4"/>
@@ -575,7 +602,7 @@ Acest produs include programe dezvoltate de către OpenSSL Project pentru a fi f
<translation>S-au procesat %1 blocuri din istoricul tranzacțiilor.</translation>
</message>
<message numerus="yes">
- <location line="+20"/>
+ <location line="+23"/>
<source>%n hour(s)</source>
<translation><numerusform>%n oră</numerusform><numerusform>%n ore</numerusform><numerusform>%n ore</numerusform></translation>
</message>
@@ -595,14 +622,14 @@ Acest produs include programe dezvoltate de către OpenSSL Project pentru a fi f
<translation>%1 în urmă</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="+21"/>
<source>Last received block was generated %1 ago.</source>
<translation>Ultimul bloc recepționat a fost generat acum %1.</translation>
</message>
<message>
<location line="+2"/>
<source>Transactions after this will not yet be visible.</source>
- <translation type="unfinished"/>
+ <translation>Tranzacții după aceasta nu va fi încă disponibile.</translation>
</message>
<message>
<location line="+27"/>
@@ -620,27 +647,17 @@ Acest produs include programe dezvoltate de către OpenSSL Project pentru a fi f
<translation>Informație</translation>
</message>
<message>
- <location line="+77"/>
- <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="-152"/>
+ <location line="-85"/>
<source>Up to date</source>
<translation>Actualizat</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Catching up...</source>
<translation>Se actualizează...</translation>
</message>
<message>
- <location line="+124"/>
- <source>Confirm transaction fee</source>
- <translation>Confirmă taxa de tranzacție</translation>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+130"/>
<source>Sent transaction</source>
<translation>Tranzacție expediată</translation>
</message>
@@ -663,17 +680,7 @@ Adresa: %4
</translation>
</message>
<message>
- <location line="+34"/>
- <source>URI handling</source>
- <translation>Gestionare URI</translation>
- </message>
- <message>
- <location line="+0"/>
- <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="+45"/>
+ <location line="+69"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation>Portofelul este &lt;b&gt;criptat&lt;/b&gt; iar în momentul de față este &lt;b&gt;deblocat&lt;/b&gt;</translation>
</message>
@@ -683,20 +690,312 @@ Adresa: %4
<translation>Portofelul este &lt;b&gt;criptat&lt;/b&gt; iar în momentul de față este &lt;b&gt;blocat&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+110"/>
+ <location filename="../bitcoin.cpp" line="+438"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
- <translation type="unfinished"/>
+ <translation>A survenit o eroare fatala. Bitcoin nu mai poate continua in siguranta si se va opri.</translation>
</message>
</context>
<context>
<name>ClientModel</name>
<message>
- <location filename="../clientmodel.cpp" line="+115"/>
+ <location filename="../clientmodel.cpp" line="+119"/>
<source>Network Alert</source>
<translation>Alertă rețea</translation>
</message>
</context>
<context>
+ <name>CoinControlDialog</name>
+ <message>
+ <location filename="../forms/coincontroldialog.ui" line="+14"/>
+ <source>Coin Control Address Selection</source>
+ <translation>Selectare Adresă de Comandă Monedă</translation>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>Quantity:</source>
+ <translation>Cantitate:</translation>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Bytes:</source>
+ <translation>Octeţi:</translation>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>Amount:</source>
+ <translation>Sumă:</translation>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Priority:</source>
+ <translation>Prioritate:</translation>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>Fee:</source>
+ <translation>Taxa:</translation>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Low Output:</source>
+ <translation>Ieşire minimă: </translation>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>After Fee:</source>
+ <translation>După taxe:</translation>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Change:</source>
+ <translation>Schimb:</translation>
+ </message>
+ <message>
+ <location line="+63"/>
+ <source>(un)select all</source>
+ <translation>(de)selectaţi tot</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Tree mode</source>
+ <translation>Modul arborescent</translation>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>List mode</source>
+ <translation>Modul lista</translation>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>Amount</source>
+ <translation>Sumă</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Address</source>
+ <translation>Adresă</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Date</source>
+ <translation>Data</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Confirmations</source>
+ <translation>Confirmări</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Confirmed</source>
+ <translation>Confirmat</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Priority</source>
+ <translation>Prioritate</translation>
+ </message>
+ <message>
+ <location filename="../coincontroldialog.cpp" line="+42"/>
+ <source>Copy address</source>
+ <translation>Copiază adresa</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy label</source>
+ <translation>Copiază eticheta</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+26"/>
+ <source>Copy amount</source>
+ <translation>Copiază suma</translation>
+ </message>
+ <message>
+ <location line="-25"/>
+ <source>Copy transaction ID</source>
+ <translation>Copiază ID tranzacție</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Lock unspent</source>
+ <translation>Blocaţi necheltuite</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Unlock unspent</source>
+ <translation>Deblocaţi necheltuite</translation>
+ </message>
+ <message>
+ <location line="+22"/>
+ <source>Copy quantity</source>
+ <translation>Copiaţi quantitea</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Copy fee</source>
+ <translation>Copiaţi taxele</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy after fee</source>
+ <translation>Copiaţi după taxe</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy bytes</source>
+ <translation>Copiaţi octeţi</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy priority</source>
+ <translation>Copiaţi prioritatea</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy low output</source>
+ <translation>Copiaţi ieşire minimă:</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy change</source>
+ <translation>Copiaţi schimb</translation>
+ </message>
+ <message>
+ <location line="+323"/>
+ <source>highest</source>
+ <translation>cel mai mare</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>higher</source>
+ <translation>mai mare</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>high</source>
+ <translation>mare</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>medium-high</source>
+ <translation>marime medie</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>medium</source>
+ <translation>mediu</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>low-medium</source>
+ <translation>mediu-scazut</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>low</source>
+ <translation>scazut</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>lower</source>
+ <translation>mai scazut</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>lowest</source>
+ <translation>cel mai scazut</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>(%1 locked)</source>
+ <translation>(1% blocat)</translation>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+140"/>
+ <source>Dust</source>
+ <translation>Praf</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>yes</source>
+ <translation>da</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>no</source>
+ <translation>nu</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>This label turns red, if the transaction size is greater than 1000 bytes.</source>
+ <translation>Această etichetă devine roşie, în cazul în care dimensiunea tranzacţiei este mai mare de 1000 de octeţi. </translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+5"/>
+ <source>This means a fee of at least %1 per kB is required.</source>
+ <translation>Aceasta înseamnă o taxă de cel puţin 1% pe kB necesar.</translation>
+ </message>
+ <message>
+ <location line="-4"/>
+ <source>Can vary +/- 1 byte per input.</source>
+ <translation>Poate varia +/- 1 octet pentru fiecare intrare. </translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Transactions with higher priority are more likely to get included into a block.</source>
+ <translation>Tranzacţiile cu prioritate mai mare sunt mai susceptibile de fi incluse într-un bloc. </translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>This label turns red, if the priority is smaller than &quot;medium&quot;.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>This label turns red, if any recipient receives an amount smaller than %1.</source>
+ <translation>Această etichetă devine roşie, dacă orice beneficiar primeşte o sumă mai mică decât 1. </translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+4"/>
+ <source>This means a fee of at least %1 is required.</source>
+ <translation>Aceasta înseamnă că o taxă de cel puţin 1% este necesară. </translation>
+ </message>
+ <message>
+ <location line="-3"/>
+ <source>Amounts below 0.546 times the minimum relay fee are shown as dust.</source>
+ <translation>Sume sub 0,546 ori taxa minima sunt indicate ca ignorate. </translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>This label turns red, if the change is smaller than %1.</source>
+ <translation>Această etichetă devine roşie, dacă schimbul e mai mic de 1%.</translation>
+ </message>
+ <message>
+ <location line="+43"/>
+ <location line="+66"/>
+ <source>(no label)</source>
+ <translation>(fără etichetă)</translation>
+ </message>
+ <message>
+ <location line="-9"/>
+ <source>change from %1 (%2)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>(change)</source>
+ <translation>(schimb)</translation>
+ </message>
+</context>
+<context>
<name>EditAddressDialog</name>
<message>
<location filename="../forms/editaddressdialog.ui" line="+14"/>
@@ -711,12 +1010,12 @@ Adresa: %4
<message>
<location line="+10"/>
<source>The label associated with this address list entry</source>
- <translation type="unfinished"/>
+ <translation>Etichetele asociate cu aceasta intrare din lista.</translation>
</message>
<message>
<location line="+17"/>
<source>The address associated with this address list entry. This can only be modified for sending addresses.</source>
- <translation type="unfinished"/>
+ <translation>Adresa asociata cu aceasta adresa din lista. Aceasta poate fi modificata doar pentru Destinatari.</translation>
</message>
<message>
<location line="-10"/>
@@ -724,7 +1023,7 @@ Adresa: %4
<translation>&amp;Adresă</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+21"/>
+ <location filename="../editaddressdialog.cpp" line="+28"/>
<source>New receiving address</source>
<translation>Noua adresă de primire</translation>
</message>
@@ -767,7 +1066,7 @@ Adresa: %4
<context>
<name>FreespaceChecker</name>
<message>
- <location filename="../intro.cpp" line="+61"/>
+ <location filename="../intro.cpp" line="+65"/>
<source>A new data directory will be created.</source>
<translation>Va fi creat un nou dosar de date.</translation>
</message>
@@ -793,15 +1092,19 @@ Adresa: %4
</message>
</context>
<context>
- <name>GUIUtil::HelpMessageBox</name>
+ <name>HelpMessageDialog</name>
<message>
- <location filename="../guiutil.cpp" line="+558"/>
- <location line="+13"/>
- <source>Bitcoin-Qt</source>
- <translation>Bitcoin-Qt</translation>
+ <location filename="../forms/helpmessagedialog.ui" line="+19"/>
+ <source>Bitcoin Core - Command-line options</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="-13"/>
+ <location filename="../utilitydialog.cpp" line="+38"/>
+ <source>Bitcoin Core</source>
+ <translation>Bitcoin Core</translation>
+ </message>
+ <message>
+ <location line="+0"/>
<source>version</source>
<translation>versiunea</translation>
</message>
@@ -850,18 +1153,18 @@ Adresa: %4
</message>
<message>
<location line="+9"/>
- <source>Welcome to Bitcoin-Qt.</source>
- <translation>Bun venit la Bitcoin-Qt.</translation>
+ <source>Welcome to Bitcoin Core.</source>
+ <translation>Bine AÅ£i Venit la Nucleul Bitcoin.</translation>
</message>
<message>
<location line="+26"/>
- <source>As this is the first time the program is launched, you can choose where Bitcoin-Qt will store its data.</source>
- <translation>Deoarece este prima lansare a programului poți alege unde Bitcoin-Qt va stoca datele sale.</translation>
+ <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
+ <translation>Dacă aceasta este prima dată când programul este lansat, puteţi alege unde Nucleul Bitcoin va stoca datele. </translation>
</message>
<message>
<location line="+10"/>
- <source>Bitcoin-Qt will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
- <translation>Bitcoin-Qt va descărca și stoca o copie a lanțului de blocuri Bicoin. Cel puțin %1GB de date vor fi stocate în acest dosar și necesarul va crește în timp. De asemenea și portofelul va fi ținut în acest dosar.</translation>
+ <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
+ <translation>Nucleul Bitcoin Core se va descărca şi va stoca o copie a lanţului blocului Bitcoin. Cel puţin 1GB de date vor fi stocate in acest dosar şi se va dezvolta în timp. Portofelul va fi, de asemenea, stocat în acest dosar.</translation>
</message>
<message>
<location line="+10"/>
@@ -874,7 +1177,17 @@ Adresa: %4
<translation>Folosește un dosar de date personalizat:</translation>
</message>
<message>
- <location filename="../intro.cpp" line="+105"/>
+ <location filename="../intro.cpp" line="+85"/>
+ <source>Bitcoin</source>
+ <translation>Bitcoin</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error: Specified data directory &quot;%1&quot; can not be created.</source>
+ <translation>Eroare: Directorul datelor specificate &quot;%1&quot; nu poate fi creat.</translation>
+ </message>
+ <message>
+ <location line="+19"/>
<source>Error</source>
<translation>Eroare</translation>
</message>
@@ -890,6 +1203,34 @@ Adresa: %4
</message>
</context>
<context>
+ <name>OpenURIDialog</name>
+ <message>
+ <location filename="../forms/openuridialog.ui" line="+14"/>
+ <source>Open URI</source>
+ <translation>Deschideti adresa URI</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Open payment request from URI or file</source>
+ <translation>Deschideţi cerere de plată prin intermediul adresei URI sau a fişierului</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>URI:</source>
+ <translation>adresa URI:</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Select payment request file</source>
+ <translation>Selectaţi fişierul de cerere de plată</translation>
+ </message>
+ <message>
+ <location filename="../openuridialog.cpp" line="+47"/>
+ <source>Select payment request file to open</source>
+ <translation>Selectaţi fişierul de cerere de plată de deschis</translation>
+ </message>
+</context>
+<context>
<name>OptionsDialog</name>
<message>
<location filename="../forms/optionsdialog.ui" line="+14"/>
@@ -897,14 +1238,14 @@ Adresa: %4
<translation>Setări</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+13"/>
<source>&amp;Main</source>
<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.</source>
- <translation type="unfinished"/>
+ <translation>Taxa optionala de tranzactie per kB care ajuta ca tranzactiile dumneavoastra sa fie procesate rapid. Majoritatea tranzactiilor sunt 1 kB.</translation>
</message>
<message>
<location line="+15"/>
@@ -922,7 +1263,52 @@ Adresa: %4
<translation>&amp;S PorneÅŸte Bitcoin la pornirea sistemului</translation>
</message>
<message>
- <location line="+35"/>
+ <location line="+9"/>
+ <source>Size of &amp;database cache</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set database cache size in megabytes (default: 25)</source>
+ <translation>Setează mărimea cache a bazei de date în megabiți (implicit: 25)</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>MB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Number of script &amp;verification threads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Connect to the Bitcoin network through a SOCKS proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Connect through SOCKS proxy (default proxy):</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+224"/>
+ <source>Active command-line options that override above options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
<source>Reset all client options to default.</source>
<translation>Resetează toate setările clientului la valorile implicite.</translation>
</message>
@@ -932,7 +1318,7 @@ Adresa: %4
<translation>&amp;Resetează opțiunile</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="-323"/>
<source>&amp;Network</source>
<translation>&amp;Retea</translation>
</message>
@@ -947,32 +1333,17 @@ Adresa: %4
<translation>Mapeaza portul folosind &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>Conectare la reţeaua Bitcoin folosind un proxy SOCKS (de exemplu, când conexiunea se stabileşte prin reţeaua Tor)</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>&amp;Connect through SOCKS proxy:</source>
- <translation>&amp;Conectează prin proxy SOCKS:</translation>
- </message>
- <message>
- <location line="+9"/>
+ <location line="+19"/>
<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>Adresa de IP a proxy serverului (de exemplu: 127.0.0.1)</translation>
- </message>
- <message>
- <location line="+7"/>
+ <location line="+32"/>
<source>&amp;Port:</source>
<translation>&amp;Port:</translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+25"/>
<source>Port of the proxy (e.g. 9050)</source>
<translation>Portul pe care se concetează proxy serverul (de exemplu: 9050)</translation>
</message>
@@ -1047,7 +1418,17 @@ Adresa: %4
<translation>&amp;Afişează adresele în lista de tranzacţii</translation>
</message>
<message>
- <location line="+71"/>
+ <location line="+7"/>
+ <source>Whether to show coin control features or not.</source>
+ <translation>Dacă să se afişeze controlul caracteristicilor monedei sau nu.</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Display coin &amp;control features (experts only)</source>
+ <translation>Afişeare controlul caracteristicilor monedei (doat pentru experţi)</translation>
+ </message>
+ <message>
+ <location line="+136"/>
<source>&amp;OK</source>
<translation>&amp; OK</translation>
</message>
@@ -1057,44 +1438,38 @@ Adresa: %4
<translation>&amp; Renunta</translation>
</message>
<message>
- <location line="+10"/>
- <source>&amp;Apply</source>
- <translation>Aplica</translation>
- </message>
- <message>
- <location filename="../optionsdialog.cpp" line="+58"/>
+ <location filename="../optionsdialog.cpp" line="+67"/>
<source>default</source>
<translation>Initial</translation>
</message>
<message>
- <location line="+130"/>
+ <location line="+57"/>
+ <source>none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+75"/>
<source>Confirm options reset</source>
<translation>Confirmă resetarea opțiunilor</translation>
</message>
<message>
<location line="+1"/>
- <source>Some settings may require a client restart to take effect.</source>
- <translation>Pentru unele setări este necesară repornirea clientului pentru a avea efect.</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Do you want to proceed?</source>
- <translation>Vrei să continui?</translation>
+ <location line="+29"/>
+ <source>Client restart required to activate changes.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
- <location line="+9"/>
- <source>Warning</source>
- <translation>Atentie!</translation>
+ <location line="-29"/>
+ <source>Client will be shutdown, do you want to proceed?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="-9"/>
- <location line="+9"/>
- <source>This setting will take effect after restarting Bitcoin.</source>
- <translation>Această setare va avea efect după repornirea Bitcoin.</translation>
+ <location line="+33"/>
+ <source>This change would require a client restart.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+29"/>
+ <location line="+34"/>
<source>The supplied proxy address is invalid.</source>
<translation>Adresa bitcoin pe care a-ti specificat-o este invalida</translation>
</message>
@@ -1108,22 +1483,22 @@ Adresa: %4
</message>
<message>
<location line="+50"/>
- <location line="+202"/>
+ <location line="+231"/>
<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>Informațiile afișate pot neactualizate. Portofelul tău se sincronizează automat cu rețeaua Bitcoin după ce o conexiune este stabilită, dar acest proces nu a fost finalizat încă.</translation>
</message>
<message>
- <location line="-131"/>
+ <location line="-155"/>
<source>Unconfirmed:</source>
<translation>Neconfirmat:</translation>
</message>
<message>
- <location line="-78"/>
+ <location line="-83"/>
<source>Wallet</source>
<translation>Portofel</translation>
</message>
<message>
- <location line="+49"/>
+ <location line="+51"/>
<source>Confirmed:</source>
<translation>Confirmat:</translation>
</message>
@@ -1133,12 +1508,12 @@ Adresa: %4
<translation>Balanța ta curentă de cheltuieli</translation>
</message>
<message>
- <location line="+29"/>
+ <location line="+32"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation>Totalul tranzacțiilor care nu sunt confirmate încă și care nu sunt încă adunate la balanța de cheltuieli</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+16"/>
<source>Immature:</source>
<translation>Nematurizat:</translation>
</message>
@@ -1148,7 +1523,7 @@ Adresa: %4
<translation>Balanta minata care nu s-a maturizat inca</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+16"/>
<source>Total:</source>
<translation>Total:</translation>
</message>
@@ -1158,12 +1533,12 @@ Adresa: %4
<translation>Balanța totală curentă</translation>
</message>
<message>
- <location line="+53"/>
+ <location line="+71"/>
<source>&lt;b&gt;Recent transactions&lt;/b&gt;</source>
<translation>&lt;b&gt;Tranzacții recente&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../overviewpage.cpp" line="+116"/>
+ <location filename="../overviewpage.cpp" line="+120"/>
<location line="+1"/>
<source>out of sync</source>
<translation>Nu este sincronizat</translation>
@@ -1172,55 +1547,93 @@ Adresa: %4
<context>
<name>PaymentServer</name>
<message>
- <location filename="../paymentserver.cpp" line="+392"/>
+ <location filename="../paymentserver.cpp" line="+403"/>
+ <location line="+13"/>
<source>URI handling</source>
<translation>Gestionare URI</translation>
</message>
<message>
<location line="+1"/>
<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 nu poate fi analizat! Acest lucru poate fi cauzat de o adresa Bitcoin invalida sau parametri deformati URI.</translation>
</message>
<message>
- <location line="+69"/>
+ <location line="+96"/>
<source>Requested payment amount of %1 is too small (considered dust).</source>
- <translation type="unfinished"/>
+ <translation>Cereti plata cu suma de %1 este prea mica (considerata praf)</translation>
</message>
<message>
- <location line="+4"/>
- <location line="+37"/>
+ <location line="-221"/>
+ <location line="+212"/>
+ <location line="+13"/>
+ <location line="+95"/>
+ <location line="+18"/>
+ <location line="+16"/>
<source>Payment request error</source>
<translation>Eroare la cererea de plată</translation>
</message>
<message>
+ <location line="-353"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
+ <translation>Nu poate porni bitcoin: regula clic-pentru-plata</translation>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Net manager warning</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+1"/>
- <source>Insecure requests to custom payment scripts unsupported</source>
- <translation>Cererile nesecurizate către scripturi personalizate de plăți nu sunt suportate</translation>
+ <source>Your active proxy doesn&apos;t support SOCKS5, which is required for payment requests via proxy.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+38"/>
- <source>Refund from %1</source>
+ <location line="+52"/>
+ <source>Payment request fetch URL is invalid: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
+ <location line="+27"/>
+ <source>Payment request file handling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Payment request file can not be read or processed! This can be caused by an invalid payment request file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+73"/>
+ <source>Unverified payment requests to custom payment scripts are unsupported.</source>
+ <translation>Cereri de plată neverificate prin script-uri personalizate de plată nu sunt suportate.</translation>
+ </message>
+ <message>
+ <location line="+59"/>
+ <source>Refund from %1</source>
+ <translation>rambursare de la %1</translation>
+ </message>
+ <message>
+ <location line="+43"/>
<source>Error communicating with %1: %2</source>
<translation>Eroare la comunicarea cu %1: %2</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+24"/>
+ <source>Payment request can not be parsed or processed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
<source>Bad response from server %1</source>
<translation>Răspuns greșit de la server %1</translation>
</message>
<message>
- <location line="+32"/>
+ <location line="+33"/>
<source>Payment acknowledged</source>
<translation>Plată acceptată</translation>
</message>
<message>
- <location line="-58"/>
- <location line="+30"/>
- <location line="+17"/>
+ <location line="-11"/>
<source>Network request error</source>
<translation>Eroare în cererea de rețea</translation>
</message>
@@ -1228,39 +1641,33 @@ Adresa: %4
<context>
<name>QObject</name>
<message>
- <location filename="../bitcoin.cpp" line="+114"/>
- <location line="+5"/>
- <location filename="../intro.cpp" line="-32"/>
+ <location filename="../bitcoin.cpp" line="+71"/>
+ <location line="+11"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-4"/>
+ <location line="+1"/>
<source>Error: Specified data directory &quot;%1&quot; does not exist.</source>
- <translation type="unfinished"/>
+ <translation>Eroare: Directorul datelor specificate &quot;%1&quot; nu exista.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="-12"/>
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation>Eroare: combinație nevalidă de -regtest și -testnet.</translation>
</message>
- <message>
- <location filename="../intro.cpp" line="+1"/>
- <source>Error: Specified data directory &quot;%1&quot; can not be created.</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>QRImageWidget</name>
<message>
- <location filename="../receiverequestdialog.cpp" line="+32"/>
+ <location filename="../receiverequestdialog.cpp" line="+36"/>
<source>&amp;Save Image...</source>
- <translation type="unfinished"/>
+ <translation>Salvarea imaginii ...</translation>
</message>
<message>
<location line="+3"/>
<source>&amp;Copy Image</source>
- <translation type="unfinished"/>
+ <translation>Copierea imaginii</translation>
</message>
<message>
<location line="+28"/>
@@ -1269,8 +1676,8 @@ Adresa: %4
</message>
<message>
<location line="+0"/>
- <source>PNG Images (*.png)</source>
- <translation>Imagini PNG (*.png)</translation>
+ <source>PNG Image (*.png)</source>
+ <translation>Imagine de tip PNG (*.png)</translation>
</message>
</context>
<context>
@@ -1287,15 +1694,16 @@ Adresa: %4
<location line="+23"/>
<location line="+23"/>
<location line="+36"/>
- <location line="+53"/>
+ <location line="+23"/>
+ <location line="+36"/>
<location line="+23"/>
<location line="+23"/>
- <location filename="../rpcconsole.cpp" line="+352"/>
+ <location filename="../rpcconsole.cpp" line="+359"/>
<source>N/A</source>
<translation>N/A</translation>
</message>
<message>
- <location line="-217"/>
+ <location line="-223"/>
<source>Client version</source>
<translation>Versiune client</translation>
</message>
@@ -1305,7 +1713,17 @@ Adresa: %4
<translation>&amp;Informație</translation>
</message>
<message>
- <location line="+68"/>
+ <location line="-10"/>
+ <source>Debug window</source>
+ <translation>Fereastra de depanare</translation>
+ </message>
+ <message>
+ <location line="+25"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+53"/>
<source>Using OpenSSL version</source>
<translation>Foloseste versiunea OpenSSL</translation>
</message>
@@ -1321,16 +1739,16 @@ Adresa: %4
</message>
<message>
<location line="+7"/>
- <source>Number of connections</source>
- <translation>Numărul de conexiuni</translation>
+ <source>Name</source>
+ <translation>Numele</translation>
</message>
<message>
<location line="+23"/>
- <source>On testnet</source>
- <translation>Pe testnet</translation>
+ <source>Number of connections</source>
+ <translation>Numărul de conexiuni</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+29"/>
<source>Block chain</source>
<translation>LanÈ› de blocuri</translation>
</message>
@@ -1355,21 +1773,6 @@ Adresa: %4
<translation>&amp;Deschide</translation>
</message>
<message>
- <location line="+16"/>
- <source>Command-line options</source>
- <translation>Command-line setări</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>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>&amp; Arata</translation>
- </message>
- <message>
<location line="+24"/>
<source>&amp;Console</source>
<translation>&amp;Consolă</translation>
@@ -1377,45 +1780,35 @@ Adresa: %4
<message>
<location line="+72"/>
<source>&amp;Network Traffic</source>
- <translation type="unfinished"/>
+ <translation>Traficul in rețea</translation>
</message>
<message>
<location line="+52"/>
<source>&amp;Clear</source>
- <translation type="unfinished"/>
+ <translation>&amp;Ştergeţi</translation>
</message>
<message>
<location line="+13"/>
<source>Totals</source>
- <translation type="unfinished"/>
+ <translation>Totaluri</translation>
</message>
<message>
<location line="+64"/>
<source>In:</source>
- <translation type="unfinished"/>
+ <translation>în:</translation>
</message>
<message>
<location line="+80"/>
<source>Out:</source>
- <translation type="unfinished"/>
+ <translation>Ieșire.</translation>
</message>
<message>
- <location line="-541"/>
+ <location line="-521"/>
<source>Build date</source>
<translation>Construit la data</translation>
</message>
<message>
- <location line="-104"/>
- <source>Bitcoin - Debug window</source>
- <translation>Bitcoin-Fereastra pentru debug</translation>
- </message>
- <message>
- <location line="+25"/>
- <source>Bitcoin Core</source>
- <translation>Bitcoin Core</translation>
- </message>
- <message>
- <location line="+279"/>
+ <location line="+206"/>
<source>Debug log file</source>
<translation>Loguri debug</translation>
</message>
@@ -1425,7 +1818,7 @@ Adresa: %4
<translation>Deschide logurile debug din directorul curent. Aceasta poate dura cateva secunde pentru fisierele mai mari</translation>
</message>
<message>
- <location line="+102"/>
+ <location line="+76"/>
<source>Clear console</source>
<translation>Curăță consola</translation>
</message>
@@ -1445,101 +1838,126 @@ Adresa: %4
<translation>Scrie &lt;b&gt;help&lt;/b&gt; pentru a vedea comenzile disponibile</translation>
</message>
<message>
- <location line="+128"/>
+ <location line="+122"/>
<source>%1 B</source>
- <translation type="unfinished"/>
+ <translation>%1 B</translation>
</message>
<message>
<location line="+2"/>
<source>%1 KB</source>
- <translation type="unfinished"/>
+ <translation>%1 KB</translation>
</message>
<message>
<location line="+2"/>
<source>%1 MB</source>
- <translation type="unfinished"/>
+ <translation>%1 MB</translation>
</message>
<message>
<location line="+2"/>
<source>%1 GB</source>
- <translation type="unfinished"/>
+ <translation>%1 GB</translation>
</message>
<message>
<location line="+7"/>
<source>%1 m</source>
- <translation type="unfinished"/>
+ <translation>%1 m</translation>
</message>
<message>
<location line="+5"/>
<source>%1 h</source>
- <translation type="unfinished"/>
+ <translation>%1 h</translation>
</message>
<message>
<location line="+2"/>
<source>%1 h %2 m</source>
- <translation type="unfinished"/>
+ <translation>%1 ora %2 minute</translation>
</message>
</context>
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+22"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
<source>&amp;Amount:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+16"/>
- <source>The amount to request</source>
- <translation type="unfinished"/>
+ <translation>&amp; suma:</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="-13"/>
<source>&amp;Label:</source>
<translation>&amp;Etichetă:</translation>
</message>
<message>
- <location line="+10"/>
- <source>The label to associate with the receiving address</source>
- <translation type="unfinished"/>
+ <location line="-34"/>
+ <source>&amp;Message:</source>
+ <translation>&amp; mesaj:</translation>
</message>
<message>
- <location line="+7"/>
- <source>&amp;Message:</source>
- <translation type="unfinished"/>
+ <location line="-17"/>
+ <source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
+ <translation>Refolositi una din adresele de primire folosite in prealabil. Refolosirea adreselor poate crea probleme de securitate si confidentialitate. Nu folositi aceasta optiune decat daca o cerere de regenerare a platii a fost facuta in prealabil.</translation>
</message>
<message>
- <location line="+10"/>
- <source>The message to attach to payment request</source>
- <translation type="unfinished"/>
+ <location line="+3"/>
+ <source>R&amp;euse an existing receiving address (not recommended)</source>
+ <translation>&amp;Refolosirea unei adrese de primire (nu este recomandat)</translation>
</message>
<message>
- <location line="+14"/>
- <source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
+ <location line="+27"/>
+ <source>An optional label to associate with the new receiving address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>R&amp;euse an existing receiving address (not recommended)</source>
+ <location line="+7"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+7"/>
- <source>Use this form to request payments. All fields are optional.</source>
+ <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+39"/>
+ <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+17"/>
<source>Clear all fields of the form.</source>
- <translation type="unfinished"/>
+ <translation>Stergeti toate campurile formularului</translation>
</message>
<message>
<location line="+3"/>
<source>Clear</source>
- <translation type="unfinished"/>
+ <translation>Stergeti</translation>
</message>
<message>
<location line="+36"/>
<source>&amp;Request payment</source>
+ <translation>&amp;Cereti plata</translation>
+ </message>
+ <message>
+ <location line="+47"/>
+ <source>Requested payments</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Show the selected request (does the same as double clicking an entry)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Show</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Remove the selected entries from the list</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Remove</source>
<translation type="unfinished"/>
</message>
</context>
@@ -1548,42 +1966,37 @@ Adresa: %4
<message>
<location filename="../forms/receiverequestdialog.ui" line="+29"/>
<source>QR Code</source>
- <translation type="unfinished"/>
+ <translation>Cod QR</translation>
</message>
<message>
<location line="+46"/>
<source>Copy &amp;URI</source>
- <translation type="unfinished"/>
+ <translation>Copiati &amp;URl</translation>
</message>
<message>
<location line="+7"/>
<source>Copy &amp;Address</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+7"/>
- <source>&amp;Copy Image</source>
- <translation type="unfinished"/>
+ <translation>Copiati &amp;Adresa</translation>
</message>
<message>
<location line="+7"/>
<source>&amp;Save Image...</source>
- <translation type="unfinished"/>
+ <translation>Salvarea imaginii ...</translation>
</message>
<message>
- <location filename="../receiverequestdialog.cpp" line="+58"/>
+ <location filename="../receiverequestdialog.cpp" line="+56"/>
<source>Request payment to %1</source>
- <translation type="unfinished"/>
+ <translation>Cereti plata pentru %1</translation>
</message>
<message>
<location line="+6"/>
<source>Payment information</source>
- <translation type="unfinished"/>
+ <translation>Informatiile platii</translation>
</message>
<message>
<location line="+1"/>
<source>URI</source>
- <translation type="unfinished"/>
+ <translation>Identificator uniform de resurse</translation>
</message>
<message>
<location line="+2"/>
@@ -1617,16 +2030,119 @@ Adresa: %4
</message>
</context>
<context>
+ <name>RecentRequestsTableModel</name>
+ <message>
+ <location filename="../recentrequeststablemodel.cpp" line="+24"/>
+ <source>Date</source>
+ <translation>Data</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Label</source>
+ <translation>Etichetă</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Message</source>
+ <translation>Mesaj</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Amount</source>
+ <translation>Sumă</translation>
+ </message>
+ <message>
+ <location line="+38"/>
+ <source>(no label)</source>
+ <translation>(fără etichetă)</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>(no message)</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+140"/>
- <location line="+213"/>
+ <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location line="+80"/>
<source>Send Coins</source>
<translation>Trimite monede</translation>
</message>
<message>
- <location line="+50"/>
+ <location line="+76"/>
+ <source>Coin Control Features</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Inputs...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>automatically selected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Insufficient funds!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+89"/>
+ <source>Quantity:</source>
+ <translation>Cantitate:</translation>
+ </message>
+ <message>
+ <location line="+35"/>
+ <source>Bytes:</source>
+ <translation>Octeţi:</translation>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Amount:</source>
+ <translation>Sumă:</translation>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Priority:</source>
+ <translation>Prioritate:</translation>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Fee:</source>
+ <translation>Taxa:</translation>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Low Output:</source>
+ <translation>Ieşire minimă: </translation>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>After Fee:</source>
+ <translation>După taxe:</translation>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Change:</source>
+ <translation>Schimbaţi:</translation>
+ </message>
+ <message>
+ <location line="+44"/>
+ <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Custom change address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+115"/>
<source>Send to multiple recipients at once</source>
<translation>Trimite simultan către mai mulți destinatari</translation>
</message>
@@ -1638,7 +2154,7 @@ Adresa: %4
<message>
<location line="+20"/>
<source>Clear all fields of the form.</source>
- <translation type="unfinished"/>
+ <translation>Stergeti toate campurile formularului</translation>
</message>
<message>
<location line="+3"/>
@@ -1651,12 +2167,7 @@ Adresa: %4
<translation>Balanță:</translation>
</message>
<message>
- <location line="+10"/>
- <source>123.456 BTC</source>
- <translation>123.456 BTC</translation>
- </message>
- <message>
- <location line="+31"/>
+ <location line="+41"/>
<source>Confirm the send action</source>
<translation>Confirmă operațiunea de trimitere</translation>
</message>
@@ -1666,49 +2177,125 @@ Adresa: %4
<translation>&amp;S Trimite</translation>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-154"/>
+ <location filename="../sendcoinsdialog.cpp" line="-228"/>
<source>Confirm send coins</source>
<translation>Confirmă trimiterea de monede</translation>
</message>
<message>
- <location line="-90"/>
+ <location line="-74"/>
<location line="+5"/>
<location line="+5"/>
+ <location line="+4"/>
<source>%1 to %2</source>
+ <translation>%1 la %2</translation>
+ </message>
+ <message>
+ <location line="-136"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation>Introdu o adresă Bitcoin (de exemplu: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Copy quantity</source>
+ <translation>Copiaţi quantitea</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation>Copiază suma</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy fee</source>
+ <translation>Copiaţi taxele</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy after fee</source>
+ <translation>Copiaţi după taxe</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy bytes</source>
+ <translation>Copiaţi octeţi</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy priority</source>
+ <translation>Copiaţi prioritatea</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy low output</source>
+ <translation>Copiaţi ieşire minimă:</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy change</source>
+ <translation>Copiaţi schimb</translation>
+ </message>
+ <message>
+ <location line="+170"/>
+ <source>Total Amount %1 (= %2)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+26"/>
+ <location line="+2"/>
+ <source>or</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+202"/>
<source>The recipient address is not valid, please recheck.</source>
<translation>Adresa destinatarului nu este validă, vă rugăm să o verificaţi.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The amount to pay must be larger than 0.</source>
<translation>Suma de plată trebuie să fie mai mare decât 0.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The amount exceeds your balance.</source>
<translation>Suma depășește soldul contului.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The total exceeds your balance when the %1 transaction fee is included.</source>
<translation>Totalul depășește soldul contului dacă se include și plata comisionului de %1.</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+3"/>
<source>Duplicate address found, can only send to each address once per send operation.</source>
<translation>S-a descoperit o adresă care figurează de două ori. Expedierea se poate realiza către fiecare adresă doar o singură dată pe operațiune.</translation>
</message>
<message>
+ <location line="+3"/>
+ <source>Transaction creation failed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+4"/>
- <source>Error: Transaction creation failed!</source>
- <translation>Eroare: crearea tranzacției a eșuat! </translation>
+ <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+15"/>
+ <location line="+112"/>
+ <source>Warning: Invalid Bitcoin address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+21"/>
+ <source>(no label)</source>
+ <translation>(fără etichetă)</translation>
+ </message>
+ <message>
+ <location line="-11"/>
+ <source>Warning: Unknown change address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-366"/>
<source>Are you sure you want to send?</source>
<translation>Ești sigur că vrei să trimiți?</translation>
</message>
@@ -1718,17 +2305,7 @@ Adresa: %4
<translation>adăugat ca taxă de tranzacție</translation>
</message>
<message>
- <location line="+6"/>
- <source>Total Amount %1</source>
- <translation>Suma totală %1</translation>
- </message>
- <message>
- <location line="+20"/>
- <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>Eroare: Tranzacția a fost respinsă. Aceasta se poate întâmpla când unele monede din portofelul tău erau deja cheltuite, ca în cazul folosirii unei copii a fișierului wallet.dat în care s-au efectuat tranzacții neînregistrate în fișierul curent.</translation>
- </message>
- <message>
- <location line="+144"/>
+ <location line="+170"/>
<source>Payment request expired</source>
<translation>Cererea de plată a expirat</translation>
</message>
@@ -1741,39 +2318,44 @@ Adresa: %4
<context>
<name>SendCoinsEntry</name>
<message>
- <location filename="../forms/sendcoinsentry.ui" line="+33"/>
- <location line="+585"/>
+ <location filename="../forms/sendcoinsentry.ui" line="+131"/>
+ <location line="+521"/>
+ <location line="+536"/>
<source>A&amp;mount:</source>
<translation>Su&amp;mă:</translation>
</message>
<message>
- <location line="-572"/>
- <location line="+585"/>
+ <location line="-1152"/>
<source>Pay &amp;To:</source>
<translation>Plătește că&amp;tre:</translation>
</message>
<message>
- <location line="-551"/>
+ <location line="+18"/>
<source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>Adresa către care se va face plata (de exemplu: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location filename="../sendcoinsentry.cpp" line="+28"/>
+ <location filename="../sendcoinsentry.cpp" line="+30"/>
<source>Enter a label for this address to add it to your address book</source>
<translation>Introdu o etichetă pentru această adresă pentru a fi adăugată în lista ta de adrese</translation>
</message>
<message>
- <location filename="../forms/sendcoinsentry.ui" line="-18"/>
+ <location filename="../forms/sendcoinsentry.ui" line="+57"/>
<source>&amp;Label:</source>
<translation>&amp;Etichetă:</translation>
</message>
<message>
- <location line="+28"/>
+ <location line="-50"/>
<source>Choose previously used address</source>
+ <translation>Alegeti adrese folosite in prealabil.</translation>
+ </message>
+ <message>
+ <location line="-40"/>
+ <source>This is a normal payment.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
+ <location line="+50"/>
<source>Alt+A</source>
<translation>Alt+A</translation>
</message>
@@ -1789,16 +2371,45 @@ Adresa: %4
</message>
<message>
<location line="+7"/>
- <source>Remove this recipient</source>
- <translation>Șterge destinatarul</translation>
+ <location line="+524"/>
+ <location line="+536"/>
+ <source>Remove this entry</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="-1008"/>
+ <source>Message:</source>
+ <translation>Mesaj:</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+958"/>
+ <source>This is a verified payment request.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-991"/>
<source>Enter a label for this address to add it to the list of used addresses</source>
+ <translation>Introduceti eticheta pentru ca aceasta adresa sa fie introdusa in lista de adrese folosite</translation>
+ </message>
+ <message>
+ <location line="+459"/>
+ <source>This is an unverified payment request.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+18"/>
+ <location line="+532"/>
+ <source>Pay To:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+465"/>
+ <location line="-498"/>
+ <location line="+536"/>
<source>Memo:</source>
<translation>Memo:</translation>
</message>
@@ -1809,6 +2420,19 @@ Adresa: %4
</message>
</context>
<context>
+ <name>ShutdownWindow</name>
+ <message>
+ <location filename="../utilitydialog.cpp" line="+48"/>
+ <source>Bitcoin Core is shutting down...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Do not shut down the computer until this window disappears.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>SignVerifyMessageDialog</name>
<message>
<location filename="../forms/signverifymessagedialog.ui" line="+14"/>
@@ -1816,14 +2440,14 @@ Adresa: %4
<translation>Semnatura- Semneaza/verifica un mesaj</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+10"/>
<source>&amp;Sign Message</source>
<translation>Semneaza Mesajul</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>Puteti semna mesaje cu adresa dumneavoastra pentru a demostra ca sunteti proprietarul lor. Aveti grija sa nu semnati nimic vag, deoarece atacurile de tip phishing va pot pacali sa le transferati identitatea. Semnati numai declaratiile detaliate cu care sunteti deacord.</translation>
</message>
<message>
<location line="+18"/>
@@ -1834,7 +2458,7 @@ Adresa: %4
<location line="+10"/>
<location line="+213"/>
<source>Choose previously used address</source>
- <translation type="unfinished"/>
+ <translation>Alegeti adrese folosite in prealabil</translation>
</message>
<message>
<location line="-203"/>
@@ -1896,7 +2520,7 @@ Adresa: %4
<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>Introduceti adresa de semnatura, mesajul (asigurati-va ca ati copiat spatiile, taburile etc. exact) si semnatura dedesubt pentru a verifica mesajul. Aveti grija sa nu cititi mai mult in semnatura decat mesajul in sine, pentru a evita sa fiti pacaliti de un atac de tip man-in-the-middle.</translation>
</message>
<message>
<location line="+21"/>
@@ -1919,7 +2543,7 @@ Adresa: %4
<translation>Reseteaza toate spatiile mesajelor semnate.</translation>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+27"/>
+ <location filename="../signverifymessagedialog.cpp" line="+29"/>
<location line="+3"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>Introduceţi o adresă Bitcoin (de exemplu: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
@@ -1935,7 +2559,7 @@ Adresa: %4
<translation>Introduce semnatura bitocin</translation>
</message>
<message>
- <location line="+85"/>
+ <location line="+84"/>
<location line="+81"/>
<source>The entered address is invalid.</source>
<translation>Adresa introdusa nu este valida</translation>
@@ -2004,9 +2628,14 @@ Adresa: %4
<context>
<name>SplashScreen</name>
<message>
- <location filename="../splashscreen.cpp" line="+23"/>
- <source>The Bitcoin developers</source>
- <translation>Dezvoltatorii Bitcoin</translation>
+ <location filename="../splashscreen.cpp" line="+28"/>
+ <source>Bitcoin Core</source>
+ <translation>Bitcoin Core</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>The Bitcoin Core developers</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
@@ -2017,15 +2646,15 @@ Adresa: %4
<context>
<name>TrafficGraphWidget</name>
<message>
- <location filename="../trafficgraphwidget.cpp" line="+75"/>
+ <location filename="../trafficgraphwidget.cpp" line="+79"/>
<source>KB/s</source>
- <translation type="unfinished"/>
+ <translation>KB/s</translation>
</message>
</context>
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="+22"/>
+ <location filename="../transactiondesc.cpp" line="+28"/>
<source>Open until %1</source>
<translation>Deschis până la %1</translation>
</message>
@@ -2098,12 +2727,12 @@ Adresa: %4
<location line="+12"/>
<location line="+45"/>
<location line="+17"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Credit</source>
<translation>Credit</translation>
</message>
<message numerus="yes">
- <location line="-120"/>
+ <location line="-125"/>
<source>matures in %n more block(s)</source>
<translation><numerusform>se maturizează în încă %n bloc</numerusform><numerusform>se maturizează în încă %n blocuri</numerusform><numerusform>se maturizează în încă %n de blocuri</numerusform></translation>
</message>
@@ -2116,12 +2745,12 @@ Adresa: %4
<location line="+44"/>
<location line="+8"/>
<location line="+15"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Debit</source>
<translation>Debit</translation>
</message>
<message>
- <location line="-57"/>
+ <location line="-62"/>
<source>Transaction fee</source>
<translation>Comisionul tranzacţiei</translation>
</message>
@@ -2132,11 +2761,12 @@ Adresa: %4
</message>
<message>
<location line="+6"/>
+ <location line="+9"/>
<source>Message</source>
<translation>Mesaj</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="-7"/>
<source>Comment</source>
<translation>Comentarii</translation>
</message>
@@ -2146,14 +2776,14 @@ Adresa: %4
<translation>ID-ul tranzactiei</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+18"/>
<source>Merchant</source>
<translation>Comerciant</translation>
</message>
<message>
<location line="+7"/>
<source>Generated coins must mature %1 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>Monezile generate trebuie sa creasca %1 block-uri inainte sa poata fi cheltuite. Cand ati generat acest block, a fost transmis retelei pentru a fi adaugat la lantul de block-uri. Aceasta se poate intampla ocazional daca alt nod genereaza un block la numai cateva secunde de al tau.</translation>
</message>
<message>
<location line="+8"/>
@@ -2186,7 +2816,7 @@ Adresa: %4
<translation>Fals!</translation>
</message>
<message>
- <location line="-227"/>
+ <location line="-232"/>
<source>, has not been successfully broadcast yet</source>
<translation>, nu s-a propagat încă</translation>
</message>
@@ -2217,7 +2847,7 @@ Adresa: %4
<context>
<name>TransactionTableModel</name>
<message>
- <location filename="../transactiontablemodel.cpp" line="+227"/>
+ <location filename="../transactiontablemodel.cpp" line="+234"/>
<source>Date</source>
<translation>Data</translation>
</message>
@@ -2236,8 +2866,13 @@ Adresa: %4
<source>Amount</source>
<translation>Cantitate</translation>
</message>
+ <message>
+ <location line="+59"/>
+ <source>Immature (%1 confirmations, will be available after %2)</source>
+ <translation type="unfinished"/>
+ </message>
<message numerus="yes">
- <location line="+57"/>
+ <location line="+16"/>
<source>Open for %n more block(s)</source>
<translation><numerusform>Deschis pentru încă %1 bloc</numerusform><numerusform>Deschis pentru încă %1 blocuri</numerusform><numerusform>Deschis pentru încă %1 de blocuri</numerusform></translation>
</message>
@@ -2257,17 +2892,13 @@ Adresa: %4
<translation>Neconfirmat (%1 din %2 confirmări)</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="-22"/>
+ <location line="+25"/>
<source>Confirmed (%1 confirmations)</source>
<translation>Confirmat (%1 confirmări)</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>Balantă minată va fi disponibilă după ce maturizează în încă %n bloc</numerusform><numerusform>Balantă minată va fi disponibilă după ce maturizează în încă %n blocuri</numerusform><numerusform>Balantă minată va fi disponibilă după ce maturizează în încă %n de blocuri</numerusform></translation>
- </message>
<message>
- <location line="+5"/>
+ <location line="-22"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation>Acest bloc nu a fost recepționat de niciun alt nod și probabil nu va fi acceptat!</translation>
</message>
@@ -2277,7 +2908,7 @@ Adresa: %4
<translation>Generat dar neacceptat</translation>
</message>
<message>
- <location line="+43"/>
+ <location line="+62"/>
<source>Received with</source>
<translation>Recepționat cu</translation>
</message>
@@ -2335,7 +2966,7 @@ Adresa: %4
<context>
<name>TransactionView</name>
<message>
- <location filename="../transactionview.cpp" line="+52"/>
+ <location filename="../transactionview.cpp" line="+57"/>
<location line="+16"/>
<source>All</source>
<translation>Toate</translation>
@@ -2396,12 +3027,12 @@ Adresa: %4
<translation>Altele</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+6"/>
<source>Enter address or label to search</source>
<translation>Introdu adresa sau eticheta pentru căutare</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+6"/>
<source>Min amount</source>
<translation>Cantitatea minimă</translation>
</message>
@@ -2436,17 +3067,37 @@ Adresa: %4
<translation>Arată detaliile tranzacției</translation>
</message>
<message>
- <location line="+143"/>
- <source>Export Transaction Data</source>
- <translation>Exportă tranzacțiile</translation>
+ <location line="+142"/>
+ <source>Export Transaction History</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="+19"/>
+ <source>Exporting Failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>There was an error trying to save the transaction history to %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Exporting Successful</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The transaction history was successfully saved to %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-22"/>
<source>Comma separated file (*.csv)</source>
<translation>Fișier text cu valori separate prin virgulă (*.csv)</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+9"/>
<source>Confirmed</source>
<translation>Confirmat</translation>
</message>
@@ -2481,17 +3132,7 @@ Adresa: %4
<translation>ID</translation>
</message>
<message>
- <location line="+4"/>
- <source>Error exporting</source>
- <translation>Eroare în timpul exportului</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation>Nu s-a putut scrie în fișierul %1.</translation>
- </message>
- <message>
- <location line="+100"/>
+ <location line="+107"/>
<source>Range:</source>
<translation>Interval:</translation>
</message>
@@ -2502,9 +3143,17 @@ Adresa: %4
</message>
</context>
<context>
+ <name>WalletFrame</name>
+ <message>
+ <location filename="../walletframe.cpp" line="+26"/>
+ <source>No wallet has been loaded.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>WalletModel</name>
<message>
- <location filename="../walletmodel.cpp" line="+218"/>
+ <location filename="../walletmodel.cpp" line="+245"/>
<source>Send Coins</source>
<translation>Trimite Bitcoin</translation>
</message>
@@ -2512,75 +3161,70 @@ Adresa: %4
<context>
<name>WalletView</name>
<message>
- <location filename="../walletview.cpp" line="+46"/>
+ <location filename="../walletview.cpp" line="+43"/>
<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 type="unfinished"/>
+ <translation>Exporta datele din tab-ul curent într-un fișier</translation>
</message>
<message>
- <location line="+183"/>
+ <location line="+181"/>
<source>Backup Wallet</source>
<translation>Fă o copie de siguranță a portofelului</translation>
</message>
<message>
- <location line="+0"/>
+ <location line="+1"/>
<source>Wallet Data (*.dat)</source>
<translation>Date portofel (*.dat)</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="+6"/>
<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>
+ <source>There was an error trying to save the wallet data to %1.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+4"/>
- <source>Backup Successful</source>
- <translation>Copia de siguranță efectuată cu succes</translation>
+ <source>The wallet data was successfully saved to %1.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+0"/>
- <source>The wallet data was successfully saved to the new location.</source>
- <translation type="unfinished"/>
+ <source>Backup Successful</source>
+ <translation>Copia de siguranță efectuată cu succes</translation>
</message>
</context>
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+102"/>
- <source>Bitcoin version</source>
- <translation>Versiune Bitcoin</translation>
- </message>
- <message>
- <location line="+107"/>
+ <location filename="../bitcoinstrings.cpp" line="+221"/>
<source>Usage:</source>
<translation>Uz:</translation>
</message>
<message>
- <location line="-55"/>
+ <location line="-54"/>
<source>List commands</source>
<translation>Listă de comenzi</translation>
</message>
<message>
- <location line="-13"/>
+ <location line="-14"/>
<source>Get help for a command</source>
<translation>Ajutor pentru o comandă</translation>
</message>
<message>
- <location line="+25"/>
+ <location line="+26"/>
<source>Options:</source>
<translation>Setări:</translation>
</message>
<message>
- <location line="+24"/>
+ <location line="+22"/>
<source>Specify configuration file (default: bitcoin.conf)</source>
<translation>Specifică fișierul de configurare (implicit: bitcoin.conf)</translation>
</message>
@@ -2600,7 +3244,7 @@ Adresa: %4
<translation>Setează mărimea cache a bazei de date în megabiți (implicit: 25)</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-26"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
<translation>Ascultă pentru conectări pe &lt;port&gt; (implicit: 8333 sau testnet: 18333)</translation>
</message>
@@ -2610,7 +3254,7 @@ Adresa: %4
<translation>Menține cel mult &lt;n&gt; conexiuni cu partenerii (implicit: 125)</translation>
</message>
<message>
- <location line="-49"/>
+ <location line="-51"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation>Conectează-te la nod pentru a obține adresele partenerilor, și apoi deconectează-te</translation>
</message>
@@ -2620,37 +3264,37 @@ Adresa: %4
<translation>Specifică adresa ta publică</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation>Prag pentru deconectarea partenerilor care nu funcționează corect (implicit: 100)</translation>
</message>
<message>
- <location line="-142"/>
+ <location line="-148"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation>Numărul de secunde pentru a preveni reconectarea partenerilor care nu funcționează corect (implicit: 86400)</translation>
</message>
<message>
- <location line="-33"/>
+ <location line="-36"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
- <translation type="unfinished"/>
+ <translation>A intervenit o eroare in timp ce se seta portul RPC %u pentru ascultare pe IPv4: %s</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation>Ascultă pentru conexiuni JSON-RPC pe &lt;port&gt; (implicit:8332 sau testnet: 18332)</translation>
</message>
<message>
- <location line="+40"/>
+ <location line="+45"/>
<source>Accept command line and JSON-RPC commands</source>
<translation>Se acceptă comenzi din linia de comandă și comenzi JSON-RPC</translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>Rulează în fundal ca un demon și acceptă comenzi</translation>
</message>
<message>
- <location line="+40"/>
+ <location line="+39"/>
<source>Use the test network</source>
<translation>Utilizează rețeaua de test</translation>
</message>
@@ -2660,7 +3304,7 @@ Adresa: %4
<translation>Acceptă conexiuni din afară (implicit: 1 dacă nu se folosește -proxy sau -connect)</translation>
</message>
<message>
- <location line="-87"/>
+ <location line="-95"/>
<source>%s, you must set a rpcpassword in the configuration file:
%s
It is recommended you use the following random password:
@@ -2677,17 +3321,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<message>
<location line="+12"/>
<source>Acceptable ciphers (default: TLSv1.2+HIGH:TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!3DES:@STRENGTH)</source>
- <translation type="unfinished"/>
+ <translation>Cifruri acceptabile (implicit: TLSv1.2+HIGH:TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!3DES:@STRENGTH)</translation>
</message>
<message>
<location line="+5"/>
<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>A intervenit o eroare in timp ce se seta portul RPC %u pentru ascultare pe IPv6, reintoarcere la 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>Atasati adresei date si ascultati totdeauna pe ea. Folositi [host]:port notatia pentru IPv6</translation>
</message>
<message>
<location line="+3"/>
@@ -2697,75 +3341,90 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<message>
<location line="+3"/>
<source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly. This is intended for regression testing tools and app development.</source>
- <translation type="unfinished"/>
+ <translation>Initiati modul de test al regresie, care foloseste un lant special in care block-urile pot fi rezolvate instantaneu. Acest lucru este facut pentru utilitare si aplicatii de dezvoltare pentru testarea regresiei.</translation>
</message>
<message>
<location line="+4"/>
- <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>
+ <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</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>Eroare: Tranzactia a fost respinsa! Acest lucru se poate intampla daca anumite monezi din portofelul dumneavoastra au fost deja cheltuite, deasemenea daca ati folosit o copie a fisierului wallet.dat si monezile au fost folosite in acea copie dar nu au fost marcate ca fiind folosite acolo.</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>Eroare: Aceasta tranzactie necesita o taxa de cel putin %s din cauza sumei, complexitatii sau folosirii fondurilor recent primite!</translation>
</message>
<message>
<location line="+6"/>
<source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
- <translation type="unfinished"/>
+ <translation>Executati comanda cand o tranzactie a portofelului se schimba (%s in cmd este inlocuit de TxID)</translation>
</message>
<message>
- <location line="+11"/>
- <source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source>
- <translation>Seteaza marimea maxima a tranzactie mare/mica in bytes (initial:27000)</translation>
+ <location line="+18"/>
+ <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
+ <translation>Aceasta este o versiune de test preliminara - va asumati riscul folosind-o - nu folositi pentru minerit sau aplicatiile comerciantilor.</translation>
</message>
<message>
- <location line="+6"/>
- <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
+ <location line="+5"/>
+ <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+3"/>
<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>Atentie: setarea -paytxfee este foarte ridicata! Aceasta este taxa tranzactiei pe care o vei plati daca trimiti o tranzactie.</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>Atentie: Va rugam verificati daca data/timpul computerului dumneavoastra sunt corecte! Daca ceasul computerului este decalat, Bitcoin nu va functiona corect.</translation>
</message>
<message>
<location line="+3"/>
<source>Warning: The network does not appear to fully agree! Some miners appear to be experiencing issues.</source>
- <translation type="unfinished"/>
+ <translation>Atentie: Reteaua nu pare sa fie deacord in totalitate! Aparent niste mineri au probleme. </translation>
</message>
<message>
<location line="+3"/>
<source>Warning: We do not appear to fully agree with our peers! You may need to upgrade, or other nodes may need to upgrade.</source>
- <translation type="unfinished"/>
+ <translation>Atentie: Aparent, nu suntem deacord cu toti membrii nostri! Va trebui sa faci un upgrade, sau alte noduri ar necesita upgrade. </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>Atentie: eroare la citirea fisierului wallet.dat! Toate cheile sunt citite corect, dar datele tranzactiei sau anumite intrari din agenda sunt incorecte sau lipsesc.</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>Atentie: fisierul wallet.dat este corupt, date salvate! Fisierul original wallet.dat a fost salvat ca wallet.{timestamp}.bak in %s; daca balansul sau tranzactiile sunt incorecte ar trebui sa restaurati dintr-o copie de siguranta. </translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>&lt;category&gt; can be:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
+ <location line="+6"/>
<source>Attempt to recover private keys from a corrupt wallet.dat</source>
<translation>Încearcă recuperarea cheilor private dintr-un wallet.dat corupt</translation>
</message>
<message>
<location line="+1"/>
- <source>Bitcoin RPC client version</source>
+ <source>Bitcoin Core Daemon</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
+ <source>Bitcoin RPC client version</source>
+ <translation>Versiunea clientului Bitcoin RPC</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Block creation options:</source>
<translation>Optiuni creare block</translation>
</message>
@@ -2775,14 +3434,19 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Conecteaza-te doar la nod(urile) specifice</translation>
</message>
<message>
- <location line="+2"/>
- <source>Connect to JSON-RPC on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
+ <location line="+1"/>
+ <source>Connect through SOCKS proxy</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="+1"/>
+ <source>Connect to JSON-RPC on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
+ <translation>Conectat la JSON-RPC pe &lt;portul&gt; (implicit: 8332 sau testnet: 18332)</translation>
+ </message>
+ <message>
<location line="+2"/>
<source>Corrupted block database detected</source>
- <translation type="unfinished"/>
+ <translation>Baza de date &apos;bloc&apos; defectată a fost detectată</translation>
</message>
<message>
<location line="+1"/>
@@ -2791,10 +3455,15 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+1"/>
- <source>Do you want to rebuild the block database now?</source>
+ <source>Do not load the wallet and disable wallet RPC calls</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="+1"/>
+ <source>Do you want to rebuild the block database now?</source>
+ <translation>Doriți să reconstruiți baza de date &apos;bloc&apos; acum?</translation>
+ </message>
+ <message>
<location line="+2"/>
<source>Error initializing block database</source>
<translation>Eroare la inițializarea bazei de date de blocuri</translation>
@@ -2802,7 +3471,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<message>
<location line="+1"/>
<source>Error initializing wallet database environment %s!</source>
- <translation type="unfinished"/>
+ <translation>Eroare la initializarea mediului de baza de date a portofelului %s!</translation>
</message>
<message>
<location line="+1"/>
@@ -2832,7 +3501,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<message>
<location line="+1"/>
<source>Failed to listen on any port. Use -listen=0 if you want this.</source>
- <translation type="unfinished"/>
+ <translation>Am esuat ascultarea pe orice port. Folositi -listen=0 daca vreti asta.</translation>
</message>
<message>
<location line="+1"/>
@@ -2867,25 +3536,30 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<message>
<location line="+1"/>
<source>Failed to write file info</source>
- <translation type="unfinished"/>
+ <translation>Nu a reușit scrierea informației în fișier</translation>
</message>
<message>
<location line="+1"/>
<source>Failed to write to coin database</source>
- <translation type="unfinished"/>
+ <translation>Eșuarea scrierii în baza de date de monede</translation>
</message>
<message>
<location line="+1"/>
<source>Failed to write transaction index</source>
- <translation type="unfinished"/>
+ <translation>Nu a reușit scrierea indexului de tranzacție</translation>
</message>
<message>
<location line="+1"/>
<source>Failed to write undo data</source>
+ <translation>Esuare in scrierea datelor anulate</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Fee per kB to add to transactions you send</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
<source>Find peers using DNS lookup (default: 1 unless -connect)</source>
<translation>Găsește parteneri folosind căutarea DNS (implicit: 1 doar dacă nu s-a folosit -connect)</translation>
</message>
@@ -2897,7 +3571,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<message>
<location line="+2"/>
<source>How many blocks to check at startup (default: 288, 0 = all)</source>
- <translation type="unfinished"/>
+ <translation>Cate block-uri se verifica la initializare (implicit: 288, 0=toate)</translation>
</message>
<message>
<location line="+1"/>
@@ -2905,32 +3579,57 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Cât de </translation>
</message>
<message>
+ <location line="+1"/>
+ <source>If &lt;category&gt; is not supplied, output all debugging information.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+2"/>
<source>Incorrect or no genesis block found. Wrong datadir for network?</source>
- <translation type="unfinished"/>
+ <translation>Incorect sau nici un bloc de Geneza găsite. Directorul de retea greşit?</translation>
</message>
<message>
<location line="+3"/>
<source>Invalid -onion address: &apos;%s&apos;</source>
- <translation type="unfinished"/>
+ <translation>Adresa -onion invalidă: &apos;%s&apos;</translation>
</message>
<message>
<location line="+15"/>
<source>Not enough file descriptors available.</source>
+ <translation>Nu sunt destule descriptoare disponibile.</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Prepend debug output with timestamp (default: 1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+8"/>
+ <location line="+1"/>
+ <source>RPC client options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Rebuild block chain index from current blk000??.dat files</source>
+ <translation>Reconstruirea indexului lantului de block-uri din fisierele actuale blk000???.dat</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+1"/>
<source>Send command to Bitcoin server</source>
+ <translation>Trimite comanda la serverul Bitcoin</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Set maximum block size in bytes (default: %d)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
+ <location line="+2"/>
<source>Set the number of threads to service RPC calls (default: 4)</source>
<translation type="unfinished"/>
</message>
@@ -2942,15 +3641,20 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<message>
<location line="+2"/>
<source>Start Bitcoin server</source>
+ <translation>A porni serverul Bitcoin</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>This is intended for regression testing tools and app development.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+12"/>
+ <location line="+10"/>
<source>Usage (deprecated, use bitcoin-cli):</source>
- <translation type="unfinished"/>
+ <translation>Utilizare (învechită, folositi bitcoin-cli):</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+7"/>
<source>Verifying blocks...</source>
<translation>Se verifică blocurile...</translation>
</message>
@@ -2961,43 +3665,68 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+1"/>
+ <source>Wait for RPC server to start</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Wallet %s resides outside data directory %s</source>
<translation>Portofelul %s se află în afara dosarului de date %s</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+2"/>
+ <source>Wallet options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>You need to rebuild the database using -reindex to change -txindex</source>
<translation>Trebuie să reconstruiești baza de date folosind -reindex pentru a schimba -txindex</translation>
</message>
<message>
- <location line="-78"/>
+ <location line="-79"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation>Importă blocuri dintr-un fișier extern blk000??.dat</translation>
</message>
<message>
- <location line="-98"/>
+ <location line="-105"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
+ <translation>Executati comanda cand o alerta relevanta este primita sau vedem o bifurcatie foarte lunga (%s in cmd este inlocuti de mesaj)</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Output debugging information (default: 0, supplying &lt;category&gt; is optional)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+17"/>
+ <location line="+2"/>
+ <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+83"/>
+ <location line="+89"/>
<source>Information</source>
<translation>Informație</translation>
</message>
<message>
<location line="+4"/>
<source>Invalid amount for -minrelaytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
- <translation type="unfinished"/>
+ <translation>Suma invalida pentru -minrelaytxfee=&lt;suma&gt;:&apos;%s&apos;</translation>
</message>
<message>
<location line="+1"/>
<source>Invalid amount for -mintxfee=&lt;amount&gt;: &apos;%s&apos;</source>
- <translation type="unfinished"/>
+ <translation>Suma invalida pentru -mintxfee=&lt;suma&gt;: &apos;%s&apos;</translation>
</message>
<message>
<location line="+8"/>
@@ -3017,7 +3746,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<message>
<location line="+2"/>
<source>Only accept block chain matching built-in checkpoints (default: 1)</source>
- <translation type="unfinished"/>
+ <translation>Se accepta decat lantul de block care se potriveste punctului de control implementat (implicit: 1)</translation>
</message>
<message>
<location line="+1"/>
@@ -3025,54 +3754,24 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Efectuează conexiuni doar către nodurile din rețeaua &lt;net&gt; (IPv4, IPv6 sau Tor)</translation>
</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>Prefixează ieșirea de depanare cu marcaje de timp</translation>
- </message>
- <message>
- <location line="+5"/>
+ <location line="+9"/>
<source>SSL options: (see the Bitcoin Wiki for SSL setup instructions)</source>
<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>Selecteaza versiunea socks-ului pe care vrei sa il folosesti (4-5, initial: 5)</translation>
- </message>
- <message>
- <location line="+3"/>
+ <location line="+4"/>
<source>Send trace/debug info to console instead of debug.log file</source>
<translation>Trimite informațiile trace/debug la consolă în locul fișierului debug.log</translation>
</message>
<message>
- <location line="+1"/>
- <source>Send trace/debug info to debugger</source>
- <translation>Trimite informațiile trace/debug la depanator</translation>
- </message>
- <message>
- <location line="+5"/>
- <source>Set maximum block size in bytes (default: 250000)</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+6"/>
<source>Set minimum block size in bytes (default: 0)</source>
<translation>Setează mărimea minimă a blocului în baiți (implicit: 0)</translation>
</message>
<message>
<location line="+2"/>
<source>Shrink debug.log file on client startup (default: 1 when no -debug)</source>
- <translation type="unfinished"/>
+ <translation>Micsorati fisierul debug.log la inceperea clientului (implicit: 1 cand nu -debug)</translation>
</message>
<message>
<location line="+1"/>
@@ -3090,7 +3789,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Eroare de sistem:</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Transaction amount too small</source>
<translation>Suma tranzacționată este prea mică</translation>
</message>
@@ -3115,32 +3814,32 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Foloseste UPnP pentru a vedea porturile (initial: 1 cand listezi)</translation>
</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>Utilizator pentru conexiunile JSON-RPC</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+7"/>
<source>Warning</source>
<translation>Avertizare</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Warning: This version is obsolete, upgrade required!</source>
<translation>Atenție: această versiune este depășită, este necesară actualizarea!</translation>
</message>
<message>
<location line="+2"/>
+ <source>version</source>
+ <translation>versiunea</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>wallet.dat corrupt, salvage failed</source>
<translation>wallet.dat corupt, recuperare eșuată</translation>
</message>
<message>
- <location line="-54"/>
+ <location line="-58"/>
<source>Password for JSON-RPC connections</source>
<translation>Parola pentru conexiunile JSON-RPC</translation>
</message>
@@ -3150,27 +3849,27 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Permite conexiuni JSON-RPC de la adresa IP specificată</translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation>Trimite comenzi la nodul care rulează la &lt;ip&gt; (implicit: 127.0.0.1)</translation>
</message>
<message>
- <location line="-126"/>
+ <location line="-132"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation>Execută comanda când cel mai bun bloc se modifică (%s în cmd este înlocuit cu hash-ul blocului)</translation>
</message>
<message>
- <location line="+155"/>
+ <location line="+161"/>
<source>Upgrade wallet to latest format</source>
<translation>Actualizează portofelul la ultimul format</translation>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation>Setează mărimea bazinului de chei la &lt;n&gt; (implicit: 100)</translation>
</message>
<message>
- <location line="-12"/>
+ <location line="-11"/>
<source>Rescan the block chain for missing wallet transactions</source>
<translation>Rescanează lanțul de bloc pentru tranzacțiile portofel lipsă</translation>
</message>
@@ -3180,7 +3879,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Folosește OpenSSL (https) pentru conexiunile JSON-RPC</translation>
</message>
<message>
- <location line="-29"/>
+ <location line="-30"/>
<source>Server certificate file (default: server.cert)</source>
<translation>Certificatul serverului (implicit: server.cert)</translation>
</message>
@@ -3195,27 +3894,22 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Acest mesaj de ajutor</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Unable to bind to %s on this computer (bind returned error %d, %s)</source>
<translation>Nu se poate folosi %s pe acest calculator (eroarea returnată este %d, %s)</translation>
</message>
<message>
- <location line="-95"/>
- <source>Connect through socks proxy</source>
- <translation>Conectează prin proxy SOCKS</translation>
- </message>
- <message>
- <location line="-11"/>
+ <location line="-107"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation>Permite căutări DNS pentru -addnode, -seednode și -connect</translation>
</message>
<message>
- <location line="+58"/>
+ <location line="+60"/>
<source>Loading addresses...</source>
<translation>ÃŽncarc adrese...</translation>
</message>
<message>
- <location line="-36"/>
+ <location line="-37"/>
<source>Error loading wallet.dat: Wallet corrupted</source>
<translation>Eroare la încărcarea wallet.dat: Portofel corupt</translation>
</message>
@@ -3235,12 +3929,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Eroare la încărcarea wallet.dat</translation>
</message>
<message>
- <location line="+30"/>
+ <location line="+31"/>
<source>Invalid -proxy address: &apos;%s&apos;</source>
<translation>Adresa -proxy nevalidă: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+57"/>
+ <location line="+56"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation>Rețeaua specificată în -onlynet este necunoscută: &apos;%s&apos;</translation>
</message>
@@ -3250,7 +3944,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>S-a cerut o versiune necunoscută de proxy -socks: %i</translation>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation>Nu se poate rezolva adresa -bind: &apos;%s&apos;</translation>
</message>
@@ -3260,7 +3954,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Nu se poate rezolva adresa -externalip: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+46"/>
+ <location line="+48"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation>Suma nevalidă pentru -paytxfee=&lt;amount&gt;: &apos;%s&apos;</translation>
</message>
@@ -3280,27 +3974,22 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>ÃŽncarc indice bloc...</translation>
</message>
<message>
- <location line="-60"/>
+ <location line="-62"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation>Adaugă un nod la care te poți conecta pentru a menține conexiunea deschisă</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-32"/>
<source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source>
<translation>Imposibilitatea de a lega la% s pe acest computer. Bitcoin este, probabil, deja în execuție.</translation>
</message>
<message>
- <location line="+69"/>
- <source>Fee per KB to add to transactions you send</source>
- <translation>Taxa per KB care se adaugă la tranzacțiile trimise de tine</translation>
- </message>
- <message>
- <location line="+20"/>
+ <location line="+95"/>
<source>Loading wallet...</source>
<translation>ÃŽncarc portofel...</translation>
</message>
<message>
- <location line="-54"/>
+ <location line="-56"/>
<source>Cannot downgrade wallet</source>
<translation>Nu se poate retrograda portofelul</translation>
</message>
@@ -3310,7 +3999,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Nu se poate scrie adresa implicită</translation>
</message>
<message>
- <location line="+66"/>
+ <location line="+67"/>
<source>Rescanning...</source>
<translation>Rescanez...</translation>
</message>
@@ -3330,7 +4019,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Eroare</translation>
</message>
<message>
- <location line="-33"/>
+ <location line="-35"/>
<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 44e48d3543..dcb5a92e82 100644
--- a/src/qt/locale/bitcoin_ru.ts
+++ b/src/qt/locale/bitcoin_ru.ts
@@ -27,14 +27,14 @@ This product includes software developed by the OpenSSL Project for use in the O
Этот продукт включает ПО, разработанное OpenSSL Project Ð´Ð»Ñ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ Ð² OpenSSL Toolkit (http://www.openssl.org/) и криптографичеÑкое ПО, напиÑанное Eric Young (eay@cryptsoft.com) и ПО Ð´Ð»Ñ Ñ€Ð°Ð±Ð¾Ñ‚Ñ‹ Ñ UPnP, напиÑанное Thomas Bernard.</translation>
</message>
<message>
- <location filename="../aboutdialog.cpp" line="+19"/>
+ <location filename="../utilitydialog.cpp" line="+29"/>
<source>Copyright</source>
<translation>Ð’Ñе права защищены</translation>
</message>
<message>
<location line="+0"/>
- <source>The Bitcoin developers</source>
- <translation>Разработчики Bitcoin</translation>
+ <source>The Bitcoin Core developers</source>
+ <translation>Разработчики Bitcoin Core</translation>
</message>
</context>
<context>
@@ -122,12 +122,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+7"/>
<source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
- <translation>Ваши адреÑа Ð´Ð»Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸ ÑредÑтв. Совет: проверьте Ñумму и Ð°Ð´Ñ€ÐµÑ Ð½Ð°Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð¿ÐµÑ€ÐµÐ´ переводом.</translation>
+ <translation>Ваши адреÑа Bitcoin Ð´Ð»Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸ ÑредÑтв. Совет: проверьте Ñумму и Ð°Ð´Ñ€ÐµÑ Ð½Ð°Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð¿ÐµÑ€ÐµÐ´ переводом.</translation>
</message>
<message>
<location line="+4"/>
<source>These are your Bitcoin addresses for receiving payments. It is recommended to use a new receiving address for each transaction.</source>
- <translation>Это ваши Bitcoin-адреÑа Ð´Ð»Ñ Ð¿Ñ€Ð¸Ñ‘Ð¼Ð° платежей. РекомендуетÑÑ Ð¸Ñпользовать новый Ð°Ð´Ñ€ÐµÑ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ Ð´Ð»Ñ ÐºÐ°Ð¶Ð´Ð¾Ð¹ транзакции.</translation>
+ <translation>Это ваши адреÑа Bitcoin Ð´Ð»Ñ Ð¿Ñ€Ð¸Ñ‘Ð¼Ð° платежей. РекомендуетÑÑ Ð¸Ñпользовать новый Ð°Ð´Ñ€ÐµÑ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ Ð´Ð»Ñ ÐºÐ°Ð¶Ð´Ð¾Ð¹ транзакции.</translation>
</message>
<message>
<location line="+7"/>
@@ -151,13 +151,13 @@ This product includes software developed by the OpenSSL Project for use in the O
</message>
<message>
<location line="+13"/>
- <source>Error exporting</source>
- <translation>Ошибка ÑкÑпорта</translation>
+ <source>Exporting Failed</source>
+ <translation>ЭкÑпорт не удалÑÑ</translation>
</message>
<message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation>Ðевозможно запиÑать в файл %1.</translation>
+ <location line="+1"/>
+ <source>There was an error trying to save the address list to %1.</source>
+ <translation>Произошла ошибка при Ñохранении ÑпиÑка адреÑов в %1.</translation>
</message>
</context>
<context>
@@ -228,7 +228,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+5"/>
<source>Decrypt wallet</source>
- <translation>Зашифровать кошелёк</translation>
+ <translation>РаÑшифровать бумажник</translation>
</message>
<message>
<location line="+3"/>
@@ -248,7 +248,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+1"/>
<source>Warning: If you encrypt your wallet and lose your passphrase, you will &lt;b&gt;LOSE ALL OF YOUR BITCOINS&lt;/b&gt;!</source>
- <translation>Внимание: еÑли вы зашифруете бумажник и потерÑете пароль, вы &lt;b&gt;ПОТЕРЯЕТЕ ВСЕ Ð’ÐШИ БИТКОИÐЫ&lt;/b&gt;!</translation>
+ <translation>Внимание: еÑли вы зашифруете бумажник и потерÑете пароль, вы &lt;b&gt;ПОТЕРЯЕТЕ ВСЕ Ð’ÐШИ БИТКОЙÐЫ&lt;/b&gt;!</translation>
</message>
<message>
<location line="+0"/>
@@ -258,7 +258,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<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>Ð’ÐЖÐО: вÑе предыдущие резервные копии вашего кошелька должны быть заменены новым зашифрованным файлом. Ð’ целÑÑ… безопаÑноÑти предыдущие резервные копии нешифрованного кошелька Ñтанут беÑполезны, как только вы начнёте иÑпользовать новый шифрованный кошелёк.</translation>
+ <translation>Ð’ÐЖÐО: вÑе предыдущие резервные копии вашего бумажника должны быть заменены новым зашифрованным файлом. Ð’ целÑÑ… безопаÑноÑти предыдущие резервные копии незашифрованного бумажника Ñтанут беÑполезны, как только вы начнёте иÑпользовать новый зашифрованный бумажник.</translation>
</message>
<message>
<location line="+100"/>
@@ -275,7 +275,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>Ð¡ÐµÐ¹Ñ‡Ð°Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð° закроетÑÑ Ð´Ð»Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¾Ñ†ÐµÑÑа шифрованиÑ. Помните, что шифрование вашего бумажника не может полноÑтью защитить ваши биткойны от кражи Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ Ð¸Ð½Ñ„Ð¸Ñ†Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð²Ð°ÑˆÐµÐ³Ð¾ компьютера вредоноÑным ПО.</translation>
</message>
<message>
<location line="+13"/>
@@ -322,22 +322,27 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+260"/>
+ <location filename="../bitcoingui.cpp" line="+295"/>
<source>Sign &amp;message...</source>
<translation>&amp;ПодпиÑать Ñообщение...</translation>
</message>
<message>
- <location line="+290"/>
+ <location line="+335"/>
<source>Synchronizing with network...</source>
<translation>Ð¡Ð¸Ð½Ñ…Ñ€Ð¾Ð½Ð¸Ð·Ð°Ñ†Ð¸Ñ Ñ Ñетью...</translation>
</message>
<message>
- <location line="-360"/>
+ <location line="-407"/>
<source>&amp;Overview</source>
<translation>&amp;Обзор</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="-137"/>
+ <source>Node</source>
+ <translation>Узел</translation>
+ </message>
+ <message>
+ <location line="+138"/>
<source>Show general overview of wallet</source>
<translation>Показать общий обзор дейÑтвий Ñ Ð±ÑƒÐ¼Ð°Ð¶Ð½Ð¸ÐºÐ¾Ð¼</translation>
</message>
@@ -352,7 +357,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Показать иÑторию транзакций</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>E&amp;xit</source>
<translation>В&amp;ыход</translation>
</message>
@@ -364,7 +369,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+7"/>
<source>Show information about Bitcoin</source>
- <translation>Показать информацию о Bitcoin&apos;е</translation>
+ <translation>Показать информацию о Bitcoin</translation>
</message>
<message>
<location line="+3"/>
@@ -398,7 +403,22 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>&amp;Изменить пароль...</translation>
</message>
<message>
- <location line="+295"/>
+ <location line="+10"/>
+ <source>&amp;Sending addresses...</source>
+ <translation>&amp;ÐдреÑа отправки...</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Receiving addresses...</source>
+ <translation>ÐдреÑа &amp;получениÑ...</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open &amp;URI...</source>
+ <translation>Открыть &amp;URI...</translation>
+ </message>
+ <message>
+ <location line="+325"/>
<source>Importing blocks from disk...</source>
<translation>ИмпортируютÑÑ Ð±Ð»Ð¾ÐºÐ¸ Ñ Ð´Ð¸Ñка...</translation>
</message>
@@ -408,12 +428,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Идёт переиндекÑÐ°Ñ†Ð¸Ñ Ð±Ð»Ð¾ÐºÐ¾Ð² на диÑке...</translation>
</message>
<message>
- <location line="-358"/>
+ <location line="-405"/>
<source>Send coins to a Bitcoin address</source>
<translation>Отправить монеты на указанный Ð°Ð´Ñ€ÐµÑ Bitcoin</translation>
</message>
<message>
- <location line="+47"/>
+ <location line="+49"/>
<source>Modify configuration options for Bitcoin</source>
<translation>Изменить параметры конфигурации Bitcoin</translation>
</message>
@@ -443,18 +463,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>&amp;Проверить Ñообщение...</translation>
</message>
<message>
- <location line="+375"/>
+ <location line="+430"/>
<source>Bitcoin</source>
- <translation>Биткоин</translation>
+ <translation>Bitcoin</translation>
</message>
<message>
- <location line="-563"/>
- <location line="+10"/>
+ <location line="-643"/>
<source>Wallet</source>
<translation>Бумажник</translation>
</message>
<message>
- <location line="+113"/>
+ <location line="+146"/>
<source>&amp;Send</source>
<translation>&amp;Отправить</translation>
</message>
@@ -464,7 +483,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>&amp;Получить</translation>
</message>
<message>
- <location line="+44"/>
+ <location line="+46"/>
<location line="+2"/>
<source>&amp;Show / Hide</source>
<translation>&amp;Показать / Скрыть</translation>
@@ -490,88 +509,82 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Проверить ÑообщениÑ, чтобы удоÑтоверитьÑÑ, что они были подпиÑаны определённым адреÑом Bitcoin</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+48"/>
<source>&amp;File</source>
<translation>&amp;Файл</translation>
</message>
<message>
- <location line="+11"/>
+ <location line="+14"/>
<source>&amp;Settings</source>
<translation>&amp;ÐаÑтройки</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>&amp;Help</source>
<translation>&amp;Помощь</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+15"/>
<source>Tabs toolbar</source>
<translation>Панель вкладок</translation>
</message>
<message>
- <location line="-244"/>
- <location line="+321"/>
+ <location line="-284"/>
+ <location line="+376"/>
<source>[testnet]</source>
<translation>[теÑÑ‚Ð¾Ð²Ð°Ñ Ñеть]</translation>
</message>
<message>
- <location line="-331"/>
- <location line="+10"/>
+ <location line="-401"/>
<source>Bitcoin Core</source>
- <translation>Ядро Bitcoin</translation>
+ <translation>Bitcoin Core</translation>
</message>
<message>
- <location line="+121"/>
+ <location line="+163"/>
<source>Request payments (generates QR codes and bitcoin: URIs)</source>
<translation>ЗапроÑить платежи (Ñоздаёт QR-коды и bitcoin: ÑÑылки)</translation>
</message>
<message>
- <location line="+27"/>
+ <location line="+29"/>
<location line="+2"/>
<source>&amp;About Bitcoin Core</source>
<translation>&amp;О Bitcoin Core</translation>
</message>
<message>
- <location line="+34"/>
- <source>&amp;Used sending addresses...</source>
- <translation>&amp;ИÑпользованные адреÑа отправки...</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+35"/>
<source>Show the list of used sending addresses and labels</source>
<translation>Показать ÑпиÑок иÑпользованных адреÑов и меток отправки</translation>
</message>
<message>
- <location line="+1"/>
- <source>Used &amp;receiving addresses...</source>
- <translation>ИÑпользованные адреÑа &amp;получениÑ...</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Show the list of used receiving addresses and labels</source>
<translation>Показать ÑпиÑок иÑпользованных адреÑов и меток получениÑ</translation>
</message>
<message>
+ <location line="+3"/>
+ <source>Open a bitcoin: URI or payment request</source>
+ <translation>Открыть bitcoin: URI или Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð¿Ð»Ð°Ñ‚ÐµÐ¶Ð°</translation>
+ </message>
+ <message>
<location line="+2"/>
- <source>Open URI...</source>
- <translation>Открыть URI...</translation>
+ <source>&amp;Command-line options</source>
+ <translation>&amp;Опции командной Ñтроки</translation>
</message>
<message>
<location line="+1"/>
- <source>Open a bitcoin: URI or payment request</source>
- <translation>Открыть bitcoin: URI или Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð¿Ð»Ð°Ñ‚ÐµÐ¶Ð°</translation>
+ <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
+ <translation>Показать помощь по Bitcoin Core и получить ÑпиÑок доÑтупных опций командной Ñтроки.</translation>
</message>
<message>
- <location line="+126"/>
+ <location line="+159"/>
<location line="+5"/>
<source>Bitcoin client</source>
<translation>Bitcoin клиент</translation>
</message>
<message numerus="yes">
- <location line="+133"/>
+ <location line="+142"/>
<source>%n active connection(s) to Bitcoin network</source>
- <translation><numerusform>%n активное Ñоединение Ñ Ñетью</numerusform><numerusform>%n активных Ñоединений Ñ Ñетью</numerusform><numerusform>%n активных Ñоединений Ñ Ñетью</numerusform></translation>
+ <translation><numerusform>%n активное Ñоединение Ñ Ñетью</numerusform><numerusform>%n активных Ñоединений Ñ Ñетью</numerusform><numerusform>%n активных Ñоединений Ñ Ñетью Bitcoin</numerusform></translation>
</message>
<message>
<location line="+22"/>
@@ -589,7 +602,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Обработано %1 блоков иÑтории транзакций.</translation>
</message>
<message numerus="yes">
- <location line="+20"/>
+ <location line="+23"/>
<source>%n hour(s)</source>
<translation><numerusform>%n чаÑ</numerusform><numerusform>%n чаÑа</numerusform><numerusform>%n чаÑов</numerusform></translation>
</message>
@@ -609,7 +622,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>%1 позади</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="+21"/>
<source>Last received block was generated %1 ago.</source>
<translation>ПоÑледний полученный блок был Ñгенерирован %1 назад.</translation>
</message>
@@ -634,27 +647,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>ИнформациÑ</translation>
</message>
<message>
- <location line="+77"/>
- <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="-152"/>
+ <location line="-85"/>
<source>Up to date</source>
<translation>Синхронизировано</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Catching up...</source>
<translation>СинхронизируетÑÑ...</translation>
</message>
<message>
- <location line="+124"/>
- <source>Confirm transaction fee</source>
- <translation>Подтвердите комиÑÑию</translation>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+130"/>
<source>Sent transaction</source>
<translation>ИÑходÑÑ‰Ð°Ñ Ñ‚Ñ€Ð°Ð½Ð·Ð°ÐºÑ†Ð¸Ñ</translation>
</message>
@@ -671,13 +674,13 @@ Type: %3
Address: %4
</source>
<translation>Дата: %1
-КоличеÑтво: %2
+Сумма: %2
Тип: %3
ÐдреÑ: %4
</translation>
</message>
<message>
- <location line="+67"/>
+ <location line="+69"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation>Бумажник &lt;b&gt;зашифрован&lt;/b&gt; и в наÑтоÑщее Ð²Ñ€ÐµÐ¼Ñ &lt;b&gt;разблокирован&lt;/b&gt;</translation>
</message>
@@ -687,7 +690,7 @@ Address: %4
<translation>Бумажник &lt;b&gt;зашифрован&lt;/b&gt; и в наÑтоÑщее Ð²Ñ€ÐµÐ¼Ñ &lt;b&gt;заблокирован&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+116"/>
+ <location filename="../bitcoin.cpp" line="+438"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation>Произошла неиÑÐ¿Ñ€Ð°Ð²Ð¸Ð¼Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°. Bitcoin не может безопаÑно продолжать работу и будет закрыт.</translation>
</message>
@@ -720,7 +723,7 @@ Address: %4
<message>
<location line="+45"/>
<source>Amount:</source>
- <translation>КоличеÑтво:</translation>
+ <translation>Сумма:</translation>
</message>
<message>
<location line="+29"/>
@@ -765,7 +768,7 @@ Address: %4
<message>
<location line="+52"/>
<source>Amount</source>
- <translation>КоличеÑтво</translation>
+ <translation>Сумма</translation>
</message>
<message>
<location line="+10"/>
@@ -909,7 +912,12 @@ Address: %4
<translation>(%1 заблокировано)</translation>
</message>
<message>
- <location line="+171"/>
+ <location line="+31"/>
+ <source>none</source>
+ <translation>ничего</translation>
+ </message>
+ <message>
+ <location line="+140"/>
<source>Dust</source>
<translation>Пыль</translation>
</message>
@@ -932,7 +940,7 @@ Address: %4
<location line="+1"/>
<location line="+5"/>
<source>This means a fee of at least %1 per kB is required.</source>
- <translation>Это значит, что требуетÑÑ ÐºÐ¾Ð¼Ð¸ÑÑÐ¸Ñ ÐºÐ°Ðº минимум %1 на Кб.</translation>
+ <translation>Это значит, что требуетÑÑ ÐºÐ¾Ð¼Ð¸ÑÑÐ¸Ñ ÐºÐ°Ðº минимум %1 на КБ.</translation>
</message>
<message>
<location line="-4"/>
@@ -946,8 +954,8 @@ Address: %4
</message>
<message>
<location line="+1"/>
- <source>This label turns red, if the priority is smaller than &quot;medium&quot;</source>
- <translation>Эта пометка ÑтановитÑÑ ÐºÑ€Ð°Ñной, еÑли приоритет ниже, чем &quot;Ñредний&quot;</translation>
+ <source>This label turns red, if the priority is smaller than &quot;medium&quot;.</source>
+ <translation>Эта пометка ÑтановитÑÑ ÐºÑ€Ð°Ñной, еÑли приоритет ниже, чем &quot;Ñредний&quot;.</translation>
</message>
<message>
<location line="+3"/>
@@ -1015,7 +1023,7 @@ Address: %4
<translation>&amp;ÐдреÑ</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+25"/>
+ <location filename="../editaddressdialog.cpp" line="+28"/>
<source>New receiving address</source>
<translation>Ðовый Ð°Ð´Ñ€ÐµÑ Ð´Ð»Ñ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ</translation>
</message>
@@ -1070,7 +1078,7 @@ Address: %4
<message>
<location line="+2"/>
<source>Directory already exists. Add %1 if you intend to create a new directory here.</source>
- <translation>Каталог уже ÑущеÑтвут. Добавьте %1, еÑли вы хотите Ñоздать здеÑÑŒ новый каталог.</translation>
+ <translation>Каталог уже ÑущеÑтвует. Добавьте %1, еÑли вы хотите Ñоздать здеÑÑŒ новый каталог.</translation>
</message>
<message>
<location line="+3"/>
@@ -1084,27 +1092,31 @@ Address: %4
</message>
</context>
<context>
- <name>GUIUtil::HelpMessageBox</name>
+ <name>HelpMessageDialog</name>
<message>
- <location filename="../guiutil.cpp" line="+597"/>
- <source>version</source>
- <translation>верÑиÑ</translation>
+ <location filename="../forms/helpmessagedialog.ui" line="+19"/>
+ <source>Bitcoin Core - Command-line options</source>
+ <translation>Bitcoin Core - опции командной Ñтроки</translation>
</message>
<message>
- <location line="+0"/>
- <location line="+13"/>
+ <location filename="../utilitydialog.cpp" line="+38"/>
<source>Bitcoin Core</source>
- <translation>Ядро Bitcoin</translation>
+ <translation>Bitcoin Core</translation>
</message>
<message>
- <location line="-11"/>
+ <location line="+0"/>
+ <source>version</source>
+ <translation>верÑиÑ</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Usage:</source>
<translation>ИÑпользование:</translation>
</message>
<message>
<location line="+1"/>
<source>command-line options</source>
- <translation>параметры командной Ñтроки</translation>
+ <translation>опции командной Ñтроки</translation>
</message>
<message>
<location line="+4"/>
@@ -1152,7 +1164,7 @@ Address: %4
<message>
<location line="+10"/>
<source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
- <translation>Bitcoin Core Ñкачает и Ñохранит копию цепи блоков. Как минимум, %1GB данных будет хранитьÑÑ Ð² Ñтом каталоге, и Ñо временем он будет раÑти. Бумажник будет также Ñохранён в Ñтом каталоге.</translation>
+ <translation>Bitcoin Core Ñкачает и Ñохранит копию цепи блоков. Как минимум, %1ГБ данных будет хранитьÑÑ Ð² Ñтом каталоге, и Ñо временем он будет раÑти. Бумажник будет также Ñохранён в Ñтом каталоге.</translation>
</message>
<message>
<location line="+10"/>
@@ -1167,7 +1179,7 @@ Address: %4
<message>
<location filename="../intro.cpp" line="+85"/>
<source>Bitcoin</source>
- <translation>Биткоин</translation>
+ <translation>Bitcoin</translation>
</message>
<message>
<location line="+1"/>
@@ -1182,12 +1194,12 @@ Address: %4
<message>
<location line="+9"/>
<source>GB of free space available</source>
- <translation>Гб Ñвободного меÑта доÑтупно</translation>
+ <translation>ГБ Ñвободного меÑта доÑтупно</translation>
</message>
<message>
<location line="+3"/>
<source>(of %1GB needed)</source>
- <translation>(из необходимых %1GB)</translation>
+ <translation>(из необходимых %1ГБ)</translation>
</message>
</context>
<context>
@@ -1226,7 +1238,7 @@ Address: %4
<translation>Опции</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+13"/>
<source>&amp;Main</source>
<translation>&amp;ГлавнаÑ</translation>
</message>
@@ -1251,7 +1263,52 @@ Address: %4
<translation>&amp;ЗапуÑкать Bitcoin при входе в ÑиÑтему</translation>
</message>
<message>
- <location line="+35"/>
+ <location line="+9"/>
+ <source>Size of &amp;database cache</source>
+ <translation>Размер кÑша &amp;БД</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set database cache size in megabytes (default: 25)</source>
+ <translation>УÑтановить размера кÑша БД в мегабайтах (по умолчанию: 25)</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>MB</source>
+ <translation>МБ</translation>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Number of script &amp;verification threads</source>
+ <translation>ЧиÑло потоков проверки &amp;ÑценариÑ</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
+ <translation>Задать чиÑло потоков проверки ÑÑ†ÐµÐ½Ð°Ñ€Ð¸Ñ (вплоть до 16, 0=авто, &lt;0 = оÑтавить Ñтолько Ñдер Ñвободными, по умолчанию: 0)</translation>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Connect to the Bitcoin network through a SOCKS proxy.</source>
+ <translation>ПодключатьÑÑ Ðº Ñети Bitcoin через прокÑи SOCKS.</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Connect through SOCKS proxy (default proxy):</source>
+ <translation>&amp;ПодключатьÑÑ Ñ‡ÐµÑ€ÐµÐ· SOCKS прокÑи (прокÑи по умолчанию):</translation>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
+ <translation>IP-Ð°Ð´Ñ€ÐµÑ Ð¿Ñ€Ð¾ÐºÑи (например IPv4: 127.0.0.1 / IPv6: ::1)</translation>
+ </message>
+ <message>
+ <location line="+224"/>
+ <source>Active command-line options that override above options:</source>
+ <translation>Ðктивные опции командной Ñтроки, которые перекрывают вышеуказанные опции:</translation>
+ </message>
+ <message>
+ <location line="+43"/>
<source>Reset all client options to default.</source>
<translation>СброÑить вÑе опции клиента на Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð¿Ð¾ умолчанию.</translation>
</message>
@@ -1261,7 +1318,7 @@ Address: %4
<translation>&amp;СброÑить опции</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="-323"/>
<source>&amp;Network</source>
<translation>&amp;Сеть</translation>
</message>
@@ -1276,32 +1333,17 @@ Address: %4
<translation>ПроброÑить порт через &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>ПодключатьÑÑ Ðº Ñети Bitcoin через прокÑи SOCKS (например, при подключении через Tor).</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>&amp;Connect through SOCKS proxy:</source>
- <translation>&amp;ПодключатьÑÑ Ñ‡ÐµÑ€ÐµÐ· SOCKS прокÑи:</translation>
- </message>
- <message>
- <location line="+9"/>
+ <location line="+19"/>
<source>Proxy &amp;IP:</source>
<translation>&amp;IP ПрокÑи: </translation>
</message>
<message>
- <location line="+19"/>
- <source>IP address of the proxy (e.g. 127.0.0.1)</source>
- <translation>IP-Ð°Ð´Ñ€ÐµÑ Ð¿Ñ€Ð¾ÐºÑи (например 127.0.0.1)</translation>
- </message>
- <message>
- <location line="+7"/>
+ <location line="+32"/>
<source>&amp;Port:</source>
<translation>По&amp;рт: </translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+25"/>
<source>Port of the proxy (e.g. 9050)</source>
<translation>Порт прокÑи-Ñервера (например, 9050)</translation>
</message>
@@ -1386,7 +1428,7 @@ Address: %4
<translation>Показать функции &amp;ÐºÐ¾Ð½Ñ‚Ñ€Ð¾Ð»Ñ Ð¼Ð¾Ð½ÐµÑ‚ (только Ð´Ð»Ñ ÑкÑпертов)</translation>
</message>
<message>
- <location line="+71"/>
+ <location line="+136"/>
<source>&amp;OK</source>
<translation>&amp;OK</translation>
</message>
@@ -1396,44 +1438,38 @@ Address: %4
<translation>&amp;Отмена</translation>
</message>
<message>
- <location line="+10"/>
- <source>&amp;Apply</source>
- <translation>&amp;Применить</translation>
- </message>
- <message>
- <location filename="../optionsdialog.cpp" line="+63"/>
+ <location filename="../optionsdialog.cpp" line="+67"/>
<source>default</source>
<translation>по умолчанию</translation>
</message>
<message>
- <location line="+131"/>
+ <location line="+57"/>
+ <source>none</source>
+ <translation>ничего</translation>
+ </message>
+ <message>
+ <location line="+75"/>
<source>Confirm options reset</source>
<translation>Подтвердите ÑÐ±Ñ€Ð¾Ñ Ð¾Ð¿Ñ†Ð¸Ð¹</translation>
</message>
<message>
<location line="+1"/>
- <source>Some settings may require a client restart to take effect.</source>
- <translation>Ðекоторые наÑтройки могут потребовать перезапуÑк клиента, чтобы вÑтупить в Ñилу.</translation>
+ <location line="+29"/>
+ <source>Client restart required to activate changes.</source>
+ <translation>Ð”Ð»Ñ Ð¿Ñ€Ð¸Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹ требуетÑÑ Ð¿ÐµÑ€ÐµÐ·Ð°Ð¿ÑƒÑк клиента.</translation>
</message>
<message>
- <location line="+0"/>
- <source>Do you want to proceed?</source>
- <translation>Желаете продолжить?</translation>
+ <location line="-29"/>
+ <source>Client will be shutdown, do you want to proceed?</source>
+ <translation>Клиент будет выключен, желаете продолжить?</translation>
</message>
<message>
- <location line="+42"/>
- <location line="+9"/>
- <source>Warning</source>
- <translation>Внимание</translation>
+ <location line="+33"/>
+ <source>This change would require a client restart.</source>
+ <translation>Это изменение потребует перезапуÑка клиента.</translation>
</message>
<message>
- <location line="-9"/>
- <location line="+9"/>
- <source>This setting will take effect after restarting Bitcoin.</source>
- <translation>Эта наÑтройка вÑтупит в Ñилу поÑле перезапуÑка Bitcoin</translation>
- </message>
- <message>
- <location line="+29"/>
+ <location line="+34"/>
<source>The supplied proxy address is invalid.</source>
<translation>ÐÐ´Ñ€ÐµÑ Ð¿Ñ€Ð¾ÐºÑи неверен.</translation>
</message>
@@ -1447,22 +1483,22 @@ Address: %4
</message>
<message>
<location line="+50"/>
- <location line="+214"/>
+ <location line="+231"/>
<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="-140"/>
+ <location line="-155"/>
<source>Unconfirmed:</source>
<translation>Ðе подтверждено:</translation>
</message>
<message>
- <location line="-81"/>
+ <location line="-83"/>
<source>Wallet</source>
<translation>Бумажник</translation>
</message>
<message>
- <location line="+49"/>
+ <location line="+51"/>
<source>Confirmed:</source>
<translation>Подтверждено</translation>
</message>
@@ -1497,7 +1533,7 @@ Address: %4
<translation>Ваш текущий общий баланÑ</translation>
</message>
<message>
- <location line="+56"/>
+ <location line="+71"/>
<source>&lt;b&gt;Recent transactions&lt;/b&gt;</source>
<translation>&lt;b&gt;ПоÑледние транзакции&lt;/b&gt;</translation>
</message>
@@ -1511,7 +1547,8 @@ Address: %4
<context>
<name>PaymentServer</name>
<message>
- <location filename="../paymentserver.cpp" line="+397"/>
+ <location filename="../paymentserver.cpp" line="+403"/>
+ <location line="+13"/>
<source>URI handling</source>
<translation>Обработка URI</translation>
</message>
@@ -1521,24 +1558,52 @@ Address: %4
<translation>Ðе удалоÑÑŒ обработать URI! Это может быть ÑвÑзано Ñ Ð½ÐµÐ²ÐµÑ€Ð½Ñ‹Ð¼ адреÑом Bitcoin или неправильными параметрами URI.</translation>
</message>
<message>
- <location line="+91"/>
+ <location line="+96"/>
<source>Requested payment amount of %1 is too small (considered dust).</source>
- <translation>Запрошенный размер платежа %1 Ñлишком мал (ÑчитаетÑÑ Ð¿Ñ‹Ð»ÑŒÑŽ).</translation>
+ <translation>Ð—Ð°Ð¿Ñ€Ð¾ÑˆÐµÐ½Ð½Ð°Ñ Ñумма платежа %1 Ñлишком мала (ÑчитаетÑÑ Ð¿Ñ‹Ð»ÑŒÑŽ).</translation>
</message>
<message>
- <location line="-204"/>
- <location line="+195"/>
+ <location line="-221"/>
+ <location line="+212"/>
<location line="+13"/>
+ <location line="+95"/>
+ <location line="+18"/>
+ <location line="+16"/>
<source>Payment request error</source>
<translation>Ошибка запроÑа платежа</translation>
</message>
<message>
- <location line="-207"/>
+ <location line="-353"/>
<source>Cannot start bitcoin: click-to-pay handler</source>
<translation>Ðе удаётÑÑ Ð·Ð°Ð¿ÑƒÑтить bitcoin: обработчик click-to-pay</translation>
</message>
<message>
- <location line="+195"/>
+ <location line="+58"/>
+ <source>Net manager warning</source>
+ <translation>Предупреждение менеджера Ñети</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Your active proxy doesn&apos;t support SOCKS5, which is required for payment requests via proxy.</source>
+ <translation>Ðктивный прокÑи не поддерживает SOCKS5, который необходим Ð´Ð»Ñ Ð·Ð°Ð¿Ñ€Ð¾Ñа платежей через прокÑи.</translation>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>Payment request fetch URL is invalid: %1</source>
+ <translation>Ðеверный URL запроÑа платежа: %1</translation>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Payment request file handling</source>
+ <translation>Обработка файла запроÑа платежа</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Payment request file can not be read or processed! This can be caused by an invalid payment request file.</source>
+ <translation>Файл запроÑа платежа не может быть прочитан или обработан! Обычно Ñто проиÑходит из-за неверного файла запроÑа платежа.</translation>
+ </message>
+ <message>
+ <location line="+73"/>
<source>Unverified payment requests to custom payment scripts are unsupported.</source>
<translation>Ðепроверенные запроÑÑ‹ платежей Ñ Ð½ÐµÑтандартными платёжными ÑценариÑми не поддерживаютÑÑ.</translation>
</message>
@@ -1548,24 +1613,27 @@ Address: %4
<translation>Возврат от %1</translation>
</message>
<message>
- <location line="+42"/>
+ <location line="+43"/>
<source>Error communicating with %1: %2</source>
<translation>Ошибка ÑвÑзи Ñ %1: %2</translation>
</message>
<message>
- <location line="+28"/>
+ <location line="+24"/>
+ <source>Payment request can not be parsed or processed!</source>
+ <translation>Ð—Ð°Ð¿Ñ€Ð¾Ñ Ð¿Ð»Ð°Ñ‚ÐµÐ¶Ð° не может быть разобран или обработан!</translation>
+ </message>
+ <message>
+ <location line="+11"/>
<source>Bad response from server %1</source>
<translation>Плохой ответ от Ñервера %1</translation>
</message>
<message>
- <location line="+32"/>
+ <location line="+33"/>
<source>Payment acknowledged</source>
<translation>Платёж принÑÑ‚</translation>
</message>
<message>
- <location line="-55"/>
- <location line="+27"/>
- <location line="+17"/>
+ <location line="-11"/>
<source>Network request error</source>
<translation>Ошибка Ñетевого запроÑа</translation>
</message>
@@ -1573,18 +1641,18 @@ Address: %4
<context>
<name>QObject</name>
<message>
- <location filename="../bitcoin.cpp" line="+119"/>
- <location line="+5"/>
+ <location filename="../bitcoin.cpp" line="+71"/>
+ <location line="+11"/>
<source>Bitcoin</source>
- <translation>Биткоин</translation>
+ <translation>Bitcoin</translation>
</message>
<message>
- <location line="-4"/>
+ <location line="+1"/>
<source>Error: Specified data directory &quot;%1&quot; does not exist.</source>
<translation>Ошибка: указанный каталог &quot;%1&quot; не ÑущеÑтвует.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="-12"/>
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation>Ошибка: Ð½ÐµÐ²ÐµÑ€Ð½Ð°Ñ ÐºÐ¾Ð¼Ð±Ð¸Ð½Ð°Ñ†Ð¸Ñ -regtest и -testnet.</translation>
</message>
@@ -1626,15 +1694,16 @@ Address: %4
<location line="+23"/>
<location line="+23"/>
<location line="+36"/>
- <location line="+53"/>
+ <location line="+23"/>
+ <location line="+36"/>
<location line="+23"/>
<location line="+23"/>
- <location filename="../rpcconsole.cpp" line="+360"/>
+ <location filename="../rpcconsole.cpp" line="+359"/>
<source>N/A</source>
<translation>Ð/Д</translation>
</message>
<message>
- <location line="-217"/>
+ <location line="-223"/>
<source>Client version</source>
<translation>ВерÑÐ¸Ñ ÐºÐ»Ð¸ÐµÐ½Ñ‚Ð°</translation>
</message>
@@ -1649,7 +1718,12 @@ Address: %4
<translation>Окно отладки</translation>
</message>
<message>
- <location line="+78"/>
+ <location line="+25"/>
+ <source>General</source>
+ <translation>Общие</translation>
+ </message>
+ <message>
+ <location line="+53"/>
<source>Using OpenSSL version</source>
<translation>ИÑпользуетÑÑ Ð²ÐµÑ€ÑÐ¸Ñ OpenSSL</translation>
</message>
@@ -1665,16 +1739,16 @@ Address: %4
</message>
<message>
<location line="+7"/>
- <source>Number of connections</source>
- <translation>ЧиÑло подключений</translation>
+ <source>Name</source>
+ <translation>ИмÑ</translation>
</message>
<message>
<location line="+23"/>
- <source>On testnet</source>
- <translation>Ð’ теÑтовой Ñети</translation>
+ <source>Number of connections</source>
+ <translation>ЧиÑло подключений</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+29"/>
<source>Block chain</source>
<translation>Цепь блоков</translation>
</message>
@@ -1699,16 +1773,6 @@ Address: %4
<translation>&amp;Открыть</translation>
</message>
<message>
- <location line="+16"/>
- <source>Command-line options</source>
- <translation>Параметры командной Ñтроки</translation>
- </message>
- <message>
- <location line="+10"/>
- <source>&amp;Show</source>
- <translation>&amp;Показать</translation>
- </message>
- <message>
<location line="+24"/>
<source>&amp;Console</source>
<translation>КонÑоль</translation>
@@ -1739,17 +1803,12 @@ Address: %4
<translation>Выход:</translation>
</message>
<message>
- <location line="-541"/>
+ <location line="-521"/>
<source>Build date</source>
<translation>Дата Ñборки</translation>
</message>
<message>
- <location line="-79"/>
- <source>Bitcoin Core</source>
- <translation>Ядро Bitcoin</translation>
- </message>
- <message>
- <location line="+279"/>
+ <location line="+206"/>
<source>Debug log file</source>
<translation>Отладочный лог-файл</translation>
</message>
@@ -1759,11 +1818,6 @@ Address: %4
<translation>Открыть отладочный лог-файл Bitcoin из текущего каталога данных. Это может занÑÑ‚ÑŒ неÑколько Ñекунд Ð´Ð»Ñ Ð±Ð¾Ð»ÑŒÑˆÐ¸Ñ… лог-файлов.</translation>
</message>
<message>
- <location line="+26"/>
- <source>Show the Bitcoin-Core help message to get a list with possible Bitcoin command-line options.</source>
- <translation>Показать помощь по Bitcoin Core, чтобы получить ÑпиÑок доÑтупных параметров командной Ñтроки.</translation>
- </message>
- <message>
<location line="+76"/>
<source>Clear console</source>
<translation>ОчиÑтить конÑоль</translation>
@@ -1784,7 +1838,7 @@ Address: %4
<translation>Ðапишите &lt;b&gt;help&lt;/b&gt; Ð´Ð»Ñ Ð¿Ñ€Ð¾Ñмотра доÑтупных команд.</translation>
</message>
<message>
- <location line="+128"/>
+ <location line="+122"/>
<source>%1 B</source>
<translation>%1 Б</translation>
</message>
@@ -1824,15 +1878,10 @@ Address: %4
<message>
<location filename="../forms/receivecoinsdialog.ui" line="+83"/>
<source>&amp;Amount:</source>
- <translation>&amp;КоличеÑтво:</translation>
+ <translation>&amp;Сумма:</translation>
</message>
<message>
- <location line="+19"/>
- <source>The amount to request</source>
- <translation>Объём запроÑа</translation>
- </message>
- <message>
- <location line="-32"/>
+ <location line="-13"/>
<source>&amp;Label:</source>
<translation>&amp;Метка:</translation>
</message>
@@ -1842,32 +1891,37 @@ Address: %4
<translation>&amp;Сообщение</translation>
</message>
<message>
- <location line="+20"/>
- <source>The message to attach to payment request</source>
- <translation>Прикрепить Ñообщение к запроÑу платежа</translation>
- </message>
- <message>
- <location line="-37"/>
+ <location line="-17"/>
<source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
- <translation>РеиÑпользовать один из ранее иÑпользованных адреÑов. РеиÑпользование адреÑов неÑÑ‘Ñ‚ риÑки безопаÑноÑти и приватноÑти. Ðе иÑпользуйте Ñту опцию, еÑли вы не переÑоздаёте ранее Ñделанный Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð¿Ð»Ð°Ñ‚ÐµÐ¶Ð°.</translation>
+ <translation>Повторно иÑпользовать один из ранее иÑпользованных адреÑов. Повторное иÑпользование адреÑов неÑÑ‘Ñ‚ риÑки безопаÑноÑти и приватноÑти. Ðе иÑпользуйте Ñту опцию, еÑли вы не Ñоздаёте повторно ранее Ñделанный Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð¿Ð»Ð°Ñ‚ÐµÐ¶Ð°.</translation>
</message>
<message>
<location line="+3"/>
<source>R&amp;euse an existing receiving address (not recommended)</source>
- <translation>&amp;РеиÑпользовать ÑущеÑтвующий Ð°Ð´Ñ€ÐµÑ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ (не рекомендуетÑÑ)</translation>
+ <translation>&amp;Повторно иÑпользовать ÑущеÑтвующий Ð°Ð´Ñ€ÐµÑ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ (не рекомендуетÑÑ)</translation>
</message>
<message>
<location line="+27"/>
- <source>The label to associate with the new receiving address</source>
- <translation>Метка, ÑвÑÐ·Ð°Ð½Ð½Ð°Ñ Ñ Ð½Ð¾Ð²Ñ‹Ð¼ адреÑом получениÑ</translation>
+ <source>An optional label to associate with the new receiving address</source>
+ <translation>ÐеобÑÐ·Ð°Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ Ð¼ÐµÑ‚ÐºÐ° Ð´Ð»Ñ Ð½Ð¾Ð²Ð¾Ð³Ð¾ адреÑа получениÑ</translation>
</message>
<message>
- <location line="+14"/>
- <source>Use this form to request payments. All fields are optional.</source>
- <translation>ИÑпользуйте Ñту форму Ð´Ð»Ñ Ð·Ð°Ð¿Ñ€Ð¾Ñа платежей. Ð’Ñе Ð¿Ð¾Ð»Ñ Ð½ÐµÐ¾Ð±Ñзательны.</translation>
+ <location line="+7"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
+ <translation>ÐеобÑзательное Ñообщение Ð´Ð»Ñ Ð·Ð°Ð¿Ñ€Ð¾Ñа платежа, которое будет показано при открытии запроÑа. Внимание: Ñообщение не будет отправлено вмеÑте Ñ Ð¿Ð»Ð°Ñ‚ÐµÐ¶Ð¾Ð¼ через Ñеть Bitcoin.</translation>
</message>
<message>
- <location line="+56"/>
+ <location line="+7"/>
+ <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
+ <translation>Заполните форму Ð´Ð»Ñ Ð·Ð°Ð¿Ñ€Ð¾Ñа платежей. Ð’Ñе Ð¿Ð¾Ð»Ñ &lt;b&gt;необÑзательны&lt;/b&gt;.</translation>
+ </message>
+ <message>
+ <location line="+39"/>
+ <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
+ <translation>ÐеобÑÐ·Ð°Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ Ñумма Ð´Ð»Ñ Ð·Ð°Ð¿Ñ€Ð¾Ñа. ОÑтавьте пуÑтым или укажите ноль, чтобы запроÑить неопределённую Ñумму.</translation>
+ </message>
+ <message>
+ <location line="+17"/>
<source>Clear all fields of the form.</source>
<translation>ОчиÑтить вÑе Ð¿Ð¾Ð»Ñ Ñ„Ð¾Ñ€Ð¼Ñ‹.</translation>
</message>
@@ -1883,11 +1937,11 @@ Address: %4
</message>
<message>
<location line="+47"/>
- <source>Previously requested payments</source>
- <translation>Ранее запрошенные платежи</translation>
+ <source>Requested payments</source>
+ <translation>Запрошенные платежи</translation>
</message>
<message>
- <location line="+12"/>
+ <location line="+16"/>
<source>Show the selected request (does the same as double clicking an entry)</source>
<translation>Показать выбранный Ð·Ð°Ð¿Ñ€Ð¾Ñ (то же Ñамое, что и двойной клик по запиÑи)</translation>
</message>
@@ -1952,7 +2006,7 @@ Address: %4
<message>
<location line="+2"/>
<source>Amount</source>
- <translation>КоличеÑтво</translation>
+ <translation>Сумма</translation>
</message>
<message>
<location line="+2"/>
@@ -1978,7 +2032,7 @@ Address: %4
<context>
<name>RecentRequestsTableModel</name>
<message>
- <location filename="../recentrequeststablemodel.cpp" line="+14"/>
+ <location filename="../recentrequeststablemodel.cpp" line="+24"/>
<source>Date</source>
<translation>Дата</translation>
</message>
@@ -1995,10 +2049,10 @@ Address: %4
<message>
<location line="+0"/>
<source>Amount</source>
- <translation>КоличеÑтво</translation>
+ <translation>Сумма</translation>
</message>
<message>
- <location line="+36"/>
+ <location line="+38"/>
<source>(no label)</source>
<translation>[нет метки]</translation>
</message>
@@ -2013,7 +2067,7 @@ Address: %4
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
<location filename="../sendcoinsdialog.cpp" line="+381"/>
- <location line="+81"/>
+ <location line="+80"/>
<source>Send Coins</source>
<translation>Отправка</translation>
</message>
@@ -2050,7 +2104,7 @@ Address: %4
<message>
<location line="+48"/>
<source>Amount:</source>
- <translation>КоличеÑтво:</translation>
+ <translation>Сумма:</translation>
</message>
<message>
<location line="+32"/>
@@ -2123,7 +2177,7 @@ Address: %4
<translation>&amp;Отправить</translation>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-229"/>
+ <location filename="../sendcoinsdialog.cpp" line="-228"/>
<source>Confirm send coins</source>
<translation>Подтвердите отправку монет</translation>
</message>
@@ -2183,7 +2237,7 @@ Address: %4
<message>
<location line="+170"/>
<source>Total Amount %1 (= %2)</source>
- <translation>ÐžÐ±ÑˆÐ°Ñ Ñумма %1 (= %2)</translation>
+ <translation>ÐžÐ±Ñ‰Ð°Ñ Ñумма %1 (= %2)</translation>
</message>
<message>
<location line="+2"/>
@@ -2198,12 +2252,12 @@ Address: %4
<message>
<location line="+3"/>
<source>The amount to pay must be larger than 0.</source>
- <translation>КоличеÑтво монет Ð´Ð»Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸ должно быть больше 0.</translation>
+ <translation>Сумма Ð´Ð»Ñ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ¸ должно быть больше 0.</translation>
</message>
<message>
<location line="+3"/>
<source>The amount exceeds your balance.</source>
- <translation>КоличеÑтво отправлÑемых монет превышает Ваш баланÑ</translation>
+ <translation>Сумма превышает Ваш баланÑ</translation>
</message>
<message>
<location line="+3"/>
@@ -2226,22 +2280,22 @@ Address: %4
<translation>Ð¢Ñ€Ð°Ð½Ð·Ð°ÐºÑ†Ð¸Ñ Ð±Ñ‹Ð»Ð° отклонена! Такое может произойти, еÑли некоторые монеты уже были потрачены, например, еÑли Ð’Ñ‹ иÑпользуете одну копию бумажника (wallet.dat), а монеты были потрачены из другой копии, но не были отмечены как потраченные в Ñтой.</translation>
</message>
<message>
- <location line="+113"/>
+ <location line="+112"/>
<source>Warning: Invalid Bitcoin address</source>
<translation>Внимание: неверный Ð°Ð´Ñ€ÐµÑ Bitcoin</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+21"/>
<source>(no label)</source>
<translation>[нет метки]</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="-11"/>
<source>Warning: Unknown change address</source>
- <translation>Внимание: неизвеÑтный Ð°Ð´Ñ€ÐµÑ Ñдачи</translation>
+ <translation>Внимание: неизвеÑтный Ð°Ð´Ñ€ÐµÑ Ð´Ð»Ñ Ñдачи</translation>
</message>
<message>
- <location line="-378"/>
+ <location line="-366"/>
<source>Are you sure you want to send?</source>
<translation>Вы уверены, что хотите отправить?</translation>
</message>
@@ -2265,13 +2319,13 @@ Address: %4
<name>SendCoinsEntry</name>
<message>
<location filename="../forms/sendcoinsentry.ui" line="+131"/>
- <location line="+501"/>
+ <location line="+521"/>
<location line="+536"/>
<source>A&amp;mount:</source>
<translation>Ко&amp;личеÑтво:</translation>
</message>
<message>
- <location line="-1132"/>
+ <location line="-1152"/>
<source>Pay &amp;To:</source>
<translation>Полу&amp;чатель:</translation>
</message>
@@ -2317,23 +2371,33 @@ Address: %4
</message>
<message>
<location line="+7"/>
- <location line="+504"/>
+ <location line="+524"/>
<location line="+536"/>
<source>Remove this entry</source>
<translation>Удалить Ñту запиÑÑŒ</translation>
</message>
<message>
- <location line="-40"/>
+ <location line="-1008"/>
+ <source>Message:</source>
+ <translation>Сообщение:</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation>Сообщение, прикреплённое к Bitcoin URI, которое будет Ñохранено вмеÑте Ñ Ñ‚Ñ€Ð°Ð½Ð·Ð°ÐºÑ†Ð¸ÐµÐ¹ Ð´Ð»Ñ Ð²Ð°ÑˆÐµÐ³Ð¾ ÑведениÑ. Внимание: Ñто Ñообщение не будет отправлено через Ñеть Bitcoin.</translation>
+ </message>
+ <message>
+ <location line="+958"/>
<source>This is a verified payment request.</source>
<translation>Это проверенный Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð¿Ð»Ð°Ñ‚ÐµÐ¶Ð°.</translation>
</message>
<message>
- <location line="-971"/>
+ <location line="-991"/>
<source>Enter a label for this address to add it to the list of used addresses</source>
<translation>Введите метку Ð´Ð»Ñ Ñтого адреÑа, чтобы добавить его в ÑпиÑок иÑпользованных</translation>
</message>
<message>
- <location line="+439"/>
+ <location line="+459"/>
<source>This is an unverified payment request.</source>
<translation>Это непроверенный Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð¿Ð»Ð°Ñ‚ÐµÐ¶Ð°.</translation>
</message>
@@ -2352,7 +2416,20 @@ Address: %4
<message>
<location filename="../sendcoinsentry.cpp" line="+1"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>Введите Bitcoin-Ð°Ð´Ñ€ÐµÑ (например 1LA5FtQhnnWnkK6zjFfutR7Stiit4wKd63)</translation>
+ <translation>Введите Bitcoin-Ð°Ð´Ñ€ÐµÑ (например 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ </message>
+</context>
+<context>
+ <name>ShutdownWindow</name>
+ <message>
+ <location filename="../utilitydialog.cpp" line="+48"/>
+ <source>Bitcoin Core is shutting down...</source>
+ <translation>Bitcoin Core выключаетÑÑ...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Do not shut down the computer until this window disappears.</source>
+ <translation>Ðе выключайте компьютер, пока Ñто окно не иÑчезнет.</translation>
</message>
</context>
<context>
@@ -2363,7 +2440,7 @@ Address: %4
<translation>ПодпиÑи - подпиÑать/проверить Ñообщение</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+10"/>
<source>&amp;Sign Message</source>
<translation>&amp;ПодпиÑать Ñообщение</translation>
</message>
@@ -2551,9 +2628,9 @@ Address: %4
<context>
<name>SplashScreen</name>
<message>
- <location filename="../splashscreen.cpp" line="+26"/>
+ <location filename="../splashscreen.cpp" line="+28"/>
<source>Bitcoin Core</source>
- <translation>Ядро Bitcoin</translation>
+ <translation>Bitcoin Core</translation>
</message>
<message>
<location line="+2"/>
@@ -2650,12 +2727,12 @@ Address: %4
<location line="+12"/>
<location line="+45"/>
<location line="+17"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Credit</source>
<translation>Кредит</translation>
</message>
<message numerus="yes">
- <location line="-120"/>
+ <location line="-125"/>
<source>matures in %n more block(s)</source>
<translation><numerusform>будет доÑтупно через %n блок</numerusform><numerusform>будет доÑтупно через %n блока</numerusform><numerusform>будет доÑтупно через %n блоков</numerusform></translation>
</message>
@@ -2668,12 +2745,12 @@ Address: %4
<location line="+44"/>
<location line="+8"/>
<location line="+15"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Debit</source>
<translation>Дебет</translation>
</message>
<message>
- <location line="-57"/>
+ <location line="-62"/>
<source>Transaction fee</source>
<translation>КомиÑÑиÑ</translation>
</message>
@@ -2684,11 +2761,12 @@ Address: %4
</message>
<message>
<location line="+6"/>
+ <location line="+9"/>
<source>Message</source>
<translation>Сообщение</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="-7"/>
<source>Comment</source>
<translation>Комментарий:</translation>
</message>
@@ -2698,7 +2776,7 @@ Address: %4
<translation>ID транзакции</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+18"/>
<source>Merchant</source>
<translation>Продавец</translation>
</message>
@@ -2725,7 +2803,7 @@ Address: %4
<message>
<location line="+23"/>
<source>Amount</source>
- <translation>КоличеÑтво</translation>
+ <translation>Сумма</translation>
</message>
<message>
<location line="+1"/>
@@ -2738,7 +2816,7 @@ Address: %4
<translation>ложь</translation>
</message>
<message>
- <location line="-227"/>
+ <location line="-232"/>
<source>, has not been successfully broadcast yet</source>
<translation>, ещё не было уÑпешно разоÑлано</translation>
</message>
@@ -2786,10 +2864,15 @@ Address: %4
<message>
<location line="+0"/>
<source>Amount</source>
- <translation>КоличеÑтво</translation>
+ <translation>Сумма</translation>
+ </message>
+ <message>
+ <location line="+59"/>
+ <source>Immature (%1 confirmations, will be available after %2)</source>
+ <translation>Ðезрелый (%1 подтверждений, будет доÑтупен поÑле %2)</translation>
</message>
<message numerus="yes">
- <location line="+57"/>
+ <location line="+16"/>
<source>Open for %n more block(s)</source>
<translation><numerusform>Открыто Ð´Ð»Ñ ÐµÑ‰Ñ‘ %n блока</numerusform><numerusform>Открыто Ð´Ð»Ñ ÐµÑ‰Ñ‘ %n блоков</numerusform><numerusform>Открыто Ð´Ð»Ñ ÐµÑ‰Ñ‘ %n блоков</numerusform></translation>
</message>
@@ -2809,17 +2892,13 @@ Address: %4
<translation>Ðе подтверждено (%1 из %2 подтверждений)</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="-22"/>
+ <location line="+25"/>
<source>Confirmed (%1 confirmations)</source>
<translation>Подтверждено (%1 подтверждений)</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>Добытыми монетами можно будет воÑпользоватьÑÑ Ñ‡ÐµÑ€ÐµÐ· %n блок</numerusform><numerusform>Добытыми монетами можно будет воÑпользоватьÑÑ Ñ‡ÐµÑ€ÐµÐ· %n блока</numerusform><numerusform>Добытыми монетами можно будет воÑпользоватьÑÑ Ñ‡ÐµÑ€ÐµÐ· %n блоков</numerusform></translation>
- </message>
<message>
- <location line="+5"/>
+ <location line="-22"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation>Этот блок не был получен другими узлами и, возможно, не будет принÑÑ‚!</translation>
</message>
@@ -2829,7 +2908,7 @@ Address: %4
<translation>Сгенерированно, но не подтверждено</translation>
</message>
<message>
- <location line="+43"/>
+ <location line="+62"/>
<source>Received with</source>
<translation>Получено</translation>
</message>
@@ -3045,7 +3124,7 @@ Address: %4
<message>
<location line="+1"/>
<source>Amount</source>
- <translation>КоличеÑтво</translation>
+ <translation>Сумма</translation>
</message>
<message>
<location line="+1"/>
@@ -3125,7 +3204,7 @@ Address: %4
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+217"/>
+ <location filename="../bitcoinstrings.cpp" line="+221"/>
<source>Usage:</source>
<translation>ИÑпользование:</translation>
</message>
@@ -3146,7 +3225,7 @@ Address: %4
<translation>Опции:</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+22"/>
<source>Specify configuration file (default: bitcoin.conf)</source>
<translation>Указать конфигурационный файл (по умолчанию: bitcoin.conf)</translation>
</message>
@@ -3166,7 +3245,7 @@ Address: %4
<translation>УÑтановить размер кÑша базы данных в мегабайтах (по умолчанию: 25)</translation>
</message>
<message>
- <location line="-27"/>
+ <location line="-26"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
<translation>Принимать входÑщие Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð½Ð° &lt;port&gt; (по умолчанию: 8333 или 18333 в теÑтовой Ñети)</translation>
</message>
@@ -3176,7 +3255,7 @@ Address: %4
<translation>Поддерживать не более &lt;n&gt; подключений к узлам (по умолчанию: 125)</translation>
</message>
<message>
- <location line="-50"/>
+ <location line="-51"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation>ПодключитьÑÑ Ðº узлу, чтобы получить ÑпиÑок адреÑов других учаÑтников и отключитьÑÑ</translation>
</message>
@@ -3186,22 +3265,22 @@ Address: %4
<translation>Укажите ваш ÑобÑтвенный публичный адреÑ</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation>Порог Ð´Ð»Ñ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð¾ ведущих ÑÐµÐ±Ñ ÑƒÐ·Ð»Ð¾Ð² (по умолчанию: 100)</translation>
</message>
<message>
- <location line="-147"/>
+ <location line="-148"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation>ЧиÑло Ñекунд Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð¾ ведущих ÑÐµÐ±Ñ ÑƒÐ·Ð»Ð¾Ð² (по умолчанию: 86400)</translation>
</message>
<message>
- <location line="-33"/>
+ <location line="-36"/>
<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="+31"/>
+ <location line="+34"/>
<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>
@@ -3211,7 +3290,7 @@ Address: %4
<translation>Принимать командную Ñтроку и команды JSON-RPC</translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>ЗапуÑкатьÑÑ Ð² фоне как демон и принимать команды</translation>
</message>
@@ -3221,12 +3300,12 @@ Address: %4
<translation>ИÑпользовать теÑтовую Ñеть</translation>
</message>
<message>
- <location line="-117"/>
+ <location line="-118"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation>Принимать Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð¸Ð·Ð²Ð½Ðµ (по умолчанию: 1, еÑли не иÑпользуетÑÑ -proxy или -connect)</translation>
</message>
<message>
- <location line="-92"/>
+ <location line="-95"/>
<source>%s, you must set a rpcpassword in the configuration file:
%s
It is recommended you use the following random password:
@@ -3277,6 +3356,11 @@ rpcpassword=%s
</message>
<message>
<location line="+4"/>
+ <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</source>
+ <translation>Войти в режим теÑÑ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð½Ð° регреÑÑии, в котором иÑпользуетÑÑ ÑÐ¿ÐµÑ†Ð¸Ð°Ð»ÑŒÐ½Ð°Ñ Ñ†ÐµÐ¿ÑŒ, где блоки находÑÑ‚ÑÑ Ð¼Ð³Ð½Ð¾Ð²ÐµÐ½Ð½Ð¾.</translation>
+ </message>
+ <message>
+ <location line="+3"/>
<source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
<translation>Ошибка: Ñ‚Ñ€Ð°Ð½Ð·Ð°ÐºÑ†Ð¸Ñ Ð±Ñ‹Ð»Ð° отклонена! Это могло произойти в Ñлучае, еÑли некоторые монеты в вашем бумажнике уже были потрачены, например, еÑли вы иÑпользуете копию wallet.dat, и монеты были иÑпользованы в копии, но не отмечены как потраченные здеÑÑŒ.</translation>
</message>
@@ -3343,12 +3427,12 @@ rpcpassword=%s
<message>
<location line="+1"/>
<source>Bitcoin Core Daemon</source>
- <translation>Bitcoin Core демон</translation>
+ <translation>Демон Bitcoin Core</translation>
</message>
<message>
<location line="+1"/>
<source>Bitcoin RPC client version</source>
- <translation>ВерÑÐ¸Ñ Bitcoin RPC клиента</translation>
+ <translation>ВерÑÐ¸Ñ RPC клиента Bitcoin</translation>
</message>
<message>
<location line="+1"/>
@@ -3382,6 +3466,11 @@ rpcpassword=%s
</message>
<message>
<location line="+1"/>
+ <source>Do not load the wallet and disable wallet RPC calls</source>
+ <translation>Ðе загружать бумажник и запретить Ð¾Ð±Ñ€Ð°Ñ‰ÐµÐ½Ð¸Ñ Ðº нему через RPC</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Do you want to rebuild the block database now?</source>
<translation>ПереÑобрать БД блоков прÑмо ÑейчаÑ?</translation>
</message>
@@ -3478,7 +3567,7 @@ rpcpassword=%s
<message>
<location line="+1"/>
<source>Fee per kB to add to transactions you send</source>
- <translation>КомиÑÑÐ¸Ñ Ð½Ð° Кб, добавлÑÐµÐ¼Ð°Ñ Ðº вашим переводам</translation>
+ <translation>КомиÑÑÐ¸Ñ Ð½Ð° КБ, добавлÑÐµÐ¼Ð°Ñ Ðº вашим переводам</translation>
</message>
<message>
<location line="+1"/>
@@ -3543,10 +3632,10 @@ rpcpassword=%s
<message>
<location line="+1"/>
<source>Send command to Bitcoin server</source>
- <translation>Отправлить команды на Bitcoin Ñервер</translation>
+ <translation>Отправлить команды на Ñервер Bitcoin</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+7"/>
<source>Set maximum block size in bytes (default: %d)</source>
<translation>Задать макÑимальный размер блока в байтах (по умолчанию: %d)</translation>
</message>
@@ -3566,7 +3655,12 @@ rpcpassword=%s
<translation>ЗапуÑтить Bitcoin Ñервер</translation>
</message>
<message>
- <location line="+12"/>
+ <location line="+3"/>
+ <source>This is intended for regression testing tools and app development.</source>
+ <translation>Это раÑÑчитано на инÑтрументы регреÑÑионного теÑÑ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¸ разработку приложений.</translation>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Usage (deprecated, use bitcoin-cli):</source>
<translation>ИÑпользование (уÑтарело, иÑпользуйте bitcoin-cli):</translation>
</message>
@@ -3591,7 +3685,12 @@ rpcpassword=%s
<translation>Бумажник %s раÑполагаетÑÑ Ð²Ð½Ðµ каталога данных %s</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="+2"/>
+ <source>Wallet options:</source>
+ <translation>Опции бумажника:</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source>
<translation>Внимание: уÑтаревший аргумент -debugnet проигнорирован, иÑпользуйте -debug=net</translation>
</message>
@@ -3601,12 +3700,12 @@ rpcpassword=%s
<translation>Вам необходимо переÑобрать базы данных Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ -reindex, чтобы изменить -txindex</translation>
</message>
<message>
- <location line="-78"/>
+ <location line="-79"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation>Импортировать блоки из внешнего файла blk000??.dat</translation>
</message>
<message>
- <location line="-104"/>
+ <location line="-105"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation>Выполнить команду, когда приходит ÑоответÑтвующее Ñообщение о тревоге или наблюдаетÑÑ Ð¾Ñ‡ÐµÐ½ÑŒ длинное раÑщепление цепи (%s в команде заменÑетÑÑ Ð½Ð° Ñообщение)</translation>
</message>
@@ -3623,22 +3722,22 @@ rpcpassword=%s
<message>
<location line="+2"/>
<source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
- <translation>Задать чиÑло потоков проверки Ñкрипта (вплоть до 16, 0=авто, &lt;0 = оÑтавить Ñтолько Ñдер Ñвободными, по умолчанию: 0)</translation>
+ <translation>Задать чиÑло потоков проверки ÑÑ†ÐµÐ½Ð°Ñ€Ð¸Ñ (вплоть до 16, 0=авто, &lt;0 = оÑтавить Ñтолько Ñдер Ñвободными, по умолчанию: 0)</translation>
</message>
<message>
- <location line="+88"/>
+ <location line="+89"/>
<source>Information</source>
<translation>ИнформациÑ</translation>
</message>
<message>
<location line="+4"/>
<source>Invalid amount for -minrelaytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
- <translation>Ðеверное количеÑтво в параметре -minrelaytxfee=&lt;кол-во&gt;: &apos;%s&apos;</translation>
+ <translation>ÐÐµÐ²ÐµÑ€Ð½Ð°Ñ Ñумма в параметре -minrelaytxfee=&lt;кол-во&gt;: &apos;%s&apos;</translation>
</message>
<message>
<location line="+1"/>
<source>Invalid amount for -mintxfee=&lt;amount&gt;: &apos;%s&apos;</source>
- <translation>Ðеверное количеÑтво в параметре -mintxfee=&lt;кол-во&gt;: &apos;%s&apos;</translation>
+ <translation>ÐÐµÐ²ÐµÑ€Ð½Ð°Ñ Ñумма в параметре -mintxfee=&lt;кол-во&gt;: &apos;%s&apos;</translation>
</message>
<message>
<location line="+8"/>
@@ -3677,11 +3776,6 @@ rpcpassword=%s
<translation>Выводить информацию траÑÑировки/отладки на конÑоль вмеÑто файла debug.log</translation>
</message>
<message>
- <location line="+1"/>
- <source>Send trace/debug info to debugger</source>
- <translation>ОтправлÑÑ‚ÑŒ информацию траÑÑировки/отладки в отладчик</translation>
- </message>
- <message>
<location line="+6"/>
<source>Set minimum block size in bytes (default: 0)</source>
<translation>Минимальный размер блока в байтах (по умолчанию: 0)</translation>
@@ -3699,7 +3793,7 @@ rpcpassword=%s
<message>
<location line="+2"/>
<source>Specify connection timeout in milliseconds (default: 5000)</source>
- <translation>Таймаут ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ð² миллиÑекундах (по умолчанию: 5000)</translation>
+ <translation>Тайм-аут ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ð² миллиÑекундах (по умолчанию: 5000)</translation>
</message>
<message>
<location line="+6"/>
@@ -3707,14 +3801,14 @@ rpcpassword=%s
<translation>СиÑÑ‚ÐµÐ¼Ð½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°:</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Transaction amount too small</source>
- <translation>Объём транзакции Ñлишком мал</translation>
+ <translation>Сумма транзакции Ñлишком мала</translation>
</message>
<message>
<location line="+1"/>
<source>Transaction amounts must be positive</source>
- <translation>Объём транзакции должен быть положителен</translation>
+ <translation>Сумма транзакции должна быть положительна</translation>
</message>
<message>
<location line="+1"/>
@@ -3737,7 +3831,7 @@ rpcpassword=%s
<translation>Ð˜Ð¼Ñ Ð´Ð»Ñ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ð¹ JSON-RPC</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Warning</source>
<translation>Внимание</translation>
</message>
@@ -3757,37 +3851,37 @@ rpcpassword=%s
<translation>wallet.dat повреждён, ÑпаÑение данных не удалоÑÑŒ</translation>
</message>
<message>
- <location line="-57"/>
+ <location line="-58"/>
<source>Password for JSON-RPC connections</source>
<translation>Пароль Ð´Ð»Ñ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ð¹ JSON-RPC</translation>
</message>
<message>
- <location line="-69"/>
+ <location line="-70"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation>Разрешить Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ JSON-RPC Ñ ÑƒÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ð³Ð¾ IP</translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<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="-131"/>
+ <location line="-132"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation>Выполнить команду, когда поÑвлÑетÑÑ Ð½Ð¾Ð²Ñ‹Ð¹ блок (%s в команде заменÑетÑÑ Ð½Ð° Ñ…Ñш блока)</translation>
</message>
<message>
- <location line="+160"/>
+ <location line="+161"/>
<source>Upgrade wallet to latest format</source>
<translation>Обновить бумажник до поÑледнего формата</translation>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation>УÑтановить размер запаÑа ключей в &lt;n&gt; (по умолчанию: 100)</translation>
</message>
<message>
- <location line="-12"/>
+ <location line="-11"/>
<source>Rescan the block chain for missing wallet transactions</source>
<translation>Перепроверить цепь блоков на предмет отÑутÑтвующих в бумажнике транзакций</translation>
</message>
@@ -3797,7 +3891,7 @@ rpcpassword=%s
<translation>ИÑпользовать OpenSSL (https) Ð´Ð»Ñ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ð¹ JSON-RPC</translation>
</message>
<message>
- <location line="-29"/>
+ <location line="-30"/>
<source>Server certificate file (default: server.cert)</source>
<translation>Файл Ñерверного Ñертификата (по умолчанию: server.cert)</translation>
</message>
@@ -3812,17 +3906,17 @@ rpcpassword=%s
<translation>Эта Ñправка</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Unable to bind to %s on this computer (bind returned error %d, %s)</source>
<translation>Ðевозможно привÑзатьÑÑ Ðº %s на Ñтом компьютере (bind вернул ошибку %d, %s)</translation>
</message>
<message>
- <location line="-106"/>
+ <location line="-107"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation>Разрешить поиÑк в DNS Ð´Ð»Ñ -addnode, -seednode и -connect</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+60"/>
<source>Loading addresses...</source>
<translation>Загрузка адреÑов...</translation>
</message>
@@ -3862,7 +3956,7 @@ rpcpassword=%s
<translation>Ð’ параметре -socks запрошена неизвеÑÑ‚Ð½Ð°Ñ Ð²ÐµÑ€ÑиÑ: %i</translation>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation>Ðе удаётÑÑ Ñ€Ð°Ð·Ñ€ÐµÑˆÐ¸Ñ‚ÑŒ Ð°Ð´Ñ€ÐµÑ Ð² параметре -bind: &apos;%s&apos;</translation>
</message>
@@ -3872,14 +3966,14 @@ rpcpassword=%s
<translation>Ðе удаётÑÑ Ñ€Ð°Ð·Ñ€ÐµÑˆÐ¸Ñ‚ÑŒ Ð°Ð´Ñ€ÐµÑ Ð² параметре -externalip: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+47"/>
+ <location line="+48"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
- <translation>Ðеверное количеÑтво в параметре -paytxfee=&lt;кол-во&gt;: &apos;%s&apos;</translation>
+ <translation>ÐÐµÐ²ÐµÑ€Ð½Ð°Ñ Ñумма в параметре -paytxfee=&lt;кол-во&gt;: &apos;%s&apos;</translation>
</message>
<message>
<location line="+1"/>
<source>Invalid amount</source>
- <translation>Ðеверное количеÑтво</translation>
+ <translation>ÐÐµÐ²ÐµÑ€Ð½Ð°Ñ Ñумма</translation>
</message>
<message>
<location line="-6"/>
@@ -3892,7 +3986,7 @@ rpcpassword=%s
<translation>Загрузка индекÑа блоков...</translation>
</message>
<message>
- <location line="-61"/>
+ <location line="-62"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation>Добавить узел Ð´Ð»Ñ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð¸ пытатьÑÑ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶Ð¸Ð²Ð°Ñ‚ÑŒ Ñоединение открытым</translation>
</message>
@@ -3902,12 +3996,12 @@ rpcpassword=%s
<translation>Ðевозможно привÑзатьÑÑ Ðº %s на Ñтом компьютере. Возможно, Bitcoin уже работает.</translation>
</message>
<message>
- <location line="+94"/>
+ <location line="+95"/>
<source>Loading wallet...</source>
<translation>Загрузка бумажника...</translation>
</message>
<message>
- <location line="-55"/>
+ <location line="-56"/>
<source>Cannot downgrade wallet</source>
<translation>Ðе удаётÑÑ Ð¿Ð¾Ð½Ð¸Ð·Ð¸Ñ‚ÑŒ верÑию бумажника</translation>
</message>
@@ -3917,7 +4011,7 @@ rpcpassword=%s
<translation>Ðе удаётÑÑ Ð·Ð°Ð¿Ð¸Ñать Ð°Ð´Ñ€ÐµÑ Ð¿Ð¾ умолчанию</translation>
</message>
<message>
- <location line="+66"/>
+ <location line="+67"/>
<source>Rescanning...</source>
<translation>Сканирование...</translation>
</message>
@@ -3937,7 +4031,7 @@ rpcpassword=%s
<translation>Ошибка</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-35"/>
<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 9df27a1701..e8ee4d0895 100644
--- a/src/qt/locale/bitcoin_sk.ts
+++ b/src/qt/locale/bitcoin_sk.ts
@@ -22,14 +22,14 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location filename="../aboutdialog.cpp" line="+19"/>
+ <location filename="../utilitydialog.cpp" line="+29"/>
<source>Copyright</source>
<translation>Autorské práva</translation>
</message>
<message>
<location line="+0"/>
- <source>The Bitcoin developers</source>
- <translation>Vývojári Bitcoin</translation>
+ <source>The Bitcoin Core developers</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -146,13 +146,13 @@ This product includes software developed by the OpenSSL Project for use in the O
</message>
<message>
<location line="+13"/>
- <source>Error exporting</source>
- <translation>Chyba exportu.</translation>
+ <source>Exporting Failed</source>
+ <translation>Export zlyhal</translation>
</message>
<message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation>Nedalo sa zapisovať do súboru %1.</translation>
+ <location line="+1"/>
+ <source>There was an error trying to save the address list to %1.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -317,22 +317,27 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+260"/>
+ <location filename="../bitcoingui.cpp" line="+295"/>
<source>Sign &amp;message...</source>
<translation>Podpísať &amp;správu...</translation>
</message>
<message>
- <location line="+290"/>
+ <location line="+335"/>
<source>Synchronizing with network...</source>
<translation>Synchronizácia so sieťou...</translation>
</message>
<message>
- <location line="-360"/>
+ <location line="-407"/>
<source>&amp;Overview</source>
<translation>&amp;Prehľad</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="-137"/>
+ <source>Node</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+138"/>
<source>Show general overview of wallet</source>
<translation>Zobraziť celkový prehľad o peňaženke</translation>
</message>
@@ -347,7 +352,7 @@ 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="+15"/>
+ <location line="+17"/>
<source>E&amp;xit</source>
<translation>U&amp;konÄiÅ¥</translation>
</message>
@@ -393,7 +398,22 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>&amp;Zmena Hesla...</translation>
</message>
<message>
- <location line="+295"/>
+ <location line="+10"/>
+ <source>&amp;Sending addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Receiving addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open &amp;URI...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+325"/>
<source>Importing blocks from disk...</source>
<translation>Importujem bloky z disku...</translation>
</message>
@@ -403,12 +423,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Preindexúvam bloky na disku...</translation>
</message>
<message>
- <location line="-358"/>
+ <location line="-405"/>
<source>Send coins to a Bitcoin address</source>
<translation>Poslať bitcoins na adresu</translation>
</message>
<message>
- <location line="+47"/>
+ <location line="+49"/>
<source>Modify configuration options for Bitcoin</source>
<translation>Upraviť možnosti nastavenia pre bitcoin</translation>
</message>
@@ -438,18 +458,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Overiť správu</translation>
</message>
<message>
- <location line="+375"/>
+ <location line="+430"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-563"/>
- <location line="+10"/>
+ <location line="-643"/>
<source>Wallet</source>
<translation>Peňaženka</translation>
</message>
<message>
- <location line="+113"/>
+ <location line="+146"/>
<source>&amp;Send</source>
<translation>&amp;Odoslať</translation>
</message>
@@ -459,7 +478,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>&amp;Prijať</translation>
</message>
<message>
- <location line="+44"/>
+ <location line="+46"/>
<location line="+2"/>
<source>&amp;Show / Hide</source>
<translation>Zobraziť / skryť</translation>
@@ -485,86 +504,80 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+39"/>
+ <location line="+48"/>
<source>&amp;File</source>
<translation>&amp;Súbor</translation>
</message>
<message>
- <location line="+11"/>
+ <location line="+14"/>
<source>&amp;Settings</source>
<translation>&amp;Nastavenia</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>&amp;Help</source>
<translation>&amp;Pomoc</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+15"/>
<source>Tabs toolbar</source>
<translation>Lišta záložiek</translation>
</message>
<message>
- <location line="-244"/>
- <location line="+321"/>
+ <location line="-284"/>
+ <location line="+376"/>
<source>[testnet]</source>
<translation>[testovacia sieť]</translation>
</message>
<message>
- <location line="-331"/>
- <location line="+10"/>
+ <location line="-401"/>
<source>Bitcoin Core</source>
<translation>Jadro Bitcoin</translation>
</message>
<message>
- <location line="+121"/>
+ <location line="+163"/>
<source>Request payments (generates QR codes and bitcoin: URIs)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+27"/>
+ <location line="+29"/>
<location line="+2"/>
<source>&amp;About Bitcoin Core</source>
<translation>O jadre Bitcoin</translation>
</message>
<message>
- <location line="+34"/>
- <source>&amp;Used sending addresses...</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+35"/>
<source>Show the list of used sending addresses and labels</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Used &amp;receiving addresses...</source>
+ <location line="+2"/>
+ <source>Show the list of used receiving addresses and labels</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Show the list of used receiving addresses and labels</source>
+ <location line="+3"/>
+ <source>Open a bitcoin: URI or payment request</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+2"/>
- <source>Open URI...</source>
- <translation>Otvoriť URI...</translation>
+ <source>&amp;Command-line options</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
- <source>Open a bitcoin: URI or payment request</source>
+ <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+126"/>
+ <location line="+159"/>
<location line="+5"/>
<source>Bitcoin client</source>
<translation>Bitcoin klient</translation>
</message>
<message numerus="yes">
- <location line="+133"/>
+ <location line="+142"/>
<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>
@@ -584,7 +597,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Spracovaných %1 blokov transakÄnej histórie.</translation>
</message>
<message numerus="yes">
- <location line="+20"/>
+ <location line="+23"/>
<source>%n hour(s)</source>
<translation><numerusform>%n hodina</numerusform><numerusform>%n hodiny</numerusform><numerusform>%n hodín</numerusform></translation>
</message>
@@ -604,7 +617,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>%1 za</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="+21"/>
<source>Last received block was generated %1 ago.</source>
<translation>Posledný prijatý blok bol vygenerovaný pred %1.</translation>
</message>
@@ -629,27 +642,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Informácia</translation>
</message>
<message>
- <location line="+77"/>
- <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="-152"/>
+ <location line="-85"/>
<source>Up to date</source>
<translation>Aktualizovaný</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Catching up...</source>
<translation>SÅ¥ahujem...</translation>
</message>
<message>
- <location line="+124"/>
- <source>Confirm transaction fee</source>
- <translation>PotvrÄ poplatok za transakciu.</translation>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+130"/>
<source>Sent transaction</source>
<translation>Odoslané transakcie</translation>
</message>
@@ -671,7 +674,7 @@ Typ: %3
Adresa: %4</translation>
</message>
<message>
- <location line="+67"/>
+ <location line="+69"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation>Peňaženka je &lt;b&gt;zašifrovaná&lt;/b&gt; a momentálne &lt;b&gt;odomknutá&lt;/b&gt;</translation>
</message>
@@ -681,7 +684,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 filename="../bitcoin.cpp" line="+116"/>
+ <location filename="../bitcoin.cpp" line="+438"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation type="unfinished"/>
</message>
@@ -903,7 +906,12 @@ Adresa: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="+171"/>
+ <location line="+31"/>
+ <source>none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+140"/>
<source>Dust</source>
<translation type="unfinished"/>
</message>
@@ -940,7 +948,7 @@ Adresa: %4</translation>
</message>
<message>
<location line="+1"/>
- <source>This label turns red, if the priority is smaller than &quot;medium&quot;</source>
+ <source>This label turns red, if the priority is smaller than &quot;medium&quot;.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1009,7 +1017,7 @@ Adresa: %4</translation>
<translation>&amp;Adresa</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+25"/>
+ <location filename="../editaddressdialog.cpp" line="+28"/>
<source>New receiving address</source>
<translation>Nová adresa pre prijímanie</translation>
</message>
@@ -1078,20 +1086,24 @@ Adresa: %4</translation>
</message>
</context>
<context>
- <name>GUIUtil::HelpMessageBox</name>
+ <name>HelpMessageDialog</name>
<message>
- <location filename="../guiutil.cpp" line="+597"/>
- <source>version</source>
- <translation>verzia</translation>
+ <location filename="../forms/helpmessagedialog.ui" line="+19"/>
+ <source>Bitcoin Core - Command-line options</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <location line="+13"/>
+ <location filename="../utilitydialog.cpp" line="+38"/>
<source>Bitcoin Core</source>
<translation>Jadro Bitcoin</translation>
</message>
<message>
- <location line="-11"/>
+ <location line="+0"/>
+ <source>version</source>
+ <translation>verzia</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Usage:</source>
<translation>Použitie:</translation>
</message>
@@ -1220,7 +1232,7 @@ Adresa: %4</translation>
<translation>Možnosti</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+13"/>
<source>&amp;Main</source>
<translation>&amp;Hlavné</translation>
</message>
@@ -1245,7 +1257,52 @@ Adresa: %4</translation>
<translation>&amp;Spustiť Bitcoin pri spustení systému správy okien</translation>
</message>
<message>
- <location line="+35"/>
+ <location line="+9"/>
+ <source>Size of &amp;database cache</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set database cache size in megabytes (default: 25)</source>
+ <translation>Veľkosť vyrovnávajúcej pamäte pre databázu v megabytoch (predvolené:25)</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>MB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Number of script &amp;verification threads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Connect to the Bitcoin network through a SOCKS proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Connect through SOCKS proxy (default proxy):</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+224"/>
+ <source>Active command-line options that override above options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
<source>Reset all client options to default.</source>
<translation>Vynulovať všetky voľby klienta na predvolené.</translation>
</message>
@@ -1255,7 +1312,7 @@ Adresa: %4</translation>
<translation>Vynulovať voľby</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="-323"/>
<source>&amp;Network</source>
<translation>Sieť</translation>
</message>
@@ -1270,32 +1327,17 @@ Adresa: %4</translation>
<translation>Mapovať port pomocou &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>PripojiÅ¥ do siete Bitcoin cez SOCKS proxy (napr. keÄ sa pripájate cez Tor)</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>&amp;Connect through SOCKS proxy:</source>
- <translation>&amp;Pripojiť cez SOCKS proxy:</translation>
- </message>
- <message>
- <location line="+9"/>
+ <location line="+19"/>
<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>IP addresa proxy (napr. 127.0.0.1)</translation>
- </message>
- <message>
- <location line="+7"/>
+ <location line="+32"/>
<source>&amp;Port:</source>
<translation>&amp;Port:</translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+25"/>
<source>Port of the proxy (e.g. 9050)</source>
<translation>Port proxy (napr. 9050)</translation>
</message>
@@ -1380,7 +1422,7 @@ Adresa: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="+71"/>
+ <location line="+136"/>
<source>&amp;OK</source>
<translation>&amp;OK</translation>
</message>
@@ -1390,44 +1432,38 @@ Adresa: %4</translation>
<translation>Zrušiť</translation>
</message>
<message>
- <location line="+10"/>
- <source>&amp;Apply</source>
- <translation>Použiť</translation>
- </message>
- <message>
- <location filename="../optionsdialog.cpp" line="+63"/>
+ <location filename="../optionsdialog.cpp" line="+67"/>
<source>default</source>
<translation>predvolené</translation>
</message>
<message>
- <location line="+131"/>
- <source>Confirm options reset</source>
+ <location line="+57"/>
+ <source>none</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Some settings may require a client restart to take effect.</source>
+ <location line="+75"/>
+ <source>Confirm options reset</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>Do you want to proceed?</source>
- <translation>Chcete pokraÄovaÅ¥?</translation>
+ <location line="+1"/>
+ <location line="+29"/>
+ <source>Client restart required to activate changes.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
- <location line="+9"/>
- <source>Warning</source>
- <translation>Varovanie</translation>
+ <location line="-29"/>
+ <source>Client will be shutdown, do you want to proceed?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="-9"/>
- <location line="+9"/>
- <source>This setting will take effect after restarting Bitcoin.</source>
+ <location line="+33"/>
+ <source>This change would require a client restart.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+29"/>
+ <location line="+34"/>
<source>The supplied proxy address is invalid.</source>
<translation>Zadaná proxy adresa je neplatná.</translation>
</message>
@@ -1441,22 +1477,22 @@ Adresa: %4</translation>
</message>
<message>
<location line="+50"/>
- <location line="+214"/>
+ <location line="+231"/>
<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="-140"/>
+ <location line="-155"/>
<source>Unconfirmed:</source>
<translation>Nepotvrdené:</translation>
</message>
<message>
- <location line="-81"/>
+ <location line="-83"/>
<source>Wallet</source>
<translation>Peňaženka</translation>
</message>
<message>
- <location line="+49"/>
+ <location line="+51"/>
<source>Confirmed:</source>
<translation>Potvrdené:</translation>
</message>
@@ -1491,7 +1527,7 @@ Adresa: %4</translation>
<translation>Váš súÄasný celkový zostatok</translation>
</message>
<message>
- <location line="+56"/>
+ <location line="+71"/>
<source>&lt;b&gt;Recent transactions&lt;/b&gt;</source>
<translation>&lt;b&gt;Nedávne transakcie&lt;/b&gt;</translation>
</message>
@@ -1505,7 +1541,8 @@ Adresa: %4</translation>
<context>
<name>PaymentServer</name>
<message>
- <location filename="../paymentserver.cpp" line="+397"/>
+ <location filename="../paymentserver.cpp" line="+403"/>
+ <location line="+13"/>
<source>URI handling</source>
<translation>Spracovanie URI</translation>
</message>
@@ -1515,24 +1552,52 @@ Adresa: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="+91"/>
+ <location line="+96"/>
<source>Requested payment amount of %1 is too small (considered dust).</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-204"/>
- <location line="+195"/>
+ <location line="-221"/>
+ <location line="+212"/>
<location line="+13"/>
+ <location line="+95"/>
+ <location line="+18"/>
+ <location line="+16"/>
<source>Payment request error</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-207"/>
+ <location line="-353"/>
<source>Cannot start bitcoin: click-to-pay handler</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+195"/>
+ <location line="+58"/>
+ <source>Net manager warning</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Your active proxy doesn&apos;t support SOCKS5, which is required for payment requests via proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>Payment request fetch URL is invalid: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Payment request file handling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Payment request file can not be read or processed! This can be caused by an invalid payment request file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+73"/>
<source>Unverified payment requests to custom payment scripts are unsupported.</source>
<translation type="unfinished"/>
</message>
@@ -1542,24 +1607,27 @@ Adresa: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
+ <location line="+43"/>
<source>Error communicating with %1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+28"/>
+ <location line="+24"/>
+ <source>Payment request can not be parsed or processed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
<source>Bad response from server %1</source>
<translation>Zlá odpoveÄ zo servera %1</translation>
</message>
<message>
- <location line="+32"/>
+ <location line="+33"/>
<source>Payment acknowledged</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-55"/>
- <location line="+27"/>
- <location line="+17"/>
+ <location line="-11"/>
<source>Network request error</source>
<translation type="unfinished"/>
</message>
@@ -1567,18 +1635,18 @@ Adresa: %4</translation>
<context>
<name>QObject</name>
<message>
- <location filename="../bitcoin.cpp" line="+119"/>
- <location line="+5"/>
+ <location filename="../bitcoin.cpp" line="+71"/>
+ <location line="+11"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-4"/>
+ <location line="+1"/>
<source>Error: Specified data directory &quot;%1&quot; does not exist.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="-12"/>
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation type="unfinished"/>
</message>
@@ -1620,15 +1688,16 @@ Adresa: %4</translation>
<location line="+23"/>
<location line="+23"/>
<location line="+36"/>
- <location line="+53"/>
+ <location line="+23"/>
+ <location line="+36"/>
<location line="+23"/>
<location line="+23"/>
- <location filename="../rpcconsole.cpp" line="+360"/>
+ <location filename="../rpcconsole.cpp" line="+359"/>
<source>N/A</source>
<translation>nie je k dispozícii</translation>
</message>
<message>
- <location line="-217"/>
+ <location line="-223"/>
<source>Client version</source>
<translation>Verzia klienta</translation>
</message>
@@ -1643,7 +1712,12 @@ Adresa: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="+78"/>
+ <location line="+25"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+53"/>
<source>Using OpenSSL version</source>
<translation>Používa OpenSSL verziu</translation>
</message>
@@ -1659,16 +1733,16 @@ Adresa: %4</translation>
</message>
<message>
<location line="+7"/>
- <source>Number of connections</source>
- <translation>PoÄet pripojení</translation>
+ <source>Name</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+23"/>
- <source>On testnet</source>
- <translation>Na testovacej sieti</translation>
+ <source>Number of connections</source>
+ <translation>PoÄet pripojení</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+29"/>
<source>Block chain</source>
<translation>Reťazec blokov</translation>
</message>
@@ -1693,16 +1767,6 @@ Adresa: %4</translation>
<translation>&amp;Otvoriť</translation>
</message>
<message>
- <location line="+16"/>
- <source>Command-line options</source>
- <translation>Voľby príkazového riadku</translation>
- </message>
- <message>
- <location line="+10"/>
- <source>&amp;Show</source>
- <translation>Zobraziť</translation>
- </message>
- <message>
<location line="+24"/>
<source>&amp;Console</source>
<translation>&amp;Konzola</translation>
@@ -1733,17 +1797,12 @@ Adresa: %4</translation>
<translation>Von:</translation>
</message>
<message>
- <location line="-541"/>
+ <location line="-521"/>
<source>Build date</source>
<translation>Dátum zostavenia</translation>
</message>
<message>
- <location line="-79"/>
- <source>Bitcoin Core</source>
- <translation>Jadro Bitcoin</translation>
- </message>
- <message>
- <location line="+279"/>
+ <location line="+206"/>
<source>Debug log file</source>
<translation>Súbor záznamu ladenia</translation>
</message>
@@ -1753,11 +1812,6 @@ Adresa: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="+26"/>
- <source>Show the Bitcoin-Core help message to get a list with possible Bitcoin command-line options.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location line="+76"/>
<source>Clear console</source>
<translation>Vymazať konzolu</translation>
@@ -1778,7 +1832,7 @@ Adresa: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="+128"/>
+ <location line="+122"/>
<source>%1 B</source>
<translation>%1 B</translation>
</message>
@@ -1821,12 +1875,7 @@ Adresa: %4</translation>
<translation>&amp;Suma:</translation>
</message>
<message>
- <location line="+19"/>
- <source>The amount to request</source>
- <translation>Suma na vyžiadanie</translation>
- </message>
- <message>
- <location line="-32"/>
+ <location line="-13"/>
<source>&amp;Label:</source>
<translation>&amp;Popis:</translation>
</message>
@@ -1836,12 +1885,7 @@ Adresa: %4</translation>
<translation>&amp;Správa:</translation>
</message>
<message>
- <location line="+20"/>
- <source>The message to attach to payment request</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="-37"/>
+ <location line="-17"/>
<source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
@@ -1852,16 +1896,26 @@ Adresa: %4</translation>
</message>
<message>
<location line="+27"/>
- <source>The label to associate with the new receiving address</source>
+ <source>An optional label to associate with the new receiving address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
- <source>Use this form to request payments. All fields are optional.</source>
+ <location line="+7"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+56"/>
+ <location line="+7"/>
+ <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+39"/>
+ <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+17"/>
<source>Clear all fields of the form.</source>
<translation>VyÄistiÅ¥ vÅ¡etky polia formulára.</translation>
</message>
@@ -1877,11 +1931,11 @@ Adresa: %4</translation>
</message>
<message>
<location line="+47"/>
- <source>Previously requested payments</source>
+ <source>Requested payments</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+12"/>
+ <location line="+16"/>
<source>Show the selected request (does the same as double clicking an entry)</source>
<translation type="unfinished"/>
</message>
@@ -1972,7 +2026,7 @@ Adresa: %4</translation>
<context>
<name>RecentRequestsTableModel</name>
<message>
- <location filename="../recentrequeststablemodel.cpp" line="+14"/>
+ <location filename="../recentrequeststablemodel.cpp" line="+24"/>
<source>Date</source>
<translation>Dátum</translation>
</message>
@@ -1992,7 +2046,7 @@ Adresa: %4</translation>
<translation>Suma</translation>
</message>
<message>
- <location line="+36"/>
+ <location line="+38"/>
<source>(no label)</source>
<translation>(bez popisu)</translation>
</message>
@@ -2007,7 +2061,7 @@ Adresa: %4</translation>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
<location filename="../sendcoinsdialog.cpp" line="+381"/>
- <location line="+81"/>
+ <location line="+80"/>
<source>Send Coins</source>
<translation>Poslať Bitcoins</translation>
</message>
@@ -2117,7 +2171,7 @@ Adresa: %4</translation>
<translation>&amp;Odoslať</translation>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-229"/>
+ <location filename="../sendcoinsdialog.cpp" line="-228"/>
<source>Confirm send coins</source>
<translation>Potvrdiť odoslanie bitcoins</translation>
</message>
@@ -2220,22 +2274,22 @@ Adresa: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="+113"/>
+ <location line="+112"/>
<source>Warning: Invalid Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+21"/>
<source>(no label)</source>
<translation>(bez popisu)</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="-11"/>
<source>Warning: Unknown change address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-378"/>
+ <location line="-366"/>
<source>Are you sure you want to send?</source>
<translation>UrÄite to chcete odoslaÅ¥?</translation>
</message>
@@ -2259,13 +2313,13 @@ Adresa: %4</translation>
<name>SendCoinsEntry</name>
<message>
<location filename="../forms/sendcoinsentry.ui" line="+131"/>
- <location line="+501"/>
+ <location line="+521"/>
<location line="+536"/>
<source>A&amp;mount:</source>
<translation>Su&amp;ma:</translation>
</message>
<message>
- <location line="-1132"/>
+ <location line="-1152"/>
<source>Pay &amp;To:</source>
<translation>Zapla&amp;tiť:</translation>
</message>
@@ -2311,23 +2365,33 @@ Adresa: %4</translation>
</message>
<message>
<location line="+7"/>
- <location line="+504"/>
+ <location line="+524"/>
<location line="+536"/>
<source>Remove this entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-40"/>
+ <location line="-1008"/>
+ <source>Message:</source>
+ <translation>Správa:</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+958"/>
<source>This is a verified payment request.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-971"/>
+ <location line="-991"/>
<source>Enter a label for this address to add it to the list of used addresses</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+439"/>
+ <location line="+459"/>
<source>This is an unverified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2350,6 +2414,19 @@ Adresa: %4</translation>
</message>
</context>
<context>
+ <name>ShutdownWindow</name>
+ <message>
+ <location filename="../utilitydialog.cpp" line="+48"/>
+ <source>Bitcoin Core is shutting down...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Do not shut down the computer until this window disappears.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>SignVerifyMessageDialog</name>
<message>
<location filename="../forms/signverifymessagedialog.ui" line="+14"/>
@@ -2357,7 +2434,7 @@ Adresa: %4</translation>
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+10"/>
<source>&amp;Sign Message</source>
<translation>&amp;Podpísať Správu</translation>
</message>
@@ -2545,7 +2622,7 @@ Adresa: %4</translation>
<context>
<name>SplashScreen</name>
<message>
- <location filename="../splashscreen.cpp" line="+26"/>
+ <location filename="../splashscreen.cpp" line="+28"/>
<source>Bitcoin Core</source>
<translation>Jadro Bitcoin</translation>
</message>
@@ -2644,12 +2721,12 @@ Adresa: %4</translation>
<location line="+12"/>
<location line="+45"/>
<location line="+17"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Credit</source>
<translation>Kredit</translation>
</message>
<message numerus="yes">
- <location line="-120"/>
+ <location line="-125"/>
<source>matures in %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -2662,12 +2739,12 @@ Adresa: %4</translation>
<location line="+44"/>
<location line="+8"/>
<location line="+15"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Debit</source>
<translation>Debet</translation>
</message>
<message>
- <location line="-57"/>
+ <location line="-62"/>
<source>Transaction fee</source>
<translation>TransakÄný poplatok</translation>
</message>
@@ -2678,11 +2755,12 @@ Adresa: %4</translation>
</message>
<message>
<location line="+6"/>
+ <location line="+9"/>
<source>Message</source>
<translation>Správa</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="-7"/>
<source>Comment</source>
<translation>Komentár</translation>
</message>
@@ -2692,7 +2770,7 @@ Adresa: %4</translation>
<translation>ID transakcie</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+18"/>
<source>Merchant</source>
<translation>Kupec</translation>
</message>
@@ -2732,7 +2810,7 @@ Adresa: %4</translation>
<translation>nepravda</translation>
</message>
<message>
- <location line="-227"/>
+ <location line="-232"/>
<source>, has not been successfully broadcast yet</source>
<translation>, ešte nebola úspešne odoslaná</translation>
</message>
@@ -2782,8 +2860,13 @@ Adresa: %4</translation>
<source>Amount</source>
<translation>Hodnota</translation>
</message>
+ <message>
+ <location line="+59"/>
+ <source>Immature (%1 confirmations, will be available after %2)</source>
+ <translation type="unfinished"/>
+ </message>
<message numerus="yes">
- <location line="+57"/>
+ <location line="+16"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -2803,17 +2886,13 @@ Adresa: %4</translation>
<translation>Nepotvrdené (%1 z %2 potvrdení)</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="-22"/>
+ <location line="+25"/>
<source>Confirmed (%1 confirmations)</source>
<translation>Potvrdené (%1 potvrdení)</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"/>
+ <location line="-22"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation>Ten blok nebol prijatý žiadnou inou nódou a pravdepodobne nebude akceptovaný!</translation>
</message>
@@ -2823,7 +2902,7 @@ Adresa: %4</translation>
<translation>VypoÄítané ale neakceptované</translation>
</message>
<message>
- <location line="+43"/>
+ <location line="+62"/>
<source>Received with</source>
<translation>Prijaté s</translation>
</message>
@@ -3119,7 +3198,7 @@ Adresa: %4</translation>
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+217"/>
+ <location filename="../bitcoinstrings.cpp" line="+221"/>
<source>Usage:</source>
<translation>Použitie:</translation>
</message>
@@ -3139,7 +3218,7 @@ Adresa: %4</translation>
<translation>Možnosti:</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+22"/>
<source>Specify configuration file (default: bitcoin.conf)</source>
<translation>UrÄiÅ¥ súbor s nastaveniami (predvolené: bitcoin.conf)</translation>
</message>
@@ -3159,7 +3238,7 @@ Adresa: %4</translation>
<translation>Veľkosť vyrovnávajúcej pamäte pre databázu v megabytoch (predvolené:25)</translation>
</message>
<message>
- <location line="-27"/>
+ <location line="-26"/>
<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>
@@ -3169,7 +3248,7 @@ Adresa: %4</translation>
<translation>Udržiavať maximálne &lt;n&gt; spojení (predvolené: 125)</translation>
</message>
<message>
- <location line="-50"/>
+ <location line="-51"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation type="unfinished"/>
</message>
@@ -3179,22 +3258,22 @@ Adresa: %4</translation>
<translation>UrÄite vaÅ¡u vlastnú verejnú adresu</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation>Hranica pre odpojenie zle sa správajúcich peerov (predvolené: 100)</translation>
</message>
<message>
- <location line="-147"/>
+ <location line="-148"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation>PoÄet sekúnd kedy sa zabráni zle sa správajúcim peerom znovupripojenie (predvolené: 86400)</translation>
</message>
<message>
- <location line="-33"/>
+ <location line="-36"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<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>
@@ -3204,7 +3283,7 @@ Adresa: %4</translation>
<translation>Prijímať príkazy z príkazového riadku a JSON-RPC</translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<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>
@@ -3214,12 +3293,12 @@ Adresa: %4</translation>
<translation>Použiť testovaciu sieť</translation>
</message>
<message>
- <location line="-117"/>
+ <location line="-118"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-92"/>
+ <location line="-95"/>
<source>%s, you must set a rpcpassword in the configuration file:
%s
It is recommended you use the following random password:
@@ -3260,6 +3339,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+4"/>
+ <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</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>
@@ -3365,6 +3449,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+1"/>
+ <source>Do not load the wallet and disable wallet RPC calls</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Do you want to rebuild the block database now?</source>
<translation>Chcete znovu zostaviť databázu blokov?</translation>
</message>
@@ -3529,7 +3618,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Poslať príkaz Bitcoin serveru</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+7"/>
<source>Set maximum block size in bytes (default: %d)</source>
<translation type="unfinished"/>
</message>
@@ -3549,7 +3638,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Spustiť Bitcoin server</translation>
</message>
<message>
- <location line="+12"/>
+ <location line="+3"/>
+ <source>This is intended for regression testing tools and app development.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Usage (deprecated, use bitcoin-cli):</source>
<translation type="unfinished"/>
</message>
@@ -3574,7 +3668,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
+ <location line="+2"/>
+ <source>Wallet options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source>
<translation type="unfinished"/>
</message>
@@ -3584,12 +3683,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-78"/>
+ <location line="-79"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation>Importuje bloky z externého súboru blk000??.dat</translation>
</message>
<message>
- <location line="-104"/>
+ <location line="-105"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
@@ -3609,7 +3708,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+88"/>
+ <location line="+89"/>
<source>Information</source>
<translation>Informácia</translation>
</message>
@@ -3659,11 +3758,6 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Odoslať trace/debug informácie na konzolu namiesto debug.info žurnálu</translation>
</message>
<message>
- <location line="+1"/>
- <source>Send trace/debug info to debugger</source>
- <translation>Odoslať trace/debug informácie do ladiaceho programu</translation>
- </message>
- <message>
<location line="+6"/>
<source>Set minimum block size in bytes (default: 0)</source>
<translation type="unfinished"/>
@@ -3689,7 +3783,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Systémová chyba:</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Transaction amount too small</source>
<translation>Suma transakcie príliš malá</translation>
</message>
@@ -3719,7 +3813,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Užívateľské meno pre JSON-RPC spojenia</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Warning</source>
<translation>Upozornenie</translation>
</message>
@@ -3739,37 +3833,37 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>wallet.dat je poškodený, záchrana zlyhala</translation>
</message>
<message>
- <location line="-57"/>
+ <location line="-58"/>
<source>Password for JSON-RPC connections</source>
<translation>Heslo pre JSON-rPC spojenia</translation>
</message>
<message>
- <location line="-69"/>
+ <location line="-70"/>
<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="+79"/>
+ <location line="+80"/>
<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="-131"/>
+ <location line="-132"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation>Vykonaj príkaz, ak zmeny v najlepšom bloku (%s v príkaze nahradí blok hash)</translation>
</message>
<message>
- <location line="+160"/>
+ <location line="+161"/>
<source>Upgrade wallet to latest format</source>
<translation>Aktualizuj peňaženku na najnovší formát.</translation>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<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>
<message>
- <location line="-12"/>
+ <location line="-11"/>
<source>Rescan the block chain for missing wallet transactions</source>
<translation>Znovu skenovať reťaz blokov pre chýbajúce transakcie</translation>
</message>
@@ -3779,7 +3873,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Použiť OpenSSL (https) pre JSON-RPC spojenia</translation>
</message>
<message>
- <location line="-29"/>
+ <location line="-30"/>
<source>Server certificate file (default: server.cert)</source>
<translation>Súbor s certifikátom servra (predvolené: server.cert)</translation>
</message>
@@ -3794,17 +3888,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Táto pomocná správa</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Unable to bind to %s on this computer (bind returned error %d, %s)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-106"/>
+ <location line="-107"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation>Povoliť vyhľadávanie DNS pre pridanie nódy a spojenie</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+60"/>
<source>Loading addresses...</source>
<translation>NaÄítavanie adries...</translation>
</message>
@@ -3844,7 +3938,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3854,7 +3948,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+47"/>
+ <location line="+48"/>
<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>
@@ -3874,7 +3968,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>NaÄítavanie zoznamu blokov...</translation>
</message>
<message>
- <location line="-61"/>
+ <location line="-62"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation>Pridať nód na pripojenie a pokus o udržanie pripojenia otvoreného</translation>
</message>
@@ -3884,12 +3978,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+94"/>
+ <location line="+95"/>
<source>Loading wallet...</source>
<translation>NaÄítavam peňaženku...</translation>
</message>
<message>
- <location line="-55"/>
+ <location line="-56"/>
<source>Cannot downgrade wallet</source>
<translation>Nie je možné prejsť na nižšiu verziu peňaženky</translation>
</message>
@@ -3899,7 +3993,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Nie je možné zapísať predvolenú adresu.</translation>
</message>
<message>
- <location line="+66"/>
+ <location line="+67"/>
<source>Rescanning...</source>
<translation>Nové prehľadávanie...</translation>
</message>
@@ -3919,7 +4013,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Chyba</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-35"/>
<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_sl_SI.ts b/src/qt/locale/bitcoin_sl_SI.ts
index 11117f65f6..048b717163 100644
--- a/src/qt/locale/bitcoin_sl_SI.ts
+++ b/src/qt/locale/bitcoin_sl_SI.ts
@@ -22,13 +22,13 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location filename="../aboutdialog.cpp" line="+19"/>
+ <location filename="../utilitydialog.cpp" line="+29"/>
<source>Copyright</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+0"/>
- <source>The Bitcoin developers</source>
+ <source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
</context>
@@ -146,13 +146,13 @@ This product includes software developed by the OpenSSL Project for use in the O
</message>
<message>
<location line="+13"/>
- <source>Error exporting</source>
- <translation>Napaka pri izvažanju</translation>
+ <source>Exporting Failed</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation>Ni bilo mogoÄe pisati v datoteko %1.</translation>
+ <location line="+1"/>
+ <source>There was an error trying to save the address list to %1.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -317,22 +317,27 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+260"/>
+ <location filename="../bitcoingui.cpp" line="+295"/>
<source>Sign &amp;message...</source>
<translation>PodpiÅ¡i &amp;sporoÄilo ...</translation>
</message>
<message>
- <location line="+290"/>
+ <location line="+335"/>
<source>Synchronizing with network...</source>
<translation>Sinhroniziranje z omrežjem ...</translation>
</message>
<message>
- <location line="-360"/>
+ <location line="-407"/>
<source>&amp;Overview</source>
<translation>&amp;Pregled</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="-137"/>
+ <source>Node</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+138"/>
<source>Show general overview of wallet</source>
<translation>Pokaži splošen pregled denarnice</translation>
</message>
@@ -347,7 +352,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Brskaj po zgodovini transakcij</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>E&amp;xit</source>
<translation>I&amp;zhod</translation>
</message>
@@ -393,7 +398,22 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>&amp;Spremeni geslo ...</translation>
</message>
<message>
- <location line="+295"/>
+ <location line="+10"/>
+ <source>&amp;Sending addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Receiving addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open &amp;URI...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+325"/>
<source>Importing blocks from disk...</source>
<translation type="unfinished"/>
</message>
@@ -403,12 +423,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="-358"/>
+ <location line="-405"/>
<source>Send coins to a Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+47"/>
+ <location line="+49"/>
<source>Modify configuration options for Bitcoin</source>
<translation type="unfinished"/>
</message>
@@ -438,18 +458,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>%Preveri sporoÄilo ...</translation>
</message>
<message>
- <location line="+375"/>
+ <location line="+430"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-563"/>
- <location line="+10"/>
+ <location line="-643"/>
<source>Wallet</source>
<translation>Denarnica</translation>
</message>
<message>
- <location line="+113"/>
+ <location line="+146"/>
<source>&amp;Send</source>
<translation type="unfinished"/>
</message>
@@ -459,7 +478,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+44"/>
+ <location line="+46"/>
<location line="+2"/>
<source>&amp;Show / Hide</source>
<translation type="unfinished"/>
@@ -485,86 +504,80 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+39"/>
+ <location line="+48"/>
<source>&amp;File</source>
<translation>&amp;Datoteka</translation>
</message>
<message>
- <location line="+11"/>
+ <location line="+14"/>
<source>&amp;Settings</source>
<translation>&amp;Nastavitve</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>&amp;Help</source>
<translation>&amp;PomoÄ</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+15"/>
<source>Tabs toolbar</source>
<translation>Orodna vrstica zavihkov</translation>
</message>
<message>
- <location line="-244"/>
- <location line="+321"/>
+ <location line="-284"/>
+ <location line="+376"/>
<source>[testnet]</source>
<translation>[testnet]</translation>
</message>
<message>
- <location line="-331"/>
- <location line="+10"/>
+ <location line="-401"/>
<source>Bitcoin Core</source>
<translation>Jedro Bitcoina</translation>
</message>
<message>
- <location line="+121"/>
+ <location line="+163"/>
<source>Request payments (generates QR codes and bitcoin: URIs)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+27"/>
+ <location line="+29"/>
<location line="+2"/>
<source>&amp;About Bitcoin Core</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+34"/>
- <source>&amp;Used sending addresses...</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+35"/>
<source>Show the list of used sending addresses and labels</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Used &amp;receiving addresses...</source>
+ <location line="+2"/>
+ <source>Show the list of used receiving addresses and labels</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Show the list of used receiving addresses and labels</source>
+ <location line="+3"/>
+ <source>Open a bitcoin: URI or payment request</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+2"/>
- <source>Open URI...</source>
+ <source>&amp;Command-line options</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
- <source>Open a bitcoin: URI or payment request</source>
+ <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+126"/>
+ <location line="+159"/>
<location line="+5"/>
<source>Bitcoin client</source>
<translation>Bitcoin odjemalec</translation>
</message>
<message numerus="yes">
- <location line="+133"/>
+ <location line="+142"/>
<source>%n active connection(s) to Bitcoin network</source>
<translation><numerusform>%n aktivna povezava v bitcoin omrežje</numerusform><numerusform>%n aktivni povezavi v bitcoin omrežje</numerusform><numerusform>%n aktivnih povezav v bitcoin omrežje</numerusform><numerusform>%n aktivnih povezav v bitcoin omrežje</numerusform></translation>
</message>
@@ -584,7 +597,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+20"/>
+ <location line="+23"/>
<source>%n hour(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -604,7 +617,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
+ <location line="+21"/>
<source>Last received block was generated %1 ago.</source>
<translation type="unfinished"/>
</message>
@@ -629,27 +642,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+77"/>
- <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="-152"/>
+ <location line="-85"/>
<source>Up to date</source>
<translation>Posodobljeno</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Catching up...</source>
<translation>Pridobivanje ...</translation>
</message>
<message>
- <location line="+124"/>
- <source>Confirm transaction fee</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+130"/>
<source>Sent transaction</source>
<translation>Odlivi</translation>
</message>
@@ -672,7 +675,7 @@ Naslov: %4
</translation>
</message>
<message>
- <location line="+67"/>
+ <location line="+69"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation>Denarnica je &lt;b&gt;Å¡ifrirana&lt;/b&gt; in trenutno &lt;b&gt;odklenjena&lt;/b&gt;</translation>
</message>
@@ -682,7 +685,7 @@ Naslov: %4
<translation>Denarnica je &lt;b&gt;Å¡ifrirana&lt;/b&gt; in trenutno &lt;b&gt;zaklenjena&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+116"/>
+ <location filename="../bitcoin.cpp" line="+438"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation type="unfinished"/>
</message>
@@ -904,7 +907,12 @@ Naslov: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+171"/>
+ <location line="+31"/>
+ <source>none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+140"/>
<source>Dust</source>
<translation type="unfinished"/>
</message>
@@ -941,7 +949,7 @@ Naslov: %4
</message>
<message>
<location line="+1"/>
- <source>This label turns red, if the priority is smaller than &quot;medium&quot;</source>
+ <source>This label turns red, if the priority is smaller than &quot;medium&quot;.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1010,7 +1018,7 @@ Naslov: %4
<translation>&amp;Naslov</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+25"/>
+ <location filename="../editaddressdialog.cpp" line="+28"/>
<source>New receiving address</source>
<translation>Nov naslov za prilive</translation>
</message>
@@ -1079,20 +1087,24 @@ Naslov: %4
</message>
</context>
<context>
- <name>GUIUtil::HelpMessageBox</name>
+ <name>HelpMessageDialog</name>
<message>
- <location filename="../guiutil.cpp" line="+597"/>
- <source>version</source>
- <translation>razliÄica</translation>
+ <location filename="../forms/helpmessagedialog.ui" line="+19"/>
+ <source>Bitcoin Core - Command-line options</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <location line="+13"/>
+ <location filename="../utilitydialog.cpp" line="+38"/>
<source>Bitcoin Core</source>
<translation>Jedro Bitcoina</translation>
</message>
<message>
- <location line="-11"/>
+ <location line="+0"/>
+ <source>version</source>
+ <translation>razliÄica</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Usage:</source>
<translation>Uporaba:</translation>
</message>
@@ -1221,7 +1233,7 @@ Naslov: %4
<translation>Možnosti</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+13"/>
<source>&amp;Main</source>
<translation type="unfinished"/>
</message>
@@ -1246,57 +1258,87 @@ Naslov: %4
<translation>&amp;Zaženi Bitcoin ob prijavi v sistem</translation>
</message>
<message>
- <location line="+35"/>
- <source>Reset all client options to default.</source>
+ <location line="+9"/>
+ <source>Size of &amp;database cache</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>&amp;Reset Options</source>
+ <location line="+13"/>
+ <source>Set database cache size in megabytes (default: 25)</source>
+ <translation>Nastavi pomnilnik podatkovne zbirke v megabajtih (privzeto: 25)</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>MB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Number of script &amp;verification threads</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+13"/>
- <source>&amp;Network</source>
- <translation>&amp;Omrežje</translation>
+ <source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</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>
+ <location line="+58"/>
+ <source>Connect to the Bitcoin network through a SOCKS proxy.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
- <source>Map port using &amp;UPnP</source>
+ <source>&amp;Connect through SOCKS proxy (default proxy):</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>
+ <location line="+34"/>
+ <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+224"/>
+ <source>Active command-line options that override above options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
+ <source>Reset all client options to default.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
- <source>&amp;Connect through SOCKS proxy:</source>
+ <source>&amp;Reset Options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+9"/>
- <source>Proxy &amp;IP:</source>
- <translation>IP posredniškega strežnika:</translation>
+ <location line="-323"/>
+ <source>&amp;Network</source>
+ <translation>&amp;Omrežje</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"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Map port using &amp;UPnP</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+19"/>
- <source>IP address of the proxy (e.g. 127.0.0.1)</source>
- <translation>IP naslov posredniškega strežnika (npr.: 127.0.0.1)</translation>
+ <source>Proxy &amp;IP:</source>
+ <translation>IP posredniškega strežnika:</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+32"/>
<source>&amp;Port:</source>
<translation>&amp;Vrata:</translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+25"/>
<source>Port of the proxy (e.g. 9050)</source>
<translation>Vrata strežnika (npr.: 9050)</translation>
</message>
@@ -1381,7 +1423,7 @@ Naslov: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+71"/>
+ <location line="+136"/>
<source>&amp;OK</source>
<translation>&amp;Potrdi</translation>
</message>
@@ -1391,44 +1433,38 @@ Naslov: %4
<translation>&amp;Prekini</translation>
</message>
<message>
- <location line="+10"/>
- <source>&amp;Apply</source>
- <translation>&amp;Uporabi</translation>
- </message>
- <message>
- <location filename="../optionsdialog.cpp" line="+63"/>
+ <location filename="../optionsdialog.cpp" line="+67"/>
<source>default</source>
<translation>privzeto</translation>
</message>
<message>
- <location line="+131"/>
- <source>Confirm options reset</source>
+ <location line="+57"/>
+ <source>none</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Some settings may require a client restart to take effect.</source>
+ <location line="+75"/>
+ <source>Confirm options reset</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>Do you want to proceed?</source>
+ <location line="+1"/>
+ <location line="+29"/>
+ <source>Client restart required to activate changes.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
- <location line="+9"/>
- <source>Warning</source>
- <translation>Opozorilo</translation>
+ <location line="-29"/>
+ <source>Client will be shutdown, do you want to proceed?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="-9"/>
- <location line="+9"/>
- <source>This setting will take effect after restarting Bitcoin.</source>
+ <location line="+33"/>
+ <source>This change would require a client restart.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+29"/>
+ <location line="+34"/>
<source>The supplied proxy address is invalid.</source>
<translation type="unfinished"/>
</message>
@@ -1442,22 +1478,22 @@ Naslov: %4
</message>
<message>
<location line="+50"/>
- <location line="+214"/>
+ <location line="+231"/>
<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="-140"/>
+ <location line="-155"/>
<source>Unconfirmed:</source>
<translation>Nepotrjeno:</translation>
</message>
<message>
- <location line="-81"/>
+ <location line="-83"/>
<source>Wallet</source>
<translation>Denarnica</translation>
</message>
<message>
- <location line="+49"/>
+ <location line="+51"/>
<source>Confirmed:</source>
<translation type="unfinished"/>
</message>
@@ -1492,7 +1528,7 @@ Naslov: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+56"/>
+ <location line="+71"/>
<source>&lt;b&gt;Recent transactions&lt;/b&gt;</source>
<translation>&lt;b&gt;Pogoste transakcije&lt;/&gt;</translation>
</message>
@@ -1506,7 +1542,8 @@ Naslov: %4
<context>
<name>PaymentServer</name>
<message>
- <location filename="../paymentserver.cpp" line="+397"/>
+ <location filename="../paymentserver.cpp" line="+403"/>
+ <location line="+13"/>
<source>URI handling</source>
<translation>Rokovanje z URI</translation>
</message>
@@ -1516,24 +1553,52 @@ Naslov: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+91"/>
+ <location line="+96"/>
<source>Requested payment amount of %1 is too small (considered dust).</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-204"/>
- <location line="+195"/>
+ <location line="-221"/>
+ <location line="+212"/>
<location line="+13"/>
+ <location line="+95"/>
+ <location line="+18"/>
+ <location line="+16"/>
<source>Payment request error</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-207"/>
+ <location line="-353"/>
<source>Cannot start bitcoin: click-to-pay handler</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+195"/>
+ <location line="+58"/>
+ <source>Net manager warning</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Your active proxy doesn&apos;t support SOCKS5, which is required for payment requests via proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>Payment request fetch URL is invalid: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Payment request file handling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Payment request file can not be read or processed! This can be caused by an invalid payment request file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+73"/>
<source>Unverified payment requests to custom payment scripts are unsupported.</source>
<translation type="unfinished"/>
</message>
@@ -1543,24 +1608,27 @@ Naslov: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
+ <location line="+43"/>
<source>Error communicating with %1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+28"/>
+ <location line="+24"/>
+ <source>Payment request can not be parsed or processed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
<source>Bad response from server %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+32"/>
+ <location line="+33"/>
<source>Payment acknowledged</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-55"/>
- <location line="+27"/>
- <location line="+17"/>
+ <location line="-11"/>
<source>Network request error</source>
<translation type="unfinished"/>
</message>
@@ -1568,18 +1636,18 @@ Naslov: %4
<context>
<name>QObject</name>
<message>
- <location filename="../bitcoin.cpp" line="+119"/>
- <location line="+5"/>
+ <location filename="../bitcoin.cpp" line="+71"/>
+ <location line="+11"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-4"/>
+ <location line="+1"/>
<source>Error: Specified data directory &quot;%1&quot; does not exist.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="-12"/>
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation type="unfinished"/>
</message>
@@ -1621,15 +1689,16 @@ Naslov: %4
<location line="+23"/>
<location line="+23"/>
<location line="+36"/>
- <location line="+53"/>
+ <location line="+23"/>
+ <location line="+36"/>
<location line="+23"/>
<location line="+23"/>
- <location filename="../rpcconsole.cpp" line="+360"/>
+ <location filename="../rpcconsole.cpp" line="+359"/>
<source>N/A</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-217"/>
+ <location line="-223"/>
<source>Client version</source>
<translation>RazliÄica odjemalca</translation>
</message>
@@ -1644,7 +1713,12 @@ Naslov: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+78"/>
+ <location line="+25"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+53"/>
<source>Using OpenSSL version</source>
<translation>OpenSSL razliÄica v rabi</translation>
</message>
@@ -1660,16 +1734,16 @@ Naslov: %4
</message>
<message>
<location line="+7"/>
- <source>Number of connections</source>
- <translation>Å tevilo povezav</translation>
+ <source>Name</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+23"/>
- <source>On testnet</source>
- <translation>Na testnetu</translation>
+ <source>Number of connections</source>
+ <translation>Å tevilo povezav</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+29"/>
<source>Block chain</source>
<translation type="unfinished"/>
</message>
@@ -1694,16 +1768,6 @@ Naslov: %4
<translation>&amp;Odpri</translation>
</message>
<message>
- <location line="+16"/>
- <source>Command-line options</source>
- <translation>Možnosti ukazne vrstice</translation>
- </message>
- <message>
- <location line="+10"/>
- <source>&amp;Show</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location line="+24"/>
<source>&amp;Console</source>
<translation>&amp;Konzola</translation>
@@ -1734,17 +1798,12 @@ Naslov: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-541"/>
+ <location line="-521"/>
<source>Build date</source>
<translation>Datum izgradnje</translation>
</message>
<message>
- <location line="-79"/>
- <source>Bitcoin Core</source>
- <translation>Jedro Bitcoina</translation>
- </message>
- <message>
- <location line="+279"/>
+ <location line="+206"/>
<source>Debug log file</source>
<translation>RazhroÅ¡Äevalna dnevniÅ¡ka datoteka</translation>
</message>
@@ -1754,11 +1813,6 @@ Naslov: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+26"/>
- <source>Show the Bitcoin-Core help message to get a list with possible Bitcoin command-line options.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location line="+76"/>
<source>Clear console</source>
<translation>PoÄisti konzolo</translation>
@@ -1779,7 +1833,7 @@ Naslov: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+128"/>
+ <location line="+122"/>
<source>%1 B</source>
<translation type="unfinished"/>
</message>
@@ -1822,12 +1876,7 @@ Naslov: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+19"/>
- <source>The amount to request</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="-32"/>
+ <location line="-13"/>
<source>&amp;Label:</source>
<translation>&amp;Oznaka:</translation>
</message>
@@ -1837,12 +1886,7 @@ Naslov: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+20"/>
- <source>The message to attach to payment request</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="-37"/>
+ <location line="-17"/>
<source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
@@ -1853,16 +1897,26 @@ Naslov: %4
</message>
<message>
<location line="+27"/>
- <source>The label to associate with the new receiving address</source>
+ <source>An optional label to associate with the new receiving address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
- <source>Use this form to request payments. All fields are optional.</source>
+ <location line="+7"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+56"/>
+ <location line="+7"/>
+ <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+39"/>
+ <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+17"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"/>
</message>
@@ -1878,11 +1932,11 @@ Naslov: %4
</message>
<message>
<location line="+47"/>
- <source>Previously requested payments</source>
+ <source>Requested payments</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+12"/>
+ <location line="+16"/>
<source>Show the selected request (does the same as double clicking an entry)</source>
<translation type="unfinished"/>
</message>
@@ -1973,7 +2027,7 @@ Naslov: %4
<context>
<name>RecentRequestsTableModel</name>
<message>
- <location filename="../recentrequeststablemodel.cpp" line="+14"/>
+ <location filename="../recentrequeststablemodel.cpp" line="+24"/>
<source>Date</source>
<translation>Datum</translation>
</message>
@@ -1993,7 +2047,7 @@ Naslov: %4
<translation>KoliÄina</translation>
</message>
<message>
- <location line="+36"/>
+ <location line="+38"/>
<source>(no label)</source>
<translation>(ni oznake)</translation>
</message>
@@ -2008,7 +2062,7 @@ Naslov: %4
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
<location filename="../sendcoinsdialog.cpp" line="+381"/>
- <location line="+81"/>
+ <location line="+80"/>
<source>Send Coins</source>
<translation>Pošlji kovance</translation>
</message>
@@ -2118,7 +2172,7 @@ Naslov: %4
<translation>P&amp;ošlji</translation>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-229"/>
+ <location filename="../sendcoinsdialog.cpp" line="-228"/>
<source>Confirm send coins</source>
<translation>Potrdi odliv kovancev </translation>
</message>
@@ -2221,22 +2275,22 @@ Naslov: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+113"/>
+ <location line="+112"/>
<source>Warning: Invalid Bitcoin address</source>
<translation>Opozorilo: Neveljaven Bitcoin naslov</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+21"/>
<source>(no label)</source>
<translation>(ni oznake)</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="-11"/>
<source>Warning: Unknown change address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-378"/>
+ <location line="-366"/>
<source>Are you sure you want to send?</source>
<translation type="unfinished"/>
</message>
@@ -2260,13 +2314,13 @@ Naslov: %4
<name>SendCoinsEntry</name>
<message>
<location filename="../forms/sendcoinsentry.ui" line="+131"/>
- <location line="+501"/>
+ <location line="+521"/>
<location line="+536"/>
<source>A&amp;mount:</source>
<translation>K&amp;oliÄina:</translation>
</message>
<message>
- <location line="-1132"/>
+ <location line="-1152"/>
<source>Pay &amp;To:</source>
<translation>Prejemnik &amp;plaÄila:</translation>
</message>
@@ -2312,23 +2366,33 @@ Naslov: %4
</message>
<message>
<location line="+7"/>
- <location line="+504"/>
+ <location line="+524"/>
<location line="+536"/>
<source>Remove this entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-40"/>
+ <location line="-1008"/>
+ <source>Message:</source>
+ <translation>SporoÄilo:</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+958"/>
<source>This is a verified payment request.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-971"/>
+ <location line="-991"/>
<source>Enter a label for this address to add it to the list of used addresses</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+439"/>
+ <location line="+459"/>
<source>This is an unverified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2351,6 +2415,19 @@ Naslov: %4
</message>
</context>
<context>
+ <name>ShutdownWindow</name>
+ <message>
+ <location filename="../utilitydialog.cpp" line="+48"/>
+ <source>Bitcoin Core is shutting down...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Do not shut down the computer until this window disappears.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>SignVerifyMessageDialog</name>
<message>
<location filename="../forms/signverifymessagedialog.ui" line="+14"/>
@@ -2358,7 +2435,7 @@ Naslov: %4
<translation>Podpisi - PodpiÅ¡i/preveri sporoÄilo</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+10"/>
<source>&amp;Sign Message</source>
<translation>&amp;PodpiÅ¡i sporoÄilo</translation>
</message>
@@ -2546,7 +2623,7 @@ Naslov: %4
<context>
<name>SplashScreen</name>
<message>
- <location filename="../splashscreen.cpp" line="+26"/>
+ <location filename="../splashscreen.cpp" line="+28"/>
<source>Bitcoin Core</source>
<translation>Jedro Bitcoina</translation>
</message>
@@ -2645,12 +2722,12 @@ Naslov: %4
<location line="+12"/>
<location line="+45"/>
<location line="+17"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Credit</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="-120"/>
+ <location line="-125"/>
<source>matures in %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -2663,12 +2740,12 @@ Naslov: %4
<location line="+44"/>
<location line="+8"/>
<location line="+15"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Debit</source>
<translation>Dolg</translation>
</message>
<message>
- <location line="-57"/>
+ <location line="-62"/>
<source>Transaction fee</source>
<translation type="unfinished"/>
</message>
@@ -2679,11 +2756,12 @@ Naslov: %4
</message>
<message>
<location line="+6"/>
+ <location line="+9"/>
<source>Message</source>
<translation>SporoÄilo</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="-7"/>
<source>Comment</source>
<translation>Opomba</translation>
</message>
@@ -2693,7 +2771,7 @@ Naslov: %4
<translation>ID transakcije</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+18"/>
<source>Merchant</source>
<translation type="unfinished"/>
</message>
@@ -2733,7 +2811,7 @@ Naslov: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-227"/>
+ <location line="-232"/>
<source>, has not been successfully broadcast yet</source>
<translation>, še ni bila uspešno raznešena</translation>
</message>
@@ -2783,8 +2861,13 @@ Naslov: %4
<source>Amount</source>
<translation>KoliÄina</translation>
</message>
+ <message>
+ <location line="+59"/>
+ <source>Immature (%1 confirmations, will be available after %2)</source>
+ <translation type="unfinished"/>
+ </message>
<message numerus="yes">
- <location line="+57"/>
+ <location line="+16"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -2804,17 +2887,13 @@ Naslov: %4
<translation>Nepotrjeno (&amp;1 od %2 potrdil)</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="-22"/>
+ <location line="+25"/>
<source>Confirmed (%1 confirmations)</source>
<translation>Potrjeno (%1 potrdil)</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><numerusform></numerusform></translation>
- </message>
<message>
- <location line="+5"/>
+ <location line="-22"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation>Ta blok ni prejelo Å¡e nobeno vozliÅ¡Äe. Najverjetneje ne bo sprejet!</translation>
</message>
@@ -2824,7 +2903,7 @@ Naslov: %4
<translation>Generirano, toda ne sprejeto</translation>
</message>
<message>
- <location line="+43"/>
+ <location line="+62"/>
<source>Received with</source>
<translation>Prejeto z</translation>
</message>
@@ -3120,7 +3199,7 @@ Naslov: %4
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+217"/>
+ <location filename="../bitcoinstrings.cpp" line="+221"/>
<source>Usage:</source>
<translation>Uporaba:</translation>
</message>
@@ -3140,7 +3219,7 @@ Naslov: %4
<translation>Možnosti:</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+22"/>
<source>Specify configuration file (default: bitcoin.conf)</source>
<translation>DoloÄi datoteko z nastavitvami (privzeta: bitcoin.conf)</translation>
</message>
@@ -3160,7 +3239,7 @@ Naslov: %4
<translation>Nastavi pomnilnik podatkovne zbirke v megabajtih (privzeto: 25)</translation>
</message>
<message>
- <location line="-27"/>
+ <location line="-26"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
<translation>Sprejmi povezave na &lt;port&gt; (privzeta vrata: 8333 ali testnet: 18333)</translation>
</message>
@@ -3170,7 +3249,7 @@ Naslov: %4
<translation>Obdrži maksimalno število &lt;n&gt; povezav (privzeto: 125)</translation>
</message>
<message>
- <location line="-50"/>
+ <location line="-51"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation type="unfinished"/>
</message>
@@ -3180,22 +3259,22 @@ Naslov: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation>Prag za prekinitev povezav s slabimi odjemalci (privzeto: 1000)</translation>
</message>
<message>
- <location line="-147"/>
+ <location line="-148"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-33"/>
+ <location line="-36"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation type="unfinished"/>
</message>
@@ -3205,7 +3284,7 @@ Naslov: %4
<translation>Sprejmi ukaze iz ukazne vrstice in JSON-RPC</translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>Teci v ozadju in sprejemaj ukaze</translation>
</message>
@@ -3215,12 +3294,12 @@ Naslov: %4
<translation>Uporabi testno omrežje</translation>
</message>
<message>
- <location line="-117"/>
+ <location line="-118"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-92"/>
+ <location line="-95"/>
<source>%s, you must set a rpcpassword in the configuration file:
%s
It is recommended you use the following random password:
@@ -3261,6 +3340,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+4"/>
+ <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</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>
@@ -3366,6 +3450,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+1"/>
+ <source>Do not load the wallet and disable wallet RPC calls</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Do you want to rebuild the block database now?</source>
<translation type="unfinished"/>
</message>
@@ -3530,7 +3619,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+8"/>
+ <location line="+7"/>
<source>Set maximum block size in bytes (default: %d)</source>
<translation type="unfinished"/>
</message>
@@ -3550,7 +3639,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+12"/>
+ <location line="+3"/>
+ <source>This is intended for regression testing tools and app development.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Usage (deprecated, use bitcoin-cli):</source>
<translation type="unfinished"/>
</message>
@@ -3575,7 +3669,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
+ <location line="+2"/>
+ <source>Wallet options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source>
<translation type="unfinished"/>
</message>
@@ -3585,12 +3684,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-78"/>
+ <location line="-79"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-104"/>
+ <location line="-105"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
@@ -3610,7 +3709,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+88"/>
+ <location line="+89"/>
<source>Information</source>
<translation type="unfinished"/>
</message>
@@ -3660,11 +3759,6 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>PoÅ¡lji sledilne/razhroÅ¡Äevalne informacije v konzolo namesto jih shraniti v debug.log datoteko</translation>
</message>
<message>
- <location line="+1"/>
- <source>Send trace/debug info to debugger</source>
- <translation>PoÅ¡lji sledilne/razhroÅ¡Äevalne podatke razhroÅ¡Äevalniku</translation>
- </message>
- <message>
<location line="+6"/>
<source>Set minimum block size in bytes (default: 0)</source>
<translation type="unfinished"/>
@@ -3690,7 +3784,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Transaction amount too small</source>
<translation type="unfinished"/>
</message>
@@ -3720,7 +3814,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Uporabniško ime za JSON-RPC povezave</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Warning</source>
<translation>Opozorilo</translation>
</message>
@@ -3740,37 +3834,37 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-57"/>
+ <location line="-58"/>
<source>Password for JSON-RPC connections</source>
<translation>Geslo za JSON-RPC povezave</translation>
</message>
<message>
- <location line="-69"/>
+ <location line="-70"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation>Dovoli JSON-RPC povezave z doloÄenega IP naslova</translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation>PoÅ¡lji ukaze vozliÅ¡Äu na &lt;ip&gt; (privzet: 127.0.0.1)</translation>
</message>
<message>
- <location line="-131"/>
+ <location line="-132"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+160"/>
+ <location line="+161"/>
<source>Upgrade wallet to latest format</source>
<translation>Posodobi denarnico v najnovejši zapis</translation>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation>Nastavi velikost kljuÄa bazena na &lt;n&gt; (privzeto: 100)</translation>
</message>
<message>
- <location line="-12"/>
+ <location line="-11"/>
<source>Rescan the block chain for missing wallet transactions</source>
<translation>Ponovno preglej verigo blokov za manjkajoÄe transakcije denarnice</translation>
</message>
@@ -3780,7 +3874,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Uporabi OpenSSL (https) za JSON-RPC povezave</translation>
</message>
<message>
- <location line="-29"/>
+ <location line="-30"/>
<source>Server certificate file (default: server.cert)</source>
<translation>Datoteka potrdila strežnika (privzeta: server.cert)</translation>
</message>
@@ -3795,17 +3889,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>To sporoÄilo pomoÄi</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Unable to bind to %s on this computer (bind returned error %d, %s)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-106"/>
+ <location line="-107"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+59"/>
+ <location line="+60"/>
<source>Loading addresses...</source>
<translation>Nalaganje naslovov ...</translation>
</message>
@@ -3845,7 +3939,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3855,7 +3949,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+47"/>
+ <location line="+48"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3875,7 +3969,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Nalaganje indeksa blokov ...</translation>
</message>
<message>
- <location line="-61"/>
+ <location line="-62"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation>Dodaj vozliÅ¡Äe za povezavo nanj in skuÅ¡aj le to obdržati odprto</translation>
</message>
@@ -3885,12 +3979,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+94"/>
+ <location line="+95"/>
<source>Loading wallet...</source>
<translation>Nalaganje denarnice ...</translation>
</message>
<message>
- <location line="-55"/>
+ <location line="-56"/>
<source>Cannot downgrade wallet</source>
<translation>Ne morem </translation>
</message>
@@ -3900,7 +3994,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+66"/>
+ <location line="+67"/>
<source>Rescanning...</source>
<translation>Ponovno pregledovanje ...</translation>
</message>
@@ -3920,7 +4014,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Napaka</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-35"/>
<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_sq.ts b/src/qt/locale/bitcoin_sq.ts
index ea78b8a394..c473d560e0 100644
--- a/src/qt/locale/bitcoin_sq.ts
+++ b/src/qt/locale/bitcoin_sq.ts
@@ -3,13 +3,13 @@
<name>AboutDialog</name>
<message>
<location filename="../forms/aboutdialog.ui" line="+14"/>
- <source>About Bitcoin</source>
- <translation>Rreth Bitkoin-it</translation>
+ <source>About Bitcoin Core</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+39"/>
- <source>&lt;b&gt;Bitcoin&lt;/b&gt; version</source>
- <translation>&lt;b&gt;Bitkoin&lt;b&gt;versioni</translation>
+ <source>&lt;b&gt;Bitcoin Core&lt;/b&gt; version</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+57"/>
@@ -22,13 +22,13 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location filename="../aboutdialog.cpp" line="+14"/>
+ <location filename="../utilitydialog.cpp" line="+29"/>
<source>Copyright</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+0"/>
- <source>The Bitcoin developers</source>
+ <source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
</context>
@@ -65,7 +65,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location filename="../addressbookpage.cpp" line="+72"/>
+ <location filename="../addressbookpage.cpp" line="+74"/>
<source>&amp;Copy Address</source>
<translation type="unfinished"/>
</message>
@@ -135,7 +135,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+197"/>
+ <location line="+194"/>
<source>Export Address List</source>
<translation type="unfinished"/>
</message>
@@ -146,19 +146,19 @@ This product includes software developed by the OpenSSL Project for use in the O
</message>
<message>
<location line="+13"/>
- <source>Error exporting</source>
- <translation>Raportimi i gabimeve</translation>
+ <source>Exporting Failed</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation>Nuk mund të shkruhet ne skedar %1.</translation>
+ <location line="+1"/>
+ <source>There was an error trying to save the address list to %1.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<name>AddressTableModel</name>
<message>
- <location filename="../addresstablemodel.cpp" line="+164"/>
+ <location filename="../addresstablemodel.cpp" line="+168"/>
<source>Label</source>
<translation>Etiketë</translation>
</message>
@@ -196,7 +196,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Përsërisni frazkalimin e ri</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="+34"/>
+ <location filename="../askpassphrasedialog.cpp" line="+40"/>
<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>Futni frazkalimin e ri në portofol.&lt;br/&gt;Ju lutemi përdorni një frazkalim prej&lt;b&gt;10 ose më shumë shkronjash të rastësishme&lt;b/&gt;, ose tetë apo më shumë fjalë&lt;/b&gt;.</translation>
</message>
@@ -317,22 +317,27 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+250"/>
+ <location filename="../bitcoingui.cpp" line="+295"/>
<source>Sign &amp;message...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+254"/>
+ <location line="+335"/>
<source>Synchronizing with network...</source>
<translation>Duke u sinkronizuar me rrjetin...</translation>
</message>
<message>
- <location line="-324"/>
+ <location line="-407"/>
<source>&amp;Overview</source>
<translation>&amp;Përmbledhje</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="-137"/>
+ <source>Node</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+138"/>
<source>Show general overview of wallet</source>
<translation>Trego një përmbledhje te përgjithshme të portofolit</translation>
</message>
@@ -347,7 +352,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Shfleto historinë e transaksioneve</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>E&amp;xit</source>
<translation type="unfinished"/>
</message>
@@ -393,7 +398,22 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+259"/>
+ <location line="+10"/>
+ <source>&amp;Sending addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Receiving addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open &amp;URI...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+325"/>
<source>Importing blocks from disk...</source>
<translation type="unfinished"/>
</message>
@@ -403,12 +423,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="-322"/>
+ <location line="-405"/>
<source>Send coins to a Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+47"/>
+ <location line="+49"/>
<source>Modify configuration options for Bitcoin</source>
<translation type="unfinished"/>
</message>
@@ -438,20 +458,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="-180"/>
- <location line="+6"/>
- <location line="+513"/>
+ <location line="+430"/>
<source>Bitcoin</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-519"/>
- <location line="+6"/>
+ <location line="-643"/>
<source>Wallet</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+109"/>
+ <location line="+146"/>
<source>&amp;Send</source>
<translation type="unfinished"/>
</message>
@@ -461,13 +478,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+28"/>
- <location line="+2"/>
- <source>&amp;About Bitcoin</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+14"/>
+ <location line="+46"/>
<location line="+2"/>
<source>&amp;Show / Hide</source>
<translation type="unfinished"/>
@@ -493,64 +504,80 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+35"/>
+ <location line="+48"/>
<source>&amp;File</source>
<translation>&amp;Skedar</translation>
</message>
<message>
- <location line="+10"/>
+ <location line="+14"/>
<source>&amp;Settings</source>
<translation>&amp;Konfigurimet</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>&amp;Help</source>
<translation>&amp;Ndihmë</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+15"/>
<source>Tabs toolbar</source>
<translation>Shiriti i mjeteve</translation>
</message>
<message>
- <location line="-235"/>
- <location line="+294"/>
+ <location line="-284"/>
+ <location line="+376"/>
<source>[testnet]</source>
<translation>[testo rrjetin]</translation>
</message>
<message>
- <location line="-177"/>
+ <location line="-401"/>
+ <source>Bitcoin Core</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+163"/>
<source>Request payments (generates QR codes and bitcoin: URIs)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+63"/>
- <source>&amp;Used sending addresses...</source>
+ <location line="+29"/>
+ <location line="+2"/>
+ <source>&amp;About Bitcoin Core</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="+35"/>
<source>Show the list of used sending addresses and labels</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Used &amp;receiving addresses...</source>
+ <location line="+2"/>
+ <source>Show the list of used receiving addresses and labels</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open a bitcoin: URI or payment request</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Command-line options</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
- <source>Show the list of used receiving addresses and labels</source>
+ <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+106"/>
+ <location line="+159"/>
<location line="+5"/>
<source>Bitcoin client</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+120"/>
+ <location line="+142"/>
<source>%n active connection(s) to Bitcoin network</source>
<translation><numerusform>%n lidhje aktive me rrjetin e Bitkoin</numerusform><numerusform>%n lidhje aktive me rrjetin e Bitkoin</numerusform></translation>
</message>
@@ -570,7 +597,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+20"/>
+ <location line="+23"/>
<source>%n hour(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -590,7 +617,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
+ <location line="+21"/>
<source>Last received block was generated %1 ago.</source>
<translation type="unfinished"/>
</message>
@@ -615,27 +642,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+77"/>
- <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="-152"/>
+ <location line="-85"/>
<source>Up to date</source>
<translation>I azhornuar</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Catching up...</source>
<translation>Duke u azhornuar...</translation>
</message>
<message>
- <location line="+124"/>
- <source>Confirm transaction fee</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+130"/>
<source>Sent transaction</source>
<translation>Dërgo transaksionin</translation>
</message>
@@ -654,36 +671,318 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
+ <location line="+69"/>
+ <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
+ <translation>Portofoli po &lt;b&gt; enkriptohet&lt;/b&gt; dhe është &lt;b&gt; i ç&apos;kyçur&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>Portofoli po &lt;b&gt; enkriptohet&lt;/b&gt; dhe është &lt;b&gt; i kyçur&lt;/b&gt;</translation>
+ </message>
+ <message>
+ <location filename="../bitcoin.cpp" line="+438"/>
+ <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="+119"/>
+ <source>Network Alert</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
+ <name>CoinControlDialog</name>
+ <message>
+ <location filename="../forms/coincontroldialog.ui" line="+14"/>
+ <source>Coin Control Address Selection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+34"/>
- <source>URI handling</source>
+ <source>Quantity:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
+ <location line="+29"/>
+ <source>Bytes:</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+45"/>
- <source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
+ <source>Amount:</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>
+ <location line="+29"/>
+ <source>Priority:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+110"/>
- <source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
+ <location line="+45"/>
+ <source>Fee:</source>
<translation type="unfinished"/>
</message>
-</context>
-<context>
- <name>ClientModel</name>
<message>
- <location filename="../clientmodel.cpp" line="+115"/>
- <source>Network Alert</source>
+ <location line="+32"/>
+ <source>Low Output:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>After Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Change:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+63"/>
+ <source>(un)select all</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Tree mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>List mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>Amount</source>
+ <translation>Sasia</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Address</source>
+ <translation>Adresë</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Date</source>
+ <translation>Data</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Confirmations</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Confirmed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../coincontroldialog.cpp" line="+42"/>
+ <source>Copy address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy label</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+26"/>
+ <source>Copy amount</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-25"/>
+ <source>Copy transaction ID</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Lock unspent</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Unlock unspent</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+22"/>
+ <source>Copy quantity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Copy fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy after fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy bytes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy low output</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy change</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+323"/>
+ <source>highest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>higher</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>high</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>medium-high</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>medium</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>low-medium</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>low</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>lower</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>lowest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>(%1 locked)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+140"/>
+ <source>Dust</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>yes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>no</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>This label turns red, if the transaction size is greater than 1000 bytes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+5"/>
+ <source>This means a fee of at least %1 per kB is required.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-4"/>
+ <source>Can vary +/- 1 byte per input.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Transactions with higher priority are more likely to get included into a block.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>This label turns red, if the priority is smaller than &quot;medium&quot;.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>This label turns red, if any recipient receives an amount smaller than %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+4"/>
+ <source>This means a fee of at least %1 is required.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-3"/>
+ <source>Amounts below 0.546 times the minimum relay fee are shown as dust.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>This label turns red, if the change is smaller than %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
+ <location line="+66"/>
+ <source>(no label)</source>
+ <translation>(pa etiketë)</translation>
+ </message>
+ <message>
+ <location line="-9"/>
+ <source>change from %1 (%2)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>(change)</source>
<translation type="unfinished"/>
</message>
</context>
@@ -692,12 +991,12 @@ Address: %4
<message>
<location filename="../forms/editaddressdialog.ui" line="+14"/>
<source>Edit Address</source>
- <translation type="unfinished"/>
+ <translation>Ndrysho Adresën</translation>
</message>
<message>
<location line="+11"/>
<source>&amp;Label</source>
- <translation type="unfinished"/>
+ <translation>&amp;Etiketë</translation>
</message>
<message>
<location line="+10"/>
@@ -712,32 +1011,32 @@ Address: %4
<message>
<location line="-10"/>
<source>&amp;Address</source>
- <translation type="unfinished"/>
+ <translation>&amp;Adresa</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+21"/>
+ <location filename="../editaddressdialog.cpp" line="+28"/>
<source>New receiving address</source>
- <translation type="unfinished"/>
+ <translation>Adresë e re pritëse</translation>
</message>
<message>
<location line="+4"/>
<source>New sending address</source>
- <translation type="unfinished"/>
+ <translation>Adresë e re dërgimi</translation>
</message>
<message>
<location line="+3"/>
<source>Edit receiving address</source>
- <translation type="unfinished"/>
+ <translation>Ndrysho adresën pritëse</translation>
</message>
<message>
<location line="+4"/>
<source>Edit sending address</source>
- <translation type="unfinished"/>
+ <translation>ndrysho adresën dërguese</translation>
</message>
<message>
<location line="+76"/>
<source>The entered address &quot;%1&quot; is already in the address book.</source>
- <translation type="unfinished"/>
+ <translation>Adresa e dhënë &quot;%1&quot; është e zënë në librin e adresave. </translation>
</message>
<message>
<location line="-5"/>
@@ -747,18 +1046,18 @@ Address: %4
<message>
<location line="+10"/>
<source>Could not unlock wallet.</source>
- <translation type="unfinished"/>
+ <translation>Nuk mund të ç&apos;kyçet portofoli.</translation>
</message>
<message>
<location line="+5"/>
<source>New key generation failed.</source>
- <translation type="unfinished"/>
+ <translation>Krijimi i çelësit të ri dështoi.</translation>
</message>
</context>
<context>
<name>FreespaceChecker</name>
<message>
- <location filename="../intro.cpp" line="+61"/>
+ <location filename="../intro.cpp" line="+65"/>
<source>A new data directory will be created.</source>
<translation type="unfinished"/>
</message>
@@ -784,15 +1083,19 @@ Address: %4
</message>
</context>
<context>
- <name>GUIUtil::HelpMessageBox</name>
+ <name>HelpMessageDialog</name>
<message>
- <location filename="../guiutil.cpp" line="+558"/>
- <location line="+13"/>
- <source>Bitcoin-Qt</source>
+ <location filename="../forms/helpmessagedialog.ui" line="+19"/>
+ <source>Bitcoin Core - Command-line options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-13"/>
+ <location filename="../utilitydialog.cpp" line="+38"/>
+ <source>Bitcoin Core</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
<source>version</source>
<translation type="unfinished"/>
</message>
@@ -841,17 +1144,17 @@ Address: %4
</message>
<message>
<location line="+9"/>
- <source>Welcome to Bitcoin-Qt.</source>
+ <source>Welcome to Bitcoin Core.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+26"/>
- <source>As this is the first time the program is launched, you can choose where Bitcoin-Qt will store its data.</source>
+ <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+10"/>
- <source>Bitcoin-Qt will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
+ <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -865,7 +1168,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../intro.cpp" line="+105"/>
+ <location filename="../intro.cpp" line="+85"/>
+ <source>Bitcoin</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error: Specified data directory &quot;%1&quot; can not be created.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+19"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
@@ -881,14 +1194,42 @@ Address: %4
</message>
</context>
<context>
+ <name>OpenURIDialog</name>
+ <message>
+ <location filename="../forms/openuridialog.ui" line="+14"/>
+ <source>Open URI</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Open payment request from URI or file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>URI:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Select payment request file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../openuridialog.cpp" line="+47"/>
+ <source>Select payment request file to open</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OptionsDialog</name>
<message>
<location filename="../forms/optionsdialog.ui" line="+14"/>
<source>Options</source>
- <translation type="unfinished"/>
+ <translation>Opsionet</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+13"/>
<source>&amp;Main</source>
<translation type="unfinished"/>
</message>
@@ -913,57 +1254,87 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+35"/>
- <source>Reset all client options to default.</source>
+ <location line="+9"/>
+ <source>Size of &amp;database cache</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>&amp;Reset Options</source>
+ <location line="+13"/>
+ <source>Set database cache size in megabytes (default: 25)</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+13"/>
- <source>&amp;Network</source>
+ <source>MB</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>
+ <location line="+27"/>
+ <source>Number of script &amp;verification threads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Connect to the Bitcoin network through a SOCKS proxy.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
- <source>Map port using &amp;UPnP</source>
+ <source>&amp;Connect through SOCKS proxy (default proxy):</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>
+ <location line="+34"/>
+ <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+224"/>
+ <source>Active command-line options that override above options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
+ <source>Reset all client options to default.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
- <source>&amp;Connect through SOCKS proxy:</source>
+ <source>&amp;Reset Options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+9"/>
- <source>Proxy &amp;IP:</source>
+ <location line="-323"/>
+ <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="+19"/>
- <source>IP address of the proxy (e.g. 127.0.0.1)</source>
+ <source>Proxy &amp;IP:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="+32"/>
<source>&amp;Port:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+19"/>
+ <location line="+25"/>
<source>Port of the proxy (e.g. 9050)</source>
<translation type="unfinished"/>
</message>
@@ -1038,7 +1409,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+71"/>
+ <location line="+7"/>
+ <source>Whether to show coin control features or not.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Display coin &amp;control features (experts only)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+136"/>
<source>&amp;OK</source>
<translation type="unfinished"/>
</message>
@@ -1048,44 +1429,38 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>&amp;Apply</source>
+ <location filename="../optionsdialog.cpp" line="+67"/>
+ <source>default</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+58"/>
- <source>default</source>
+ <location line="+57"/>
+ <source>none</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+130"/>
+ <location line="+75"/>
<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>
+ <location line="+29"/>
+ <source>Client restart required to activate changes.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
- <location line="+9"/>
- <source>Warning</source>
+ <location line="-29"/>
+ <source>Client will be shutdown, do you want to proceed?</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-9"/>
- <location line="+9"/>
- <source>This setting will take effect after restarting Bitcoin.</source>
+ <location line="+33"/>
+ <source>This change would require a client restart.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+29"/>
+ <location line="+34"/>
<source>The supplied proxy address is invalid.</source>
<translation type="unfinished"/>
</message>
@@ -1095,26 +1470,26 @@ Address: %4
<message>
<location filename="../forms/overviewpage.ui" line="+14"/>
<source>Form</source>
- <translation type="unfinished"/>
+ <translation>Formilarë</translation>
</message>
<message>
<location line="+50"/>
- <location line="+202"/>
+ <location line="+231"/>
<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="-131"/>
+ <location line="-155"/>
<source>Unconfirmed:</source>
- <translation type="unfinished"/>
+ <translation>E pakonfirmuar:</translation>
</message>
<message>
- <location line="-78"/>
+ <location line="-83"/>
<source>Wallet</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+49"/>
+ <location line="+51"/>
<source>Confirmed:</source>
<translation type="unfinished"/>
</message>
@@ -1124,12 +1499,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+29"/>
+ <location line="+32"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+16"/>
<source>Immature:</source>
<translation type="unfinished"/>
</message>
@@ -1139,7 +1514,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+16"/>
<source>Total:</source>
<translation type="unfinished"/>
</message>
@@ -1149,12 +1524,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+53"/>
+ <location line="+71"/>
<source>&lt;b&gt;Recent transactions&lt;/b&gt;</source>
- <translation type="unfinished"/>
+ <translation>&lt;b&gt;Transaksionet e fundit&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../overviewpage.cpp" line="+116"/>
+ <location filename="../overviewpage.cpp" line="+120"/>
<location line="+1"/>
<source>out of sync</source>
<translation type="unfinished"/>
@@ -1163,7 +1538,8 @@ Address: %4
<context>
<name>PaymentServer</name>
<message>
- <location filename="../paymentserver.cpp" line="+392"/>
+ <location filename="../paymentserver.cpp" line="+403"/>
+ <location line="+13"/>
<source>URI handling</source>
<translation type="unfinished"/>
</message>
@@ -1173,45 +1549,82 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+69"/>
+ <location line="+96"/>
<source>Requested payment amount of %1 is too small (considered dust).</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
- <location line="+37"/>
+ <location line="-221"/>
+ <location line="+212"/>
+ <location line="+13"/>
+ <location line="+95"/>
+ <location line="+18"/>
+ <location line="+16"/>
<source>Payment request error</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="-353"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Net manager warning</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+1"/>
- <source>Insecure requests to custom payment scripts unsupported</source>
+ <source>Your active proxy doesn&apos;t support SOCKS5, which is required for payment requests via proxy.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+38"/>
+ <location line="+52"/>
+ <source>Payment request fetch URL is invalid: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Payment request file handling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Payment request file can not be read or processed! This can be caused by an invalid payment request file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+73"/>
+ <source>Unverified payment requests to custom payment scripts are unsupported.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+59"/>
<source>Refund from %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
+ <location line="+43"/>
<source>Error communicating with %1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+24"/>
+ <source>Payment request can not be parsed or processed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
<source>Bad response from server %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+32"/>
+ <location line="+33"/>
<source>Payment acknowledged</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-58"/>
- <location line="+30"/>
- <location line="+17"/>
+ <location line="-11"/>
<source>Network request error</source>
<translation type="unfinished"/>
</message>
@@ -1219,32 +1632,26 @@ Address: %4
<context>
<name>QObject</name>
<message>
- <location filename="../bitcoin.cpp" line="+114"/>
- <location line="+5"/>
- <location filename="../intro.cpp" line="-32"/>
+ <location filename="../bitcoin.cpp" line="+71"/>
+ <location line="+11"/>
<source>Bitcoin</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-4"/>
+ <location line="+1"/>
<source>Error: Specified data directory &quot;%1&quot; does not exist.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="-12"/>
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../intro.cpp" line="+1"/>
- <source>Error: Specified data directory &quot;%1&quot; can not be created.</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>QRImageWidget</name>
<message>
- <location filename="../receiverequestdialog.cpp" line="+32"/>
+ <location filename="../receiverequestdialog.cpp" line="+36"/>
<source>&amp;Save Image...</source>
<translation type="unfinished"/>
</message>
@@ -1260,7 +1667,7 @@ Address: %4
</message>
<message>
<location line="+0"/>
- <source>PNG Images (*.png)</source>
+ <source>PNG Image (*.png)</source>
<translation type="unfinished"/>
</message>
</context>
@@ -1278,15 +1685,16 @@ Address: %4
<location line="+23"/>
<location line="+23"/>
<location line="+36"/>
- <location line="+53"/>
+ <location line="+23"/>
+ <location line="+36"/>
<location line="+23"/>
<location line="+23"/>
- <location filename="../rpcconsole.cpp" line="+352"/>
+ <location filename="../rpcconsole.cpp" line="+359"/>
<source>N/A</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-217"/>
+ <location line="-223"/>
<source>Client version</source>
<translation type="unfinished"/>
</message>
@@ -1296,7 +1704,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+68"/>
+ <location line="-10"/>
+ <source>Debug window</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+25"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+53"/>
<source>Using OpenSSL version</source>
<translation type="unfinished"/>
</message>
@@ -1312,16 +1730,16 @@ Address: %4
</message>
<message>
<location line="+7"/>
- <source>Number of connections</source>
+ <source>Name</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+23"/>
- <source>On testnet</source>
+ <source>Number of connections</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+23"/>
+ <location line="+29"/>
<source>Block chain</source>
<translation type="unfinished"/>
</message>
@@ -1346,21 +1764,6 @@ Address: %4
<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"/>
@@ -1391,22 +1794,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-541"/>
+ <location line="-521"/>
<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"/>
+ <location line="+206"/>
<source>Debug log file</source>
<translation type="unfinished"/>
</message>
@@ -1416,7 +1809,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+102"/>
+ <location line="+76"/>
<source>Clear console</source>
<translation type="unfinished"/>
</message>
@@ -1436,7 +1829,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+128"/>
+ <location line="+122"/>
<source>%1 B</source>
<translation type="unfinished"/>
</message>
@@ -1474,48 +1867,48 @@ Address: %4
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+22"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
<source>&amp;Amount:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
- <source>The amount to request</source>
- <translation type="unfinished"/>
+ <location line="-13"/>
+ <source>&amp;Label:</source>
+ <translation>&amp;Etiketë:</translation>
</message>
<message>
- <location line="+7"/>
- <source>&amp;Label:</source>
+ <location line="-34"/>
+ <source>&amp;Message:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>The label to associate with the receiving address</source>
+ <location line="-17"/>
+ <source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>&amp;Message:</source>
+ <location line="+3"/>
+ <source>R&amp;euse an existing receiving address (not recommended)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>The message to attach to payment request</source>
+ <location line="+27"/>
+ <source>An optional label to associate with the new receiving address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
- <source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
+ <location line="+7"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>R&amp;euse an existing receiving address (not recommended)</source>
+ <location line="+7"/>
+ <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>Use this form to request payments. All fields are optional.</source>
+ <location line="+39"/>
+ <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1533,6 +1926,31 @@ Address: %4
<source>&amp;Request payment</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+47"/>
+ <source>Requested payments</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Show the selected request (does the same as double clicking an entry)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Show</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Remove the selected entries from the list</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Remove</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
@@ -1553,16 +1971,11 @@ Address: %4
</message>
<message>
<location line="+7"/>
- <source>&amp;Copy Image</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+7"/>
<source>&amp;Save Image...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../receiverequestdialog.cpp" line="+58"/>
+ <location filename="../receiverequestdialog.cpp" line="+56"/>
<source>Request payment to %1</source>
<translation type="unfinished"/>
</message>
@@ -1584,7 +1997,7 @@ Address: %4
<message>
<location line="+2"/>
<source>Amount</source>
- <translation type="unfinished"/>
+ <translation>Sasia</translation>
</message>
<message>
<location line="+2"/>
@@ -1608,21 +2021,124 @@ Address: %4
</message>
</context>
<context>
+ <name>RecentRequestsTableModel</name>
+ <message>
+ <location filename="../recentrequeststablemodel.cpp" line="+24"/>
+ <source>Date</source>
+ <translation>Data</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Label</source>
+ <translation>Etiketë</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Amount</source>
+ <translation>Sasia</translation>
+ </message>
+ <message>
+ <location line="+38"/>
+ <source>(no label)</source>
+ <translation>(pa etiketë)</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>(no message)</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+140"/>
- <location line="+213"/>
+ <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location line="+80"/>
<source>Send Coins</source>
+ <translation>Dërgo Monedha</translation>
+ </message>
+ <message>
+ <location line="+76"/>
+ <source>Coin Control Features</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+50"/>
- <source>Send to multiple recipients at once</source>
+ <location line="+20"/>
+ <source>Inputs...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>automatically selected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Insufficient funds!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+89"/>
+ <source>Quantity:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+35"/>
+ <source>Bytes:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Amount:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Priority:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Low Output:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>After Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Change:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+44"/>
+ <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
+ <source>Custom change address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+115"/>
+ <source>Send to multiple recipients at once</source>
+ <translation>Dërgo marrësve të ndryshëm njëkohësisht</translation>
+ </message>
+ <message>
+ <location line="+3"/>
<source>Add &amp;Recipient</source>
<translation type="unfinished"/>
</message>
@@ -1639,17 +2155,12 @@ Address: %4
<message>
<location line="+22"/>
<source>Balance:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+10"/>
- <source>123.456 BTC</source>
- <translation type="unfinished"/>
+ <translation>Balanca:</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+41"/>
<source>Confirm the send action</source>
- <translation type="unfinished"/>
+ <translation>Konfirmo veprimin e dërgimit</translation>
</message>
<message>
<location line="+3"/>
@@ -1657,69 +2168,135 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-154"/>
+ <location filename="../sendcoinsdialog.cpp" line="-228"/>
<source>Confirm send coins</source>
- <translation type="unfinished"/>
+ <translation>konfirmo dërgimin e monedhave</translation>
</message>
<message>
- <location line="-90"/>
+ <location line="-74"/>
<location line="+5"/>
<location line="+5"/>
+ <location line="+4"/>
<source>%1 to %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+26"/>
+ <location line="-136"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation>Futni një adresë Bitkoini (p.sh. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Copy quantity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy after fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy bytes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy low output</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy change</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+170"/>
+ <source>Total Amount %1 (= %2)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>or</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+202"/>
<source>The recipient address is not valid, please recheck.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The amount to pay must be larger than 0.</source>
- <translation type="unfinished"/>
+ <translation>Shuma e paguar duhet të jetë më e madhe se 0.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The amount exceeds your balance.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The total exceeds your balance when the %1 transaction fee is included.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+3"/>
<source>Duplicate address found, can only send to each address once per send operation.</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="+3"/>
+ <source>Transaction creation failed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+4"/>
- <source>Error: Transaction creation failed!</source>
+ <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+15"/>
- <source>Are you sure you want to send?</source>
+ <location line="+112"/>
+ <source>Warning: Invalid Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+9"/>
- <source>added as transaction fee</source>
+ <location line="+21"/>
+ <source>(no label)</source>
+ <translation>(pa etiketë)</translation>
+ </message>
+ <message>
+ <location line="-11"/>
+ <source>Warning: Unknown change address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
- <source>Total Amount %1</source>
+ <location line="-366"/>
+ <source>Are you sure you want to send?</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+20"/>
- <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>
+ <location line="+9"/>
+ <source>added as transaction fee</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+144"/>
+ <location line="+170"/>
<source>Payment request expired</source>
<translation type="unfinished"/>
</message>
@@ -1732,70 +2309,117 @@ Address: %4
<context>
<name>SendCoinsEntry</name>
<message>
- <location filename="../forms/sendcoinsentry.ui" line="+33"/>
- <location line="+585"/>
+ <location filename="../forms/sendcoinsentry.ui" line="+131"/>
+ <location line="+521"/>
+ <location line="+536"/>
<source>A&amp;mount:</source>
- <translation type="unfinished"/>
+ <translation>Sh&amp;uma:</translation>
</message>
<message>
- <location line="-572"/>
- <location line="+585"/>
+ <location line="-1152"/>
<source>Pay &amp;To:</source>
- <translation type="unfinished"/>
+ <translation>Paguaj &amp;drejt:</translation>
</message>
<message>
- <location line="-551"/>
+ <location line="+18"/>
<source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../sendcoinsentry.cpp" line="+28"/>
+ <location filename="../sendcoinsentry.cpp" line="+30"/>
<source>Enter a label for this address to add it to your address book</source>
- <translation type="unfinished"/>
+ <translation>Krijoni një etiketë për këtë adresë që t&apos;ja shtoni librit të adresave</translation>
</message>
<message>
- <location filename="../forms/sendcoinsentry.ui" line="-18"/>
+ <location filename="../forms/sendcoinsentry.ui" line="+57"/>
<source>&amp;Label:</source>
- <translation type="unfinished"/>
+ <translation>&amp;Etiketë:</translation>
</message>
<message>
- <location line="+28"/>
+ <location line="-50"/>
<source>Choose previously used address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>Alt+A</source>
+ <location line="-40"/>
+ <source>This is a normal payment.</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="+50"/>
+ <source>Alt+A</source>
+ <translation>Alt+A</translation>
+ </message>
+ <message>
<location line="+7"/>
<source>Paste address from clipboard</source>
- <translation type="unfinished"/>
+ <translation>Ngjit nga memorja e sistemit</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>
+ <location line="+524"/>
+ <location line="+536"/>
+ <source>Remove this entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="-1008"/>
+ <source>Message:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+958"/>
+ <source>This is a verified payment request.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-991"/>
<source>Enter a label for this address to add it to the list of used addresses</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+465"/>
+ <location line="+459"/>
+ <source>This is an unverified payment request.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+18"/>
+ <location line="+532"/>
+ <source>Pay To:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-498"/>
+ <location line="+536"/>
<source>Memo:</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../sendcoinsentry.cpp" line="+1"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation>Futni një adresë Bitkoini (p.sh. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ </message>
+</context>
+<context>
+ <name>ShutdownWindow</name>
+ <message>
+ <location filename="../utilitydialog.cpp" line="+48"/>
+ <source>Bitcoin Core is shutting down...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Do not shut down the computer until this window disappears.</source>
<translation type="unfinished"/>
</message>
</context>
@@ -1807,7 +2431,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+10"/>
<source>&amp;Sign Message</source>
<translation type="unfinished"/>
</message>
@@ -1831,17 +2455,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>Ngjit nga memorja e sistemit</translation>
</message>
<message>
<location line="+10"/>
<source>Alt+P</source>
- <translation type="unfinished"/>
+ <translation>Alt+P</translation>
</message>
<message>
<location line="+12"/>
@@ -1910,10 +2534,10 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+27"/>
+ <location filename="../signverifymessagedialog.cpp" line="+29"/>
<location line="+3"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation type="unfinished"/>
+ <translation>Futni një adresë Bitkoini (p.sh. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
<location line="-2"/>
@@ -1926,7 +2550,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+85"/>
+ <location line="+84"/>
<location line="+81"/>
<source>The entered address is invalid.</source>
<translation type="unfinished"/>
@@ -1995,8 +2619,13 @@ Address: %4
<context>
<name>SplashScreen</name>
<message>
- <location filename="../splashscreen.cpp" line="+23"/>
- <source>The Bitcoin developers</source>
+ <location filename="../splashscreen.cpp" line="+28"/>
+ <source>Bitcoin Core</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
<message>
@@ -2008,7 +2637,7 @@ Address: %4
<context>
<name>TrafficGraphWidget</name>
<message>
- <location filename="../trafficgraphwidget.cpp" line="+75"/>
+ <location filename="../trafficgraphwidget.cpp" line="+79"/>
<source>KB/s</source>
<translation type="unfinished"/>
</message>
@@ -2016,9 +2645,9 @@ Address: %4
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="+22"/>
+ <location filename="../transactiondesc.cpp" line="+28"/>
<source>Open until %1</source>
- <translation type="unfinished"/>
+ <translation>Hapur deri më %1</translation>
</message>
<message>
<location line="+6"/>
@@ -2028,12 +2657,12 @@ Address: %4
<message>
<location line="+2"/>
<source>%1/unconfirmed</source>
- <translation type="unfinished"/>
+ <translation>%1/I pakonfirmuar</translation>
</message>
<message>
<location line="+2"/>
<source>%1 confirmations</source>
- <translation type="unfinished"/>
+ <translation>%1 konfirmimet</translation>
</message>
<message>
<location line="+18"/>
@@ -2048,7 +2677,7 @@ Address: %4
<message>
<location line="+4"/>
<source>Date</source>
- <translation type="unfinished"/>
+ <translation>Data</translation>
</message>
<message>
<location line="+7"/>
@@ -2089,12 +2718,12 @@ Address: %4
<location line="+12"/>
<location line="+45"/>
<location line="+17"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Credit</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="-120"/>
+ <location line="-125"/>
<source>matures in %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -2107,12 +2736,12 @@ Address: %4
<location line="+44"/>
<location line="+8"/>
<location line="+15"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Debit</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-57"/>
+ <location line="-62"/>
<source>Transaction fee</source>
<translation type="unfinished"/>
</message>
@@ -2123,11 +2752,12 @@ Address: %4
</message>
<message>
<location line="+6"/>
+ <location line="+9"/>
<source>Message</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="-7"/>
<source>Comment</source>
<translation type="unfinished"/>
</message>
@@ -2137,7 +2767,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+18"/>
<source>Merchant</source>
<translation type="unfinished"/>
</message>
@@ -2164,7 +2794,7 @@ Address: %4
<message>
<location line="+23"/>
<source>Amount</source>
- <translation type="unfinished"/>
+ <translation>Sasia</translation>
</message>
<message>
<location line="+1"/>
@@ -2177,9 +2807,9 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-227"/>
+ <location line="-232"/>
<source>, has not been successfully broadcast yet</source>
- <translation type="unfinished"/>
+ <translation>, nuk është transmetuar me sukses deri tani</translation>
</message>
<message numerus="yes">
<location line="-35"/>
@@ -2189,7 +2819,7 @@ Address: %4
<message>
<location line="+70"/>
<source>unknown</source>
- <translation type="unfinished"/>
+ <translation>i/e panjohur</translation>
</message>
</context>
<context>
@@ -2197,25 +2827,25 @@ Address: %4
<message>
<location filename="../forms/transactiondescdialog.ui" line="+14"/>
<source>Transaction details</source>
- <translation type="unfinished"/>
+ <translation>Detajet e transaksionit</translation>
</message>
<message>
<location line="+6"/>
<source>This pane shows a detailed description of the transaction</source>
- <translation type="unfinished"/>
+ <translation>Ky panel tregon një përshkrim të detajuar të transaksionit</translation>
</message>
</context>
<context>
<name>TransactionTableModel</name>
<message>
- <location filename="../transactiontablemodel.cpp" line="+227"/>
+ <location filename="../transactiontablemodel.cpp" line="+234"/>
<source>Date</source>
- <translation type="unfinished"/>
+ <translation>Data</translation>
</message>
<message>
<location line="+0"/>
<source>Type</source>
- <translation type="unfinished"/>
+ <translation>Lloji</translation>
</message>
<message>
<location line="+0"/>
@@ -2225,52 +2855,53 @@ Address: %4
<message>
<location line="+0"/>
<source>Amount</source>
+ <translation>Sasia</translation>
+ </message>
+ <message>
+ <location line="+59"/>
+ <source>Immature (%1 confirmations, will be available after %2)</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+57"/>
+ <location line="+16"/>
<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"/>
+ <translation>Hapur deri më %1</translation>
</message>
<message>
<location line="+3"/>
<source>Offline (%1 confirmations)</source>
- <translation type="unfinished"/>
+ <translation>Jashtë linje(%1 konfirmime)</translation>
</message>
<message>
<location line="+3"/>
<source>Unconfirmed (%1 of %2 confirmations)</source>
- <translation type="unfinished"/>
+ <translation>I/E pakonfirmuar(%1 nga %2 konfirmime)</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="-22"/>
+ <location line="+25"/>
<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>
+ <translation>I/E konfirmuar(%1 konfirmime)</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="-22"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
- <translation type="unfinished"/>
+ <translation>Ky bllok është marrë nga ndonjë nyje dhe ka shumë mundësi të mos pranohet! </translation>
</message>
<message>
<location line="+3"/>
<source>Generated but not accepted</source>
- <translation type="unfinished"/>
+ <translation>I krijuar por i papranuar</translation>
</message>
<message>
- <location line="+43"/>
+ <location line="+62"/>
<source>Received with</source>
- <translation type="unfinished"/>
+ <translation>Marrë me</translation>
</message>
<message>
<location line="+2"/>
@@ -2280,22 +2911,22 @@ Address: %4
<message>
<location line="+3"/>
<source>Sent to</source>
- <translation type="unfinished"/>
+ <translation>Dërguar drejt</translation>
</message>
<message>
<location line="+2"/>
<source>Payment to yourself</source>
- <translation type="unfinished"/>
+ <translation>Pagesë ndaj vetvetes</translation>
</message>
<message>
<location line="+2"/>
<source>Mined</source>
- <translation type="unfinished"/>
+ <translation>Minuar</translation>
</message>
<message>
<location line="+38"/>
<source>(n/a)</source>
- <translation type="unfinished"/>
+ <translation>(p/a)</translation>
</message>
<message>
<location line="+199"/>
@@ -2326,7 +2957,7 @@ Address: %4
<context>
<name>TransactionView</name>
<message>
- <location filename="../transactionview.cpp" line="+52"/>
+ <location filename="../transactionview.cpp" line="+57"/>
<location line="+16"/>
<source>All</source>
<translation type="unfinished"/>
@@ -2364,12 +2995,12 @@ Address: %4
<message>
<location line="+11"/>
<source>Received with</source>
- <translation type="unfinished"/>
+ <translation>Marrë me</translation>
</message>
<message>
<location line="+2"/>
<source>Sent to</source>
- <translation type="unfinished"/>
+ <translation>Dërguar drejt</translation>
</message>
<message>
<location line="+2"/>
@@ -2379,7 +3010,7 @@ Address: %4
<message>
<location line="+1"/>
<source>Mined</source>
- <translation type="unfinished"/>
+ <translation>Minuar</translation>
</message>
<message>
<location line="+1"/>
@@ -2387,12 +3018,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="+6"/>
<source>Enter address or label to search</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="+6"/>
<source>Min amount</source>
<translation type="unfinished"/>
</message>
@@ -2427,29 +3058,49 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+143"/>
- <source>Export Transaction Data</source>
+ <location line="+142"/>
+ <source>Export Transaction History</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="+19"/>
+ <source>Exporting Failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>There was an error trying to save the transaction history to %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Exporting Successful</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The transaction history was successfully saved to %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-22"/>
<source>Comma separated file (*.csv)</source>
<translation>Skedar i ndarë me pikëpresje(*.csv)</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+9"/>
<source>Confirmed</source>
<translation type="unfinished"/>
</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>Lloji</translation>
</message>
<message>
<location line="+1"/>
@@ -2464,7 +3115,7 @@ Address: %4
<message>
<location line="+1"/>
<source>Amount</source>
- <translation type="unfinished"/>
+ <translation>Sasia</translation>
</message>
<message>
<location line="+1"/>
@@ -2472,17 +3123,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
- <source>Error exporting</source>
- <translation>Raportimi i gabimeve</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation>Nuk mund të shkruhet ne skedar %1.</translation>
- </message>
- <message>
- <location line="+100"/>
+ <location line="+107"/>
<source>Range:</source>
<translation type="unfinished"/>
</message>
@@ -2493,17 +3134,25 @@ Address: %4
</message>
</context>
<context>
+ <name>WalletFrame</name>
+ <message>
+ <location filename="../walletframe.cpp" line="+26"/>
+ <source>No wallet has been loaded.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>WalletModel</name>
<message>
- <location filename="../walletmodel.cpp" line="+218"/>
+ <location filename="../walletmodel.cpp" line="+245"/>
<source>Send Coins</source>
- <translation type="unfinished"/>
+ <translation>Dërgo Monedha</translation>
</message>
</context>
<context>
<name>WalletView</name>
<message>
- <location filename="../walletview.cpp" line="+46"/>
+ <location filename="../walletview.cpp" line="+43"/>
<source>&amp;Export</source>
<translation type="unfinished"/>
</message>
@@ -2513,65 +3162,60 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+183"/>
+ <location line="+181"/>
<source>Backup Wallet</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
+ <location line="+1"/>
<source>Wallet Data (*.dat)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
+ <location line="+6"/>
<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>
+ <source>There was an error trying to save the wallet data to %1.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+4"/>
- <source>Backup Successful</source>
+ <source>The wallet data was successfully saved to %1.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+0"/>
- <source>The wallet data was successfully saved to the new location.</source>
+ <source>Backup Successful</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+102"/>
- <source>Bitcoin version</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+107"/>
+ <location filename="../bitcoinstrings.cpp" line="+221"/>
<source>Usage:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-55"/>
+ <location line="-54"/>
<source>List commands</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-13"/>
+ <location line="-14"/>
<source>Get help for a command</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+25"/>
+ <location line="+26"/>
<source>Options:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+24"/>
+ <location line="+22"/>
<source>Specify configuration file (default: bitcoin.conf)</source>
<translation type="unfinished"/>
</message>
@@ -2591,7 +3235,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-28"/>
+ <location line="-26"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
<translation type="unfinished"/>
</message>
@@ -2601,7 +3245,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-49"/>
+ <location line="-51"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation type="unfinished"/>
</message>
@@ -2611,37 +3255,37 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-142"/>
+ <location line="-148"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-33"/>
+ <location line="-36"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+40"/>
+ <location line="+45"/>
<source>Accept command line and JSON-RPC commands</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<source>Run in the background as a daemon and accept commands</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+40"/>
+ <location line="+39"/>
<source>Use the test network</source>
<translation type="unfinished"/>
</message>
@@ -2651,7 +3295,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-87"/>
+ <location line="-95"/>
<source>%s, you must set a rpcpassword in the configuration file:
%s
It is recommended you use the following random password:
@@ -2692,6 +3336,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+4"/>
+ <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</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>
@@ -2706,17 +3355,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+11"/>
- <source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source>
+ <location line="+18"/>
+ <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="+6"/>
- <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
+ <location line="+5"/>
+ <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+3"/>
<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>
@@ -2746,17 +3395,27 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
+ <location line="+9"/>
+ <source>&lt;category&gt; can be:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
<source>Attempt to recover private keys from a corrupt wallet.dat</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
+ <source>Bitcoin Core Daemon</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Bitcoin RPC client version</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
<source>Block creation options:</source>
<translation type="unfinished"/>
</message>
@@ -2766,7 +3425,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
+ <source>Connect through SOCKS proxy</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect to JSON-RPC on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation type="unfinished"/>
</message>
@@ -2782,6 +3446,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+1"/>
+ <source>Do not load the wallet and disable wallet RPC calls</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Do you want to rebuild the block database now?</source>
<translation type="unfinished"/>
</message>
@@ -2876,7 +3545,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
+ <source>Fee per kB to add to transactions you send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Find peers using DNS lookup (default: 1 unless -connect)</source>
<translation type="unfinished"/>
</message>
@@ -2896,6 +3570,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
+ <location line="+1"/>
+ <source>If &lt;category&gt; is not supplied, output all debugging information.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+2"/>
<source>Incorrect or no genesis block found. Wrong datadir for network?</source>
<translation type="unfinished"/>
@@ -2911,17 +3590,37 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+8"/>
+ <location line="+5"/>
+ <source>Prepend debug output with timestamp (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>RPC client options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Rebuild block chain index from current blk000??.dat files</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+5"/>
+ <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Send command to Bitcoin server</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
+ <location line="+7"/>
+ <source>Set maximum block size in bytes (default: %d)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Set the number of threads to service RPC calls (default: 4)</source>
<translation type="unfinished"/>
</message>
@@ -2936,12 +3635,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+12"/>
+ <location line="+3"/>
+ <source>This is intended for regression testing tools and app development.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Usage (deprecated, use bitcoin-cli):</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+8"/>
+ <location line="+7"/>
<source>Verifying blocks...</source>
<translation type="unfinished"/>
</message>
@@ -2952,31 +3656,56 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+1"/>
+ <source>Wait for RPC server to start</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Wallet %s resides outside data directory %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+2"/>
+ <source>Wallet options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>You need to rebuild the database using -reindex to change -txindex</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-78"/>
+ <location line="-79"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-98"/>
+ <location line="-105"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+17"/>
+ <location line="+14"/>
+ <source>Output debugging information (default: 0, supplying &lt;category&gt; is optional)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+83"/>
+ <location line="+89"/>
<source>Information</source>
<translation type="unfinished"/>
</message>
@@ -3016,47 +3745,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<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"/>
+ <location line="+9"/>
<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"/>
+ <location line="+4"/>
<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"/>
+ <location line="+6"/>
<source>Set minimum block size in bytes (default: 0)</source>
<translation type="unfinished"/>
</message>
@@ -3081,7 +3780,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Transaction amount too small</source>
<translation type="unfinished"/>
</message>
@@ -3106,32 +3805,32 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<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="+5"/>
+ <location line="+7"/>
<source>Warning</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Warning: This version is obsolete, upgrade required!</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+2"/>
+ <source>version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>wallet.dat corrupt, salvage failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-54"/>
+ <location line="-58"/>
<source>Password for JSON-RPC connections</source>
<translation type="unfinished"/>
</message>
@@ -3141,27 +3840,27 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-126"/>
+ <location line="-132"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+155"/>
+ <location line="+161"/>
<source>Upgrade wallet to latest format</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-12"/>
+ <location line="-11"/>
<source>Rescan the block chain for missing wallet transactions</source>
<translation type="unfinished"/>
</message>
@@ -3171,7 +3870,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-29"/>
+ <location line="-30"/>
<source>Server certificate file (default: server.cert)</source>
<translation type="unfinished"/>
</message>
@@ -3186,27 +3885,22 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Unable to bind to %s on this computer (bind returned error %d, %s)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-95"/>
- <source>Connect through socks proxy</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="-11"/>
+ <location line="-107"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+58"/>
+ <location line="+60"/>
<source>Loading addresses...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-36"/>
+ <location line="-37"/>
<source>Error loading wallet.dat: Wallet corrupted</source>
<translation type="unfinished"/>
</message>
@@ -3226,12 +3920,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+30"/>
+ <location line="+31"/>
<source>Invalid -proxy address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+57"/>
+ <location line="+56"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3241,7 +3935,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3251,7 +3945,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+46"/>
+ <location line="+48"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3271,27 +3965,22 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-60"/>
+ <location line="-62"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-28"/>
+ <location line="-32"/>
<source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+69"/>
- <source>Fee per KB to add to transactions you send</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+20"/>
+ <location line="+95"/>
<source>Loading wallet...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-54"/>
+ <location line="-56"/>
<source>Cannot downgrade wallet</source>
<translation type="unfinished"/>
</message>
@@ -3301,7 +3990,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+66"/>
+ <location line="+67"/>
<source>Rescanning...</source>
<translation type="unfinished"/>
</message>
@@ -3321,7 +4010,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-33"/>
+ <location line="-35"/>
<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 ab43083251..a3eb9b4fa3 100644
--- a/src/qt/locale/bitcoin_sr.ts
+++ b/src/qt/locale/bitcoin_sr.ts
@@ -22,13 +22,13 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location filename="../aboutdialog.cpp" line="+19"/>
+ <location filename="../utilitydialog.cpp" line="+29"/>
<source>Copyright</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+0"/>
- <source>The Bitcoin developers</source>
+ <source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
</context>
@@ -146,13 +146,13 @@ This product includes software developed by the OpenSSL Project for use in the O
</message>
<message>
<location line="+13"/>
- <source>Error exporting</source>
- <translation>Грешка током извоза</translation>
+ <source>Exporting Failed</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation>Ðије могуће пиÑати у фајл %1.</translation>
+ <location line="+1"/>
+ <source>There was an error trying to save the address list to %1.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -317,22 +317,27 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+260"/>
+ <location filename="../bitcoingui.cpp" line="+295"/>
<source>Sign &amp;message...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+290"/>
+ <location line="+335"/>
<source>Synchronizing with network...</source>
<translation>Синхронизација Ñа мрежом у току...</translation>
</message>
<message>
- <location line="-360"/>
+ <location line="-407"/>
<source>&amp;Overview</source>
<translation>&amp;Општи преглед</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="-137"/>
+ <source>Node</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+138"/>
<source>Show general overview of wallet</source>
<translation>Погледајте општи преглед новчаника</translation>
</message>
@@ -347,7 +352,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Претражите иÑторијат транÑакција</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>E&amp;xit</source>
<translation>I&amp;zlaz</translation>
</message>
@@ -393,7 +398,22 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Промени &amp;лозинку...</translation>
</message>
<message>
- <location line="+295"/>
+ <location line="+10"/>
+ <source>&amp;Sending addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Receiving addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open &amp;URI...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+325"/>
<source>Importing blocks from disk...</source>
<translation type="unfinished"/>
</message>
@@ -403,12 +423,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="-358"/>
+ <location line="-405"/>
<source>Send coins to a Bitcoin address</source>
<translation>Пошаљите новац на bitcoin адреÑу</translation>
</message>
<message>
- <location line="+47"/>
+ <location line="+49"/>
<source>Modify configuration options for Bitcoin</source>
<translation>Изаберите могућноÑти bitcoin-а</translation>
</message>
@@ -438,18 +458,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+375"/>
+ <location line="+430"/>
<source>Bitcoin</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-563"/>
- <location line="+10"/>
+ <location line="-643"/>
<source>Wallet</source>
<translation>новчаник</translation>
</message>
<message>
- <location line="+113"/>
+ <location line="+146"/>
<source>&amp;Send</source>
<translation type="unfinished"/>
</message>
@@ -459,7 +478,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+44"/>
+ <location line="+46"/>
<location line="+2"/>
<source>&amp;Show / Hide</source>
<translation type="unfinished"/>
@@ -485,86 +504,80 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+39"/>
+ <location line="+48"/>
<source>&amp;File</source>
<translation>&amp;Фајл</translation>
</message>
<message>
- <location line="+11"/>
+ <location line="+14"/>
<source>&amp;Settings</source>
<translation>&amp;Подешавања</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>&amp;Help</source>
<translation>П&amp;омоћ</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+15"/>
<source>Tabs toolbar</source>
<translation>Трака Ñа картицама</translation>
</message>
<message>
- <location line="-244"/>
- <location line="+321"/>
+ <location line="-284"/>
+ <location line="+376"/>
<source>[testnet]</source>
<translation>[testnet]</translation>
</message>
<message>
- <location line="-331"/>
- <location line="+10"/>
+ <location line="-401"/>
<source>Bitcoin Core</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+121"/>
+ <location line="+163"/>
<source>Request payments (generates QR codes and bitcoin: URIs)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+27"/>
+ <location line="+29"/>
<location line="+2"/>
<source>&amp;About Bitcoin Core</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+34"/>
- <source>&amp;Used sending addresses...</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+35"/>
<source>Show the list of used sending addresses and labels</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Used &amp;receiving addresses...</source>
+ <location line="+2"/>
+ <source>Show the list of used receiving addresses and labels</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Show the list of used receiving addresses and labels</source>
+ <location line="+3"/>
+ <source>Open a bitcoin: URI or payment request</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+2"/>
- <source>Open URI...</source>
+ <source>&amp;Command-line options</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
- <source>Open a bitcoin: URI or payment request</source>
+ <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+126"/>
+ <location line="+159"/>
<location line="+5"/>
<source>Bitcoin client</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+133"/>
+ <location line="+142"/>
<source>%n active connection(s) to Bitcoin network</source>
<translation><numerusform>%n активна веза Ñа Bitcoin мрежом</numerusform><numerusform>%n активне везе Ñа Bitcoin мрежом</numerusform><numerusform>%n активних веза Ñа Bitcoin мрежом</numerusform></translation>
</message>
@@ -584,7 +597,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+20"/>
+ <location line="+23"/>
<source>%n hour(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -604,7 +617,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
+ <location line="+21"/>
<source>Last received block was generated %1 ago.</source>
<translation type="unfinished"/>
</message>
@@ -629,27 +642,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+77"/>
- <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="-152"/>
+ <location line="-85"/>
<source>Up to date</source>
<translation>Ðжурно</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Catching up...</source>
<translation>Ðжурирање у току...</translation>
</message>
<message>
- <location line="+124"/>
- <source>Confirm transaction fee</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+130"/>
<source>Sent transaction</source>
<translation>ПоÑлана транÑакција</translation>
</message>
@@ -668,7 +671,7 @@ Address: %4
<translation>Datum: %1⎠Iznos: %2⎠Tip: %3⎠Adresa: %4âŽ</translation>
</message>
<message>
- <location line="+67"/>
+ <location line="+69"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation>Ðовчаник Ñ˜Ñ &lt;b&gt;шифрован&lt;/b&gt; и тренутно &lt;b&gt;откључан&lt;/b&gt;</translation>
</message>
@@ -678,7 +681,7 @@ Address: %4
<translation>Ðовчаник Ñ˜Ñ &lt;b&gt;шифрован&lt;/b&gt; и тренутно &lt;b&gt;закључан&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+116"/>
+ <location filename="../bitcoin.cpp" line="+438"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation type="unfinished"/>
</message>
@@ -900,7 +903,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+171"/>
+ <location line="+31"/>
+ <source>none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+140"/>
<source>Dust</source>
<translation type="unfinished"/>
</message>
@@ -937,7 +945,7 @@ Address: %4
</message>
<message>
<location line="+1"/>
- <source>This label turns red, if the priority is smaller than &quot;medium&quot;</source>
+ <source>This label turns red, if the priority is smaller than &quot;medium&quot;.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1006,7 +1014,7 @@ Address: %4
<translation>&amp;ÐдреÑа</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+25"/>
+ <location filename="../editaddressdialog.cpp" line="+28"/>
<source>New receiving address</source>
<translation type="unfinished"/>
</message>
@@ -1075,20 +1083,24 @@ Address: %4
</message>
</context>
<context>
- <name>GUIUtil::HelpMessageBox</name>
+ <name>HelpMessageDialog</name>
<message>
- <location filename="../guiutil.cpp" line="+597"/>
- <source>version</source>
- <translation>верзија</translation>
+ <location filename="../forms/helpmessagedialog.ui" line="+19"/>
+ <source>Bitcoin Core - Command-line options</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <location line="+13"/>
+ <location filename="../utilitydialog.cpp" line="+38"/>
<source>Bitcoin Core</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-11"/>
+ <location line="+0"/>
+ <source>version</source>
+ <translation>верзија</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Usage:</source>
<translation>Korišćenje:</translation>
</message>
@@ -1217,7 +1229,7 @@ Address: %4
<translation>ПоÑтавке</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+13"/>
<source>&amp;Main</source>
<translation type="unfinished"/>
</message>
@@ -1242,57 +1254,87 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+35"/>
- <source>Reset all client options to default.</source>
+ <location line="+9"/>
+ <source>Size of &amp;database cache</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>&amp;Reset Options</source>
+ <location line="+13"/>
+ <source>Set database cache size in megabytes (default: 25)</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+13"/>
- <source>&amp;Network</source>
+ <source>MB</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>
+ <location line="+27"/>
+ <source>Number of script &amp;verification threads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Connect to the Bitcoin network through a SOCKS proxy.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
- <source>Map port using &amp;UPnP</source>
+ <source>&amp;Connect through SOCKS proxy (default proxy):</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>
+ <location line="+34"/>
+ <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+224"/>
+ <source>Active command-line options that override above options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
+ <source>Reset all client options to default.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
- <source>&amp;Connect through SOCKS proxy:</source>
+ <source>&amp;Reset Options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+9"/>
- <source>Proxy &amp;IP:</source>
+ <location line="-323"/>
+ <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="+19"/>
- <source>IP address of the proxy (e.g. 127.0.0.1)</source>
+ <source>Proxy &amp;IP:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="+32"/>
<source>&amp;Port:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+19"/>
+ <location line="+25"/>
<source>Port of the proxy (e.g. 9050)</source>
<translation type="unfinished"/>
</message>
@@ -1377,7 +1419,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+71"/>
+ <location line="+136"/>
<source>&amp;OK</source>
<translation>&amp;OK</translation>
</message>
@@ -1387,44 +1429,38 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>&amp;Apply</source>
+ <location filename="../optionsdialog.cpp" line="+67"/>
+ <source>default</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+63"/>
- <source>default</source>
+ <location line="+57"/>
+ <source>none</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+131"/>
+ <location line="+75"/>
<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>
+ <location line="+29"/>
+ <source>Client restart required to activate changes.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
- <location line="+9"/>
- <source>Warning</source>
+ <location line="-29"/>
+ <source>Client will be shutdown, do you want to proceed?</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-9"/>
- <location line="+9"/>
- <source>This setting will take effect after restarting Bitcoin.</source>
+ <location line="+33"/>
+ <source>This change would require a client restart.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+29"/>
+ <location line="+34"/>
<source>The supplied proxy address is invalid.</source>
<translation type="unfinished"/>
</message>
@@ -1438,22 +1474,22 @@ Address: %4
</message>
<message>
<location line="+50"/>
- <location line="+214"/>
+ <location line="+231"/>
<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="-140"/>
+ <location line="-155"/>
<source>Unconfirmed:</source>
<translation>Ðепотврђено:</translation>
</message>
<message>
- <location line="-81"/>
+ <location line="-83"/>
<source>Wallet</source>
<translation>новчаник</translation>
</message>
<message>
- <location line="+49"/>
+ <location line="+51"/>
<source>Confirmed:</source>
<translation type="unfinished"/>
</message>
@@ -1488,7 +1524,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+56"/>
+ <location line="+71"/>
<source>&lt;b&gt;Recent transactions&lt;/b&gt;</source>
<translation>&lt;b&gt;Ðедавне транÑакције&lt;/b&gt;</translation>
</message>
@@ -1502,7 +1538,8 @@ Address: %4
<context>
<name>PaymentServer</name>
<message>
- <location filename="../paymentserver.cpp" line="+397"/>
+ <location filename="../paymentserver.cpp" line="+403"/>
+ <location line="+13"/>
<source>URI handling</source>
<translation type="unfinished"/>
</message>
@@ -1512,24 +1549,52 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+91"/>
+ <location line="+96"/>
<source>Requested payment amount of %1 is too small (considered dust).</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-204"/>
- <location line="+195"/>
+ <location line="-221"/>
+ <location line="+212"/>
<location line="+13"/>
+ <location line="+95"/>
+ <location line="+18"/>
+ <location line="+16"/>
<source>Payment request error</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-207"/>
+ <location line="-353"/>
<source>Cannot start bitcoin: click-to-pay handler</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+195"/>
+ <location line="+58"/>
+ <source>Net manager warning</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Your active proxy doesn&apos;t support SOCKS5, which is required for payment requests via proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>Payment request fetch URL is invalid: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Payment request file handling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Payment request file can not be read or processed! This can be caused by an invalid payment request file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+73"/>
<source>Unverified payment requests to custom payment scripts are unsupported.</source>
<translation type="unfinished"/>
</message>
@@ -1539,24 +1604,27 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
+ <location line="+43"/>
<source>Error communicating with %1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+28"/>
+ <location line="+24"/>
+ <source>Payment request can not be parsed or processed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
<source>Bad response from server %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+32"/>
+ <location line="+33"/>
<source>Payment acknowledged</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-55"/>
- <location line="+27"/>
- <location line="+17"/>
+ <location line="-11"/>
<source>Network request error</source>
<translation type="unfinished"/>
</message>
@@ -1564,18 +1632,18 @@ Address: %4
<context>
<name>QObject</name>
<message>
- <location filename="../bitcoin.cpp" line="+119"/>
- <location line="+5"/>
+ <location filename="../bitcoin.cpp" line="+71"/>
+ <location line="+11"/>
<source>Bitcoin</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-4"/>
+ <location line="+1"/>
<source>Error: Specified data directory &quot;%1&quot; does not exist.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="-12"/>
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation type="unfinished"/>
</message>
@@ -1617,15 +1685,16 @@ Address: %4
<location line="+23"/>
<location line="+23"/>
<location line="+36"/>
- <location line="+53"/>
+ <location line="+23"/>
+ <location line="+36"/>
<location line="+23"/>
<location line="+23"/>
- <location filename="../rpcconsole.cpp" line="+360"/>
+ <location filename="../rpcconsole.cpp" line="+359"/>
<source>N/A</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-217"/>
+ <location line="-223"/>
<source>Client version</source>
<translation type="unfinished"/>
</message>
@@ -1640,7 +1709,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+78"/>
+ <location line="+25"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+53"/>
<source>Using OpenSSL version</source>
<translation type="unfinished"/>
</message>
@@ -1656,16 +1730,16 @@ Address: %4
</message>
<message>
<location line="+7"/>
- <source>Number of connections</source>
+ <source>Name</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+23"/>
- <source>On testnet</source>
+ <source>Number of connections</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+23"/>
+ <location line="+29"/>
<source>Block chain</source>
<translation type="unfinished"/>
</message>
@@ -1690,16 +1764,6 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
- <source>Command-line options</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+10"/>
- <source>&amp;Show</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location line="+24"/>
<source>&amp;Console</source>
<translation type="unfinished"/>
@@ -1730,17 +1794,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-541"/>
+ <location line="-521"/>
<source>Build date</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-79"/>
- <source>Bitcoin Core</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+279"/>
+ <location line="+206"/>
<source>Debug log file</source>
<translation type="unfinished"/>
</message>
@@ -1750,11 +1809,6 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+26"/>
- <source>Show the Bitcoin-Core help message to get a list with possible Bitcoin command-line options.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location line="+76"/>
<source>Clear console</source>
<translation type="unfinished"/>
@@ -1775,7 +1829,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+128"/>
+ <location line="+122"/>
<source>%1 B</source>
<translation type="unfinished"/>
</message>
@@ -1818,12 +1872,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+19"/>
- <source>The amount to request</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="-32"/>
+ <location line="-13"/>
<source>&amp;Label:</source>
<translation>&amp;Етикета</translation>
</message>
@@ -1833,12 +1882,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+20"/>
- <source>The message to attach to payment request</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="-37"/>
+ <location line="-17"/>
<source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
@@ -1849,16 +1893,26 @@ Address: %4
</message>
<message>
<location line="+27"/>
- <source>The label to associate with the new receiving address</source>
+ <source>An optional label to associate with the new receiving address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
- <source>Use this form to request payments. All fields are optional.</source>
+ <location line="+7"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+56"/>
+ <location line="+7"/>
+ <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+39"/>
+ <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+17"/>
<source>Clear all fields of the form.</source>
<translation type="unfinished"/>
</message>
@@ -1874,11 +1928,11 @@ Address: %4
</message>
<message>
<location line="+47"/>
- <source>Previously requested payments</source>
+ <source>Requested payments</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+12"/>
+ <location line="+16"/>
<source>Show the selected request (does the same as double clicking an entry)</source>
<translation type="unfinished"/>
</message>
@@ -1969,7 +2023,7 @@ Address: %4
<context>
<name>RecentRequestsTableModel</name>
<message>
- <location filename="../recentrequeststablemodel.cpp" line="+14"/>
+ <location filename="../recentrequeststablemodel.cpp" line="+24"/>
<source>Date</source>
<translation>datum</translation>
</message>
@@ -1989,7 +2043,7 @@ Address: %4
<translation>iznos</translation>
</message>
<message>
- <location line="+36"/>
+ <location line="+38"/>
<source>(no label)</source>
<translation>(без етикете)</translation>
</message>
@@ -2004,7 +2058,7 @@ Address: %4
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
<location filename="../sendcoinsdialog.cpp" line="+381"/>
- <location line="+81"/>
+ <location line="+80"/>
<source>Send Coins</source>
<translation>Слање новца</translation>
</message>
@@ -2114,7 +2168,7 @@ Address: %4
<translation>&amp;Пошаљи</translation>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-229"/>
+ <location filename="../sendcoinsdialog.cpp" line="-228"/>
<source>Confirm send coins</source>
<translation type="unfinished"/>
</message>
@@ -2217,22 +2271,22 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+113"/>
+ <location line="+112"/>
<source>Warning: Invalid Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+21"/>
<source>(no label)</source>
<translation>(без етикете)</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="-11"/>
<source>Warning: Unknown change address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-378"/>
+ <location line="-366"/>
<source>Are you sure you want to send?</source>
<translation type="unfinished"/>
</message>
@@ -2256,13 +2310,13 @@ Address: %4
<name>SendCoinsEntry</name>
<message>
<location filename="../forms/sendcoinsentry.ui" line="+131"/>
- <location line="+501"/>
+ <location line="+521"/>
<location line="+536"/>
<source>A&amp;mount:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-1132"/>
+ <location line="-1152"/>
<source>Pay &amp;To:</source>
<translation type="unfinished"/>
</message>
@@ -2308,23 +2362,33 @@ Address: %4
</message>
<message>
<location line="+7"/>
- <location line="+504"/>
+ <location line="+524"/>
<location line="+536"/>
<source>Remove this entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-40"/>
+ <location line="-1008"/>
+ <source>Message:</source>
+ <translation>Poruka:</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+958"/>
<source>This is a verified payment request.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-971"/>
+ <location line="-991"/>
<source>Enter a label for this address to add it to the list of used addresses</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+439"/>
+ <location line="+459"/>
<source>This is an unverified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2347,6 +2411,19 @@ Address: %4
</message>
</context>
<context>
+ <name>ShutdownWindow</name>
+ <message>
+ <location filename="../utilitydialog.cpp" line="+48"/>
+ <source>Bitcoin Core is shutting down...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Do not shut down the computer until this window disappears.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>SignVerifyMessageDialog</name>
<message>
<location filename="../forms/signverifymessagedialog.ui" line="+14"/>
@@ -2354,7 +2431,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+10"/>
<source>&amp;Sign Message</source>
<translation type="unfinished"/>
</message>
@@ -2542,7 +2619,7 @@ Address: %4
<context>
<name>SplashScreen</name>
<message>
- <location filename="../splashscreen.cpp" line="+26"/>
+ <location filename="../splashscreen.cpp" line="+28"/>
<source>Bitcoin Core</source>
<translation type="unfinished"/>
</message>
@@ -2641,12 +2718,12 @@ Address: %4
<location line="+12"/>
<location line="+45"/>
<location line="+17"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Credit</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="-120"/>
+ <location line="-125"/>
<source>matures in %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -2659,12 +2736,12 @@ Address: %4
<location line="+44"/>
<location line="+8"/>
<location line="+15"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Debit</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-57"/>
+ <location line="-62"/>
<source>Transaction fee</source>
<translation type="unfinished"/>
</message>
@@ -2675,11 +2752,12 @@ Address: %4
</message>
<message>
<location line="+6"/>
+ <location line="+9"/>
<source>Message</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="-7"/>
<source>Comment</source>
<translation type="unfinished"/>
</message>
@@ -2689,7 +2767,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+18"/>
<source>Merchant</source>
<translation type="unfinished"/>
</message>
@@ -2729,7 +2807,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-227"/>
+ <location line="-232"/>
<source>, has not been successfully broadcast yet</source>
<translation>, nije još uvek uspešno emitovan</translation>
</message>
@@ -2779,8 +2857,13 @@ Address: %4
<source>Amount</source>
<translation>iznos</translation>
</message>
+ <message>
+ <location line="+59"/>
+ <source>Immature (%1 confirmations, will be available after %2)</source>
+ <translation type="unfinished"/>
+ </message>
<message numerus="yes">
- <location line="+57"/>
+ <location line="+16"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -2800,17 +2883,13 @@ Address: %4
<translation>Nepotvrdjeno (%1 of %2 potvrdjenih)</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="-22"/>
+ <location line="+25"/>
<source>Confirmed (%1 confirmations)</source>
<translation>Potvrdjena (%1 potvrdjenih)</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"/>
+ <location line="-22"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation>Ovaj blok nije primljen od ostalih Ävorova (nodova) i verovatno neće biti prihvaćen!</translation>
</message>
@@ -2820,7 +2899,7 @@ Address: %4
<translation>Generisan ali nije prihvaćen</translation>
</message>
<message>
- <location line="+43"/>
+ <location line="+62"/>
<source>Received with</source>
<translation>Primljen sa</translation>
</message>
@@ -3116,7 +3195,7 @@ Address: %4
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+217"/>
+ <location filename="../bitcoinstrings.cpp" line="+221"/>
<source>Usage:</source>
<translation>Korišćenje:</translation>
</message>
@@ -3136,7 +3215,7 @@ Address: %4
<translation>Opcije</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+22"/>
<source>Specify configuration file (default: bitcoin.conf)</source>
<translation>Potvrdi željeni konfiguracioni fajl (podrazumevani:bitcoin.conf)</translation>
</message>
@@ -3156,7 +3235,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-27"/>
+ <location line="-26"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
<translation>Slušaj konekcije na &lt;port&gt; (default: 8333 or testnet: 18333)</translation>
</message>
@@ -3167,7 +3246,7 @@ Address: %4
</translation>
</message>
<message>
- <location line="-50"/>
+ <location line="-51"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation type="unfinished"/>
</message>
@@ -3177,22 +3256,22 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-147"/>
+ <location line="-148"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-33"/>
+ <location line="-36"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation type="unfinished"/>
</message>
@@ -3202,7 +3281,7 @@ Address: %4
<translation>Prihvati komandnu liniju i JSON-RPC komande</translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>Radi u pozadini kao daemon servis i prihvati komande</translation>
</message>
@@ -3212,12 +3291,12 @@ Address: %4
<translation>Koristi testnu mrežu</translation>
</message>
<message>
- <location line="-117"/>
+ <location line="-118"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-92"/>
+ <location line="-95"/>
<source>%s, you must set a rpcpassword in the configuration file:
%s
It is recommended you use the following random password:
@@ -3258,6 +3337,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+4"/>
+ <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</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>
@@ -3363,6 +3447,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+1"/>
+ <source>Do not load the wallet and disable wallet RPC calls</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Do you want to rebuild the block database now?</source>
<translation type="unfinished"/>
</message>
@@ -3527,7 +3616,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+8"/>
+ <location line="+7"/>
<source>Set maximum block size in bytes (default: %d)</source>
<translation type="unfinished"/>
</message>
@@ -3547,7 +3636,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+12"/>
+ <location line="+3"/>
+ <source>This is intended for regression testing tools and app development.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Usage (deprecated, use bitcoin-cli):</source>
<translation type="unfinished"/>
</message>
@@ -3572,7 +3666,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
+ <location line="+2"/>
+ <source>Wallet options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source>
<translation type="unfinished"/>
</message>
@@ -3582,12 +3681,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-78"/>
+ <location line="-79"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-104"/>
+ <location line="-105"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
@@ -3607,7 +3706,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+88"/>
+ <location line="+89"/>
<source>Information</source>
<translation type="unfinished"/>
</message>
@@ -3657,11 +3756,6 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Send trace/debug info to debugger</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location line="+6"/>
<source>Set minimum block size in bytes (default: 0)</source>
<translation type="unfinished"/>
@@ -3687,7 +3781,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Transaction amount too small</source>
<translation type="unfinished"/>
</message>
@@ -3717,7 +3811,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>KorisniÄko ime za JSON-RPC konekcije</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Warning</source>
<translation type="unfinished"/>
</message>
@@ -3737,37 +3831,37 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-57"/>
+ <location line="-58"/>
<source>Password for JSON-RPC connections</source>
<translation>Lozinka za JSON-RPC konekcije</translation>
</message>
<message>
- <location line="-69"/>
+ <location line="-70"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation>Dozvoli JSON-RPC konekcije sa posebne IP adrese</translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation>Pošalji komande to nodu koji radi na &lt;ip&gt; (default: 127.0.0.1)</translation>
</message>
<message>
- <location line="-131"/>
+ <location line="-132"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+160"/>
+ <location line="+161"/>
<source>Upgrade wallet to latest format</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation>Odredi veliÄinu zaÅ¡tićenih kljuÄeva na &lt;n&gt; (default: 100)</translation>
</message>
<message>
- <location line="-12"/>
+ <location line="-11"/>
<source>Rescan the block chain for missing wallet transactions</source>
<translation>Ponovo skeniraj lanac blokova za nedostajuće transakcije iz novÄanika</translation>
</message>
@@ -3777,7 +3871,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Koristi OpenSSL (https) za JSON-RPC konekcije</translation>
</message>
<message>
- <location line="-29"/>
+ <location line="-30"/>
<source>Server certificate file (default: server.cert)</source>
<translation type="unfinished"/>
</message>
@@ -3792,29 +3886,29 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Ova poruka Pomoći</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Unable to bind to %s on this computer (bind returned error %d, %s)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-106"/>
+ <location line="-107"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+59"/>
+ <location line="+60"/>
<source>Loading addresses...</source>
<translation>uÄitavam adrese....</translation>
</message>
<message>
<location line="-37"/>
<source>Error loading wallet.dat: Wallet corrupted</source>
- <translation type="unfinished"/>
+ <translation>Грешка током учитавања wallet.dat: Ðовчаник је покварен </translation>
</message>
<message>
<location line="+1"/>
<source>Error loading wallet.dat: Wallet requires newer version of Bitcoin</source>
- <translation type="unfinished"/>
+ <translation>Грешка током учитавања wallet.dat: Ðовчанику је неопходна нова верзија Bitcoin-a.</translation>
</message>
<message>
<location line="+98"/>
@@ -3824,7 +3918,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<message>
<location line="-100"/>
<source>Error loading wallet.dat</source>
- <translation type="unfinished"/>
+ <translation>Грешка током учитавања wallet.dat </translation>
</message>
<message>
<location line="+31"/>
@@ -3842,7 +3936,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3852,7 +3946,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+47"/>
+ <location line="+48"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3872,7 +3966,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>UÄitavam blok indeksa...</translation>
</message>
<message>
- <location line="-61"/>
+ <location line="-62"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation type="unfinished"/>
</message>
@@ -3882,12 +3976,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+94"/>
+ <location line="+95"/>
<source>Loading wallet...</source>
<translation>Ðовчаник Ñе учитава...</translation>
</message>
<message>
- <location line="-55"/>
+ <location line="-56"/>
<source>Cannot downgrade wallet</source>
<translation type="unfinished"/>
</message>
@@ -3897,7 +3991,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+66"/>
+ <location line="+67"/>
<source>Rescanning...</source>
<translation>Ponovo skeniram...</translation>
</message>
@@ -3917,7 +4011,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-34"/>
+ <location line="-35"/>
<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 7c029c6293..5743f1b36e 100644
--- a/src/qt/locale/bitcoin_sv.ts
+++ b/src/qt/locale/bitcoin_sv.ts
@@ -3,13 +3,13 @@
<name>AboutDialog</name>
<message>
<location filename="../forms/aboutdialog.ui" line="+14"/>
- <source>About Bitcoin</source>
- <translation>Om Bitcoin</translation>
+ <source>About Bitcoin Core</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+39"/>
- <source>&lt;b&gt;Bitcoin&lt;/b&gt; version</source>
- <translation>&lt;b&gt;Bitcoin&lt;/b&gt;-version</translation>
+ <source>&lt;b&gt;Bitcoin Core&lt;/b&gt; version</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+57"/>
@@ -28,14 +28,14 @@ Distribuerad under mjukvarulicensen MIT/X11, se den medföljande filen COPYING e
Denna produkten innehåller mjukvara utvecklad av OpenSSL Project för användning i OpenSSL Toolkit (http://www.openssl.org/) och kryptografisk mjukvara utvecklad av Eric Young (eay@cryptsoft.com) samt UPnP-mjukvara skriven av Thomas Bernard.</translation>
</message>
<message>
- <location filename="../aboutdialog.cpp" line="+14"/>
+ <location filename="../utilitydialog.cpp" line="+29"/>
<source>Copyright</source>
<translation>Copyright</translation>
</message>
<message>
<location line="+0"/>
- <source>The Bitcoin developers</source>
- <translation>Bitcoin-utvecklarna</translation>
+ <source>The Bitcoin Core developers</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -71,7 +71,7 @@ Denna produkten innehåller mjukvara utvecklad av OpenSSL Project för användni
<translation>S&amp;täng</translation>
</message>
<message>
- <location filename="../addressbookpage.cpp" line="+72"/>
+ <location filename="../addressbookpage.cpp" line="+74"/>
<source>&amp;Copy Address</source>
<translation>&amp;Kopiera adress</translation>
</message>
@@ -141,7 +141,7 @@ Denna produkten innehåller mjukvara utvecklad av OpenSSL Project för användni
<translation>&amp;Editera</translation>
</message>
<message>
- <location line="+197"/>
+ <location line="+194"/>
<source>Export Address List</source>
<translation>Exportera adresslistan</translation>
</message>
@@ -152,19 +152,19 @@ Denna produkten innehåller mjukvara utvecklad av OpenSSL Project för användni
</message>
<message>
<location line="+13"/>
- <source>Error exporting</source>
- <translation>Fel vid export</translation>
+ <source>Exporting Failed</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation>Kunde inte skriva till filen %1.</translation>
+ <location line="+1"/>
+ <source>There was an error trying to save the address list to %1.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<name>AddressTableModel</name>
<message>
- <location filename="../addresstablemodel.cpp" line="+164"/>
+ <location filename="../addresstablemodel.cpp" line="+168"/>
<source>Label</source>
<translation>Etikett</translation>
</message>
@@ -202,7 +202,7 @@ Denna produkten innehåller mjukvara utvecklad av OpenSSL Project för användni
<translation>Upprepa nytt lösenord</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="+34"/>
+ <location filename="../askpassphrasedialog.cpp" line="+40"/>
<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>Ange plånbokens nya lösenord. &lt;br/&gt; Använd ett lösenord på &lt;b&gt;10 eller fler slumpmässiga tecken,&lt;/b&gt; eller &lt;b&gt;åtta eller fler ord.&lt;/b&gt;</translation>
</message>
@@ -323,22 +323,27 @@ Denna produkten innehåller mjukvara utvecklad av OpenSSL Project för användni
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+250"/>
+ <location filename="../bitcoingui.cpp" line="+295"/>
<source>Sign &amp;message...</source>
<translation>Signera &amp;meddelande...</translation>
</message>
<message>
- <location line="+254"/>
+ <location line="+335"/>
<source>Synchronizing with network...</source>
<translation>Synkroniserar med nätverk...</translation>
</message>
<message>
- <location line="-324"/>
+ <location line="-407"/>
<source>&amp;Overview</source>
<translation>&amp;Översikt</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="-137"/>
+ <source>Node</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+138"/>
<source>Show general overview of wallet</source>
<translation>Visa översiktsvy av plånbok</translation>
</message>
@@ -353,7 +358,7 @@ Denna produkten innehåller mjukvara utvecklad av OpenSSL Project för användni
<translation>Bläddra i transaktionshistorik</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>E&amp;xit</source>
<translation>&amp;Avsluta</translation>
</message>
@@ -399,7 +404,22 @@ 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="+10"/>
+ <source>&amp;Sending addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Receiving addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open &amp;URI...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+325"/>
<source>Importing blocks from disk...</source>
<translation>Importerar block från disk...</translation>
</message>
@@ -409,12 +429,12 @@ Denna produkten innehåller mjukvara utvecklad av OpenSSL Project för användni
<translation>Återindexerar block på disken...</translation>
</message>
<message>
- <location line="-322"/>
+ <location line="-405"/>
<source>Send coins to a Bitcoin address</source>
<translation>Skicka mynt till en Bitcoin-adress</translation>
</message>
<message>
- <location line="+47"/>
+ <location line="+49"/>
<source>Modify configuration options for Bitcoin</source>
<translation>Ändra konfigurationsalternativ för Bitcoin</translation>
</message>
@@ -444,20 +464,17 @@ Denna produkten innehåller mjukvara utvecklad av OpenSSL Project för användni
<translation>&amp;Verifiera meddelande...</translation>
</message>
<message>
- <location line="-180"/>
- <location line="+6"/>
- <location line="+513"/>
+ <location line="+430"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-519"/>
- <location line="+6"/>
+ <location line="-643"/>
<source>Wallet</source>
<translation>Plånbok</translation>
</message>
<message>
- <location line="+109"/>
+ <location line="+146"/>
<source>&amp;Send</source>
<translation>&amp;Skicka</translation>
</message>
@@ -467,13 +484,7 @@ Denna produkten innehåller mjukvara utvecklad av OpenSSL Project för användni
<translation>&amp;Ta emot</translation>
</message>
<message>
- <location line="+28"/>
- <location line="+2"/>
- <source>&amp;About Bitcoin</source>
- <translation>&amp;Om Bitcoin</translation>
- </message>
- <message>
- <location line="+14"/>
+ <location line="+46"/>
<location line="+2"/>
<source>&amp;Show / Hide</source>
<translation>&amp;Visa / Göm</translation>
@@ -499,64 +510,80 @@ Denna produkten innehåller mjukvara utvecklad av OpenSSL Project för användni
<translation>Verifiera meddelanden för att vara säker på att de var signerade med den specificerade Bitcoin-adressen</translation>
</message>
<message>
- <location line="+35"/>
+ <location line="+48"/>
<source>&amp;File</source>
<translation>&amp;Arkiv</translation>
</message>
<message>
- <location line="+10"/>
+ <location line="+14"/>
<source>&amp;Settings</source>
<translation>&amp;Inställningar</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>&amp;Help</source>
<translation>&amp;Hjälp</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+15"/>
<source>Tabs toolbar</source>
<translation>Verktygsfält för Tabbar</translation>
</message>
<message>
- <location line="-235"/>
- <location line="+294"/>
+ <location line="-284"/>
+ <location line="+376"/>
<source>[testnet]</source>
<translation>[testnet]</translation>
</message>
<message>
- <location line="-177"/>
+ <location line="-401"/>
+ <source>Bitcoin Core</source>
+ <translation>Bitcoin Kärna</translation>
+ </message>
+ <message>
+ <location line="+163"/>
<source>Request payments (generates QR codes and bitcoin: URIs)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+63"/>
- <source>&amp;Used sending addresses...</source>
- <translation>&amp;Använda avsändaradresser...</translation>
+ <location line="+29"/>
+ <location line="+2"/>
+ <source>&amp;About Bitcoin Core</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="+35"/>
<source>Show the list of used sending addresses and labels</source>
<translation>Visa listan av använda avsändaradresser och etiketter</translation>
</message>
<message>
- <location line="+1"/>
- <source>Used &amp;receiving addresses...</source>
- <translation>Använda &amp;mottagaradresser...</translation>
+ <location line="+2"/>
+ <source>Show the list of used receiving addresses and labels</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open a bitcoin: URI or payment request</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Command-line options</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
- <source>Show the list of used receiving addresses and labels</source>
+ <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+106"/>
+ <location line="+159"/>
<location line="+5"/>
<source>Bitcoin client</source>
<translation>Bitcoin-klient</translation>
</message>
<message numerus="yes">
- <location line="+120"/>
+ <location line="+142"/>
<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>
@@ -576,7 +603,7 @@ Denna produkten innehåller mjukvara utvecklad av OpenSSL Project för användni
<translation>Bearbetat %1 block i transaktionshistoriken.</translation>
</message>
<message numerus="yes">
- <location line="+20"/>
+ <location line="+23"/>
<source>%n hour(s)</source>
<translation><numerusform>%n timme</numerusform><numerusform>%n timmar</numerusform></translation>
</message>
@@ -596,7 +623,7 @@ Denna produkten innehåller mjukvara utvecklad av OpenSSL Project för användni
<translation>%1 efter</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="+21"/>
<source>Last received block was generated %1 ago.</source>
<translation>Senast mottagna block genererades %1 sen.</translation>
</message>
@@ -621,27 +648,17 @@ Denna produkten innehåller mjukvara utvecklad av OpenSSL Project för användni
<translation>Information</translation>
</message>
<message>
- <location line="+77"/>
- <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="-152"/>
+ <location line="-85"/>
<source>Up to date</source>
<translation>Uppdaterad</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Catching up...</source>
<translation>Hämtar senaste...</translation>
</message>
<message>
- <location line="+124"/>
- <source>Confirm transaction fee</source>
- <translation>Bekräfta överföringsavgift</translation>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+130"/>
<source>Sent transaction</source>
<translation>Transaktion skickad</translation>
</message>
@@ -664,17 +681,7 @@ Adress: %4
</translation>
</message>
<message>
- <location line="+34"/>
- <source>URI handling</source>
- <translation>URI hantering</translation>
- </message>
- <message>
- <location line="+0"/>
- <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>
- <message>
- <location line="+45"/>
+ <location line="+69"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation>Denna plånbok är &lt;b&gt;krypterad&lt;/b&gt; och för närvarande &lt;b&gt;olåst&lt;/b&gt;</translation>
</message>
@@ -684,7 +691,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 filename="../bitcoin.cpp" line="+110"/>
+ <location filename="../bitcoin.cpp" line="+438"/>
<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>
@@ -692,12 +699,304 @@ Adress: %4
<context>
<name>ClientModel</name>
<message>
- <location filename="../clientmodel.cpp" line="+115"/>
+ <location filename="../clientmodel.cpp" line="+119"/>
<source>Network Alert</source>
<translation>Nätverkslarm</translation>
</message>
</context>
<context>
+ <name>CoinControlDialog</name>
+ <message>
+ <location filename="../forms/coincontroldialog.ui" line="+14"/>
+ <source>Coin Control Address Selection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>Quantity:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Bytes:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>Amount:</source>
+ <translation>Belopp:</translation>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Priority:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Low Output:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>After Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Change:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+63"/>
+ <source>(un)select all</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Tree mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>List mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>Amount</source>
+ <translation>Mängd</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Address</source>
+ <translation>Adress</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Date</source>
+ <translation>Datum</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Confirmations</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Confirmed</source>
+ <translation>Bekräftad</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../coincontroldialog.cpp" line="+42"/>
+ <source>Copy address</source>
+ <translation>Kopiera adress</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy label</source>
+ <translation>Kopiera etikett</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+26"/>
+ <source>Copy amount</source>
+ <translation>Kopiera belopp</translation>
+ </message>
+ <message>
+ <location line="-25"/>
+ <source>Copy transaction ID</source>
+ <translation>Kopiera transaktions ID</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Lock unspent</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Unlock unspent</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+22"/>
+ <source>Copy quantity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Copy fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy after fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy bytes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy low output</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy change</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+323"/>
+ <source>highest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>higher</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>high</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>medium-high</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>medium</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>low-medium</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>low</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>lower</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>lowest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>(%1 locked)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+140"/>
+ <source>Dust</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>yes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>no</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>This label turns red, if the transaction size is greater than 1000 bytes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+5"/>
+ <source>This means a fee of at least %1 per kB is required.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-4"/>
+ <source>Can vary +/- 1 byte per input.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Transactions with higher priority are more likely to get included into a block.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>This label turns red, if the priority is smaller than &quot;medium&quot;.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>This label turns red, if any recipient receives an amount smaller than %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+4"/>
+ <source>This means a fee of at least %1 is required.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-3"/>
+ <source>Amounts below 0.546 times the minimum relay fee are shown as dust.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>This label turns red, if the change is smaller than %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
+ <location line="+66"/>
+ <source>(no label)</source>
+ <translation>(Ingen etikett)</translation>
+ </message>
+ <message>
+ <location line="-9"/>
+ <source>change from %1 (%2)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>(change)</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>EditAddressDialog</name>
<message>
<location filename="../forms/editaddressdialog.ui" line="+14"/>
@@ -725,7 +1024,7 @@ Adress: %4
<translation>&amp;Adress</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+21"/>
+ <location filename="../editaddressdialog.cpp" line="+28"/>
<source>New receiving address</source>
<translation>Ny mottagaradress</translation>
</message>
@@ -768,7 +1067,7 @@ Adress: %4
<context>
<name>FreespaceChecker</name>
<message>
- <location filename="../intro.cpp" line="+61"/>
+ <location filename="../intro.cpp" line="+65"/>
<source>A new data directory will be created.</source>
<translation>En ny datakatalog kommer att skapas.</translation>
</message>
@@ -794,15 +1093,19 @@ Adress: %4
</message>
</context>
<context>
- <name>GUIUtil::HelpMessageBox</name>
+ <name>HelpMessageDialog</name>
<message>
- <location filename="../guiutil.cpp" line="+558"/>
- <location line="+13"/>
- <source>Bitcoin-Qt</source>
- <translation>Bitcoin-Qt</translation>
+ <location filename="../forms/helpmessagedialog.ui" line="+19"/>
+ <source>Bitcoin Core - Command-line options</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="-13"/>
+ <location filename="../utilitydialog.cpp" line="+38"/>
+ <source>Bitcoin Core</source>
+ <translation>Bitcoin Kärna</translation>
+ </message>
+ <message>
+ <location line="+0"/>
<source>version</source>
<translation>version</translation>
</message>
@@ -851,18 +1154,18 @@ Adress: %4
</message>
<message>
<location line="+9"/>
- <source>Welcome to Bitcoin-Qt.</source>
- <translation>Välkommen till Bitcoin-Qt.</translation>
+ <source>Welcome to Bitcoin Core.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+26"/>
- <source>As this is the first time the program is launched, you can choose where Bitcoin-Qt will store its data.</source>
- <translation>Eftersom detta är första gången programmet startas, kan du välja var Bitcoin-Qt ska lagra sina data.</translation>
+ <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+10"/>
- <source>Bitcoin-Qt will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
- <translation>Bitcoin-QT kommer att ladda ner och spara en kopia av Bitcoin blockkedjan. Åtminstone %1GB av data kommer att sparas i denna katalog, och den kommer att växa övertiden. Plånboken kommer också att sparas i denna katalog.</translation>
+ <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+10"/>
@@ -875,7 +1178,17 @@ Adress: %4
<translation>Använd en anpassad datakatalog:</translation>
</message>
<message>
- <location filename="../intro.cpp" line="+105"/>
+ <location filename="../intro.cpp" line="+85"/>
+ <source>Bitcoin</source>
+ <translation>Bitcoin</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error: Specified data directory &quot;%1&quot; can not be created.</source>
+ <translation>Fel: Den angivna datakatalogen &quot;%1&quot; kan inte skapas.</translation>
+ </message>
+ <message>
+ <location line="+19"/>
<source>Error</source>
<translation>Fel</translation>
</message>
@@ -891,6 +1204,34 @@ Adress: %4
</message>
</context>
<context>
+ <name>OpenURIDialog</name>
+ <message>
+ <location filename="../forms/openuridialog.ui" line="+14"/>
+ <source>Open URI</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Open payment request from URI or file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>URI:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Select payment request file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../openuridialog.cpp" line="+47"/>
+ <source>Select payment request file to open</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OptionsDialog</name>
<message>
<location filename="../forms/optionsdialog.ui" line="+14"/>
@@ -898,7 +1239,7 @@ Adress: %4
<translation>Alternativ</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+13"/>
<source>&amp;Main</source>
<translation>&amp;Allmänt</translation>
</message>
@@ -923,7 +1264,52 @@ Adress: %4
<translation>&amp;Starta Bitcoin vid systemstart</translation>
</message>
<message>
- <location line="+35"/>
+ <location line="+9"/>
+ <source>Size of &amp;database cache</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set database cache size in megabytes (default: 25)</source>
+ <translation>Sätt databas cache storleken i megabyte (förvalt: 25)</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>MB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Number of script &amp;verification threads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
+ <translation>Ange antalet skriptkontrolltrådar (upp till 16, 0 = auto, &lt;0 = lämna så många kärnor lediga, förval: 0)</translation>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Connect to the Bitcoin network through a SOCKS proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Connect through SOCKS proxy (default proxy):</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+224"/>
+ <source>Active command-line options that override above options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
<source>Reset all client options to default.</source>
<translation>Återställ alla klient inställningar till förvalen.</translation>
</message>
@@ -933,7 +1319,7 @@ Adress: %4
<translation>&amp;Återställ Alternativ</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="-323"/>
<source>&amp;Network</source>
<translation>&amp;Nätverk</translation>
</message>
@@ -948,32 +1334,17 @@ Adress: %4
<translation>Tilldela port med hjälp av &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>Anslut till Bitcoin-nätverket genom en SOCKS-proxy (t.ex. när du ansluter genom Tor).</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>&amp;Connect through SOCKS proxy:</source>
- <translation>&amp;Anslut genom SOCKS-proxy:</translation>
- </message>
- <message>
- <location line="+9"/>
+ <location line="+19"/>
<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>Proxyns IP-adress (t.ex. 127.0.0.1)</translation>
- </message>
- <message>
- <location line="+7"/>
+ <location line="+32"/>
<source>&amp;Port:</source>
<translation>&amp;Port: </translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+25"/>
<source>Port of the proxy (e.g. 9050)</source>
<translation>Proxyns port (t.ex. 9050)</translation>
</message>
@@ -1048,7 +1419,17 @@ Adress: %4
<translation>&amp;Visa adresser i transaktionslistan</translation>
</message>
<message>
- <location line="+71"/>
+ <location line="+7"/>
+ <source>Whether to show coin control features or not.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Display coin &amp;control features (experts only)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+136"/>
<source>&amp;OK</source>
<translation>&amp;OK</translation>
</message>
@@ -1058,44 +1439,38 @@ Adress: %4
<translation>&amp;Avbryt</translation>
</message>
<message>
- <location line="+10"/>
- <source>&amp;Apply</source>
- <translation>&amp;Verkställ</translation>
- </message>
- <message>
- <location filename="../optionsdialog.cpp" line="+58"/>
+ <location filename="../optionsdialog.cpp" line="+67"/>
<source>default</source>
<translation>standard</translation>
</message>
<message>
- <location line="+130"/>
+ <location line="+57"/>
+ <source>none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+75"/>
<source>Confirm options reset</source>
<translation>Bekräfta att alternativen ska återställs</translation>
</message>
<message>
<location line="+1"/>
- <source>Some settings may require a client restart to take effect.</source>
- <translation>Vissa inställningar kan behöva en omstart av klienten för att börja gälla.</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Do you want to proceed?</source>
- <translation>Vill du fortsätta?</translation>
+ <location line="+29"/>
+ <source>Client restart required to activate changes.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
- <location line="+9"/>
- <source>Warning</source>
- <translation>Varning</translation>
+ <location line="-29"/>
+ <source>Client will be shutdown, do you want to proceed?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="-9"/>
- <location line="+9"/>
- <source>This setting will take effect after restarting Bitcoin.</source>
- <translation>Denna inställning träder i kraft efter en omstart av Bitcoin.</translation>
+ <location line="+33"/>
+ <source>This change would require a client restart.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+29"/>
+ <location line="+34"/>
<source>The supplied proxy address is invalid.</source>
<translation>Den medföljande proxy adressen är ogiltig.</translation>
</message>
@@ -1109,22 +1484,22 @@ Adress: %4
</message>
<message>
<location line="+50"/>
- <location line="+202"/>
+ <location line="+231"/>
<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="-131"/>
+ <location line="-155"/>
<source>Unconfirmed:</source>
<translation>Obekräftade:</translation>
</message>
<message>
- <location line="-78"/>
+ <location line="-83"/>
<source>Wallet</source>
<translation>Plånbok</translation>
</message>
<message>
- <location line="+49"/>
+ <location line="+51"/>
<source>Confirmed:</source>
<translation>Bekräftade:</translation>
</message>
@@ -1134,12 +1509,12 @@ Adress: %4
<translation>Ditt tillgängliga saldo</translation>
</message>
<message>
- <location line="+29"/>
+ <location line="+32"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation>Totalt antal transaktioner som ännu inte bekräftats, och som ännu inte räknas med i aktuellt saldo</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+16"/>
<source>Immature:</source>
<translation>Omogen:</translation>
</message>
@@ -1149,7 +1524,7 @@ Adress: %4
<translation>Den genererade balansen som ännu inte har mognat</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+16"/>
<source>Total:</source>
<translation>Totalt:</translation>
</message>
@@ -1159,12 +1534,12 @@ Adress: %4
<translation>Ditt nuvarande totala saldo</translation>
</message>
<message>
- <location line="+53"/>
+ <location line="+71"/>
<source>&lt;b&gt;Recent transactions&lt;/b&gt;</source>
<translation>&lt;b&gt;Nyligen genomförda transaktioner&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../overviewpage.cpp" line="+116"/>
+ <location filename="../overviewpage.cpp" line="+120"/>
<location line="+1"/>
<source>out of sync</source>
<translation>osynkroniserad</translation>
@@ -1173,7 +1548,8 @@ Adress: %4
<context>
<name>PaymentServer</name>
<message>
- <location filename="../paymentserver.cpp" line="+392"/>
+ <location filename="../paymentserver.cpp" line="+403"/>
+ <location line="+13"/>
<source>URI handling</source>
<translation>URI hantering</translation>
</message>
@@ -1183,45 +1559,82 @@ Adress: %4
<translation>URI går inte att tolkas! Detta kan orsakas av en ogiltig Bitcoin-adress eller felaktiga URI parametrar.</translation>
</message>
<message>
- <location line="+69"/>
+ <location line="+96"/>
<source>Requested payment amount of %1 is too small (considered dust).</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
- <location line="+37"/>
+ <location line="-221"/>
+ <location line="+212"/>
+ <location line="+13"/>
+ <location line="+95"/>
+ <location line="+18"/>
+ <location line="+16"/>
<source>Payment request error</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="-353"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
+ <translation>Kan inte starta bitcoin: klicka-och-betala handhavare</translation>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Net manager warning</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+1"/>
- <source>Insecure requests to custom payment scripts unsupported</source>
+ <source>Your active proxy doesn&apos;t support SOCKS5, which is required for payment requests via proxy.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+38"/>
+ <location line="+52"/>
+ <source>Payment request fetch URL is invalid: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Payment request file handling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Payment request file can not be read or processed! This can be caused by an invalid payment request file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+73"/>
+ <source>Unverified payment requests to custom payment scripts are unsupported.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+59"/>
<source>Refund from %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
+ <location line="+43"/>
<source>Error communicating with %1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+24"/>
+ <source>Payment request can not be parsed or processed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
<source>Bad response from server %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+32"/>
+ <location line="+33"/>
<source>Payment acknowledged</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-58"/>
- <location line="+30"/>
- <location line="+17"/>
+ <location line="-11"/>
<source>Network request error</source>
<translation type="unfinished"/>
</message>
@@ -1229,32 +1642,26 @@ Adress: %4
<context>
<name>QObject</name>
<message>
- <location filename="../bitcoin.cpp" line="+114"/>
- <location line="+5"/>
- <location filename="../intro.cpp" line="-32"/>
+ <location filename="../bitcoin.cpp" line="+71"/>
+ <location line="+11"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-4"/>
+ <location line="+1"/>
<source>Error: Specified data directory &quot;%1&quot; does not exist.</source>
<translation>Fel: Den angivna datakatalogen &quot;%1&quot; finns inte.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="-12"/>
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../intro.cpp" line="+1"/>
- <source>Error: Specified data directory &quot;%1&quot; can not be created.</source>
- <translation>Fel: Den angivna datakatalogen &quot;%1&quot; kan inte skapas.</translation>
- </message>
</context>
<context>
<name>QRImageWidget</name>
<message>
- <location filename="../receiverequestdialog.cpp" line="+32"/>
+ <location filename="../receiverequestdialog.cpp" line="+36"/>
<source>&amp;Save Image...</source>
<translation>&amp;Spara Bild...</translation>
</message>
@@ -1270,8 +1677,8 @@ Adress: %4
</message>
<message>
<location line="+0"/>
- <source>PNG Images (*.png)</source>
- <translation>PNG-bilder (*.png)</translation>
+ <source>PNG Image (*.png)</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -1288,15 +1695,16 @@ Adress: %4
<location line="+23"/>
<location line="+23"/>
<location line="+36"/>
- <location line="+53"/>
<location line="+23"/>
+ <location line="+36"/>
<location line="+23"/>
- <location filename="../rpcconsole.cpp" line="+352"/>
+ <location line="+23"/>
+ <location filename="../rpcconsole.cpp" line="+359"/>
<source>N/A</source>
<translation>ej tillgänglig</translation>
</message>
<message>
- <location line="-217"/>
+ <location line="-223"/>
<source>Client version</source>
<translation>Klient-version</translation>
</message>
@@ -1306,7 +1714,17 @@ Adress: %4
<translation>&amp;Information</translation>
</message>
<message>
- <location line="+68"/>
+ <location line="-10"/>
+ <source>Debug window</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+25"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+53"/>
<source>Using OpenSSL version</source>
<translation>Använder OpenSSL version</translation>
</message>
@@ -1322,16 +1740,16 @@ Adress: %4
</message>
<message>
<location line="+7"/>
- <source>Number of connections</source>
- <translation>Antalet anslutningar</translation>
+ <source>Name</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+23"/>
- <source>On testnet</source>
- <translation>PÃ¥ testnet</translation>
+ <source>Number of connections</source>
+ <translation>Antalet anslutningar</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+29"/>
<source>Block chain</source>
<translation>Blockkedja</translation>
</message>
@@ -1356,21 +1774,6 @@ Adress: %4
<translation>&amp;Öppna</translation>
</message>
<message>
- <location line="+16"/>
- <source>Command-line options</source>
- <translation>Kommandoradsalternativ</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>Visa Bitcoin-Qt hjälpmeddelande för att få en lista med möjliga Bitcoin kommandoradsalternativ.</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>&amp;Show</source>
- <translation>&amp;Visa</translation>
- </message>
- <message>
<location line="+24"/>
<source>&amp;Console</source>
<translation>&amp;Konsol</translation>
@@ -1401,22 +1804,12 @@ Adress: %4
<translation>Ut:</translation>
</message>
<message>
- <location line="-541"/>
+ <location line="-521"/>
<source>Build date</source>
<translation>Kompileringsdatum</translation>
</message>
<message>
- <location line="-104"/>
- <source>Bitcoin - Debug window</source>
- <translation>Bitcoin - Debug fönster</translation>
- </message>
- <message>
- <location line="+25"/>
- <source>Bitcoin Core</source>
- <translation>Bitcoin Kärna</translation>
- </message>
- <message>
- <location line="+279"/>
+ <location line="+206"/>
<source>Debug log file</source>
<translation>Debugloggfil</translation>
</message>
@@ -1426,7 +1819,7 @@ Adress: %4
<translation>Öppna Bitcoin debug-loggfilen som finns i datakatalogen. Detta kan ta några sekunder för stora loggfiler.</translation>
</message>
<message>
- <location line="+102"/>
+ <location line="+76"/>
<source>Clear console</source>
<translation>Rensa konsollen</translation>
</message>
@@ -1446,7 +1839,7 @@ Adress: %4
<translation>Skriv &lt;b&gt;help&lt;/b&gt; för en översikt av alla kommandon.</translation>
</message>
<message>
- <location line="+128"/>
+ <location line="+122"/>
<source>%1 B</source>
<translation>%1 B</translation>
</message>
@@ -1484,37 +1877,22 @@ Adress: %4
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+22"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
<source>&amp;Amount:</source>
<translation>%Belopp:</translation>
</message>
<message>
- <location line="+16"/>
- <source>The amount to request</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+7"/>
+ <location line="-13"/>
<source>&amp;Label:</source>
<translation>&amp;Etikett:</translation>
</message>
<message>
- <location line="+10"/>
- <source>The label to associate with the receiving address</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+7"/>
+ <location line="-34"/>
<source>&amp;Message:</source>
<translation>&amp;Meddelande:</translation>
</message>
<message>
- <location line="+10"/>
- <source>The message to attach to payment request</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+14"/>
+ <location line="-17"/>
<source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
@@ -1524,8 +1902,23 @@ Adress: %4
<translation type="unfinished"/>
</message>
<message>
+ <location line="+27"/>
+ <source>An optional label to associate with the new receiving address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+7"/>
- <source>Use this form to request payments. All fields are optional.</source>
+ <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+39"/>
+ <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1543,6 +1936,31 @@ Adress: %4
<source>&amp;Request payment</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+47"/>
+ <source>Requested payments</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Show the selected request (does the same as double clicking an entry)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Show</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Remove the selected entries from the list</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Remove</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
@@ -1563,16 +1981,11 @@ Adress: %4
</message>
<message>
<location line="+7"/>
- <source>&amp;Copy Image</source>
- <translation>&amp;Kopiera Bild</translation>
- </message>
- <message>
- <location line="+7"/>
<source>&amp;Save Image...</source>
<translation>&amp;Spara Bild...</translation>
</message>
<message>
- <location filename="../receiverequestdialog.cpp" line="+58"/>
+ <location filename="../receiverequestdialog.cpp" line="+56"/>
<source>Request payment to %1</source>
<translation type="unfinished"/>
</message>
@@ -1618,16 +2031,119 @@ Adress: %4
</message>
</context>
<context>
+ <name>RecentRequestsTableModel</name>
+ <message>
+ <location filename="../recentrequeststablemodel.cpp" line="+24"/>
+ <source>Date</source>
+ <translation>Datum</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Label</source>
+ <translation>Etikett</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Message</source>
+ <translation>Meddelande</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Amount</source>
+ <translation>Mängd</translation>
+ </message>
+ <message>
+ <location line="+38"/>
+ <source>(no label)</source>
+ <translation>(Ingen etikett)</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>(no message)</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+140"/>
- <location line="+213"/>
+ <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location line="+80"/>
<source>Send Coins</source>
<translation>Skicka pengar</translation>
</message>
<message>
- <location line="+50"/>
+ <location line="+76"/>
+ <source>Coin Control Features</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Inputs...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>automatically selected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Insufficient funds!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+89"/>
+ <source>Quantity:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+35"/>
+ <source>Bytes:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Amount:</source>
+ <translation>Belopp:</translation>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Priority:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Low Output:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>After Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Change:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+44"/>
+ <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Custom change address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+115"/>
<source>Send to multiple recipients at once</source>
<translation>Skicka till flera mottagare samtidigt</translation>
</message>
@@ -1652,12 +2168,7 @@ Adress: %4
<translation>Balans:</translation>
</message>
<message>
- <location line="+10"/>
- <source>123.456 BTC</source>
- <translation>123,456 BTC</translation>
- </message>
- <message>
- <location line="+31"/>
+ <location line="+41"/>
<source>Confirm the send action</source>
<translation>Bekräfta sändordern</translation>
</message>
@@ -1667,69 +2178,135 @@ Adress: %4
<translation>&amp;Skicka</translation>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-154"/>
+ <location filename="../sendcoinsdialog.cpp" line="-228"/>
<source>Confirm send coins</source>
<translation>Bekräfta skickade mynt</translation>
</message>
<message>
- <location line="-90"/>
+ <location line="-74"/>
<location line="+5"/>
<location line="+5"/>
+ <location line="+4"/>
<source>%1 to %2</source>
<translation>%1 till %2</translation>
</message>
<message>
- <location line="+26"/>
+ <location line="-136"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation>Ange en Bitcoin-adress (t.ex. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Copy quantity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation>Kopiera belopp</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy after fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy bytes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy low output</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy change</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+170"/>
+ <source>Total Amount %1 (= %2)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>or</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+202"/>
<source>The recipient address is not valid, please recheck.</source>
<translation>Mottagarens adress är inte giltig, vänligen kontrollera igen.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The amount to pay must be larger than 0.</source>
<translation>Det betalade beloppet måste vara större än 0.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The amount exceeds your balance.</source>
<translation>Värdet överstiger ditt saldo.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The total exceeds your balance when the %1 transaction fee is included.</source>
<translation>Totalvärdet överstiger ditt saldo när transaktionsavgiften %1 är pålagd.</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+3"/>
<source>Duplicate address found, can only send to each address once per send operation.</source>
<translation>Dubblett av adress funnen, kan bara skicka till varje adress en gång per sändning.</translation>
</message>
<message>
- <location line="+4"/>
- <source>Error: Transaction creation failed!</source>
- <translation>Fel: Transaktionen gick inte att skapa!</translation>
+ <location line="+3"/>
+ <source>Transaction creation failed!</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+15"/>
- <source>Are you sure you want to send?</source>
- <translation>Är du säker på att du vill skicka?</translation>
+ <location line="+4"/>
+ <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+9"/>
- <source>added as transaction fee</source>
+ <location line="+112"/>
+ <source>Warning: Invalid Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
- <source>Total Amount %1</source>
+ <location line="+21"/>
+ <source>(no label)</source>
+ <translation>(Ingen etikett)</translation>
+ </message>
+ <message>
+ <location line="-11"/>
+ <source>Warning: Unknown change address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+20"/>
- <source>Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
- <translation>Fel: Transaktionen avslogs. Detta kan hända om några av mynten i plånboken redan spenderats, t.ex om du använt en kopia av wallet.dat och mynt spenderades i kopian men inte markerats som spenderas här.</translation>
+ <location line="-366"/>
+ <source>Are you sure you want to send?</source>
+ <translation>Är du säker på att du vill skicka?</translation>
</message>
<message>
- <location line="+144"/>
+ <location line="+9"/>
+ <source>added as transaction fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+170"/>
<source>Payment request expired</source>
<translation type="unfinished"/>
</message>
@@ -1742,39 +2319,44 @@ Adress: %4
<context>
<name>SendCoinsEntry</name>
<message>
- <location filename="../forms/sendcoinsentry.ui" line="+33"/>
- <location line="+585"/>
+ <location filename="../forms/sendcoinsentry.ui" line="+131"/>
+ <location line="+521"/>
+ <location line="+536"/>
<source>A&amp;mount:</source>
<translation>&amp;Belopp:</translation>
</message>
<message>
- <location line="-572"/>
- <location line="+585"/>
+ <location line="-1152"/>
<source>Pay &amp;To:</source>
<translation>Betala &amp;Till:</translation>
</message>
<message>
- <location line="-551"/>
+ <location line="+18"/>
<source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>Adressen som betalningen skall skickas till (t.ex. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location filename="../sendcoinsentry.cpp" line="+28"/>
+ <location filename="../sendcoinsentry.cpp" line="+30"/>
<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>
<message>
- <location filename="../forms/sendcoinsentry.ui" line="-18"/>
+ <location filename="../forms/sendcoinsentry.ui" line="+57"/>
<source>&amp;Label:</source>
<translation>&amp;Etikett:</translation>
</message>
<message>
- <location line="+28"/>
+ <location line="-50"/>
<source>Choose previously used address</source>
<translation>Välj tidigare använda adresser</translation>
</message>
<message>
- <location line="+10"/>
+ <location line="-40"/>
+ <source>This is a normal payment.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+50"/>
<source>Alt+A</source>
<translation>Alt+A</translation>
</message>
@@ -1790,16 +2372,45 @@ Adress: %4
</message>
<message>
<location line="+7"/>
- <source>Remove this recipient</source>
- <translation>Ta bort denna mottagare</translation>
+ <location line="+524"/>
+ <location line="+536"/>
+ <source>Remove this entry</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="-1008"/>
+ <source>Message:</source>
+ <translation>Meddelande:</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+958"/>
+ <source>This is a verified payment request.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-991"/>
<source>Enter a label for this address to add it to the list of used addresses</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+465"/>
+ <location line="+459"/>
+ <source>This is an unverified payment request.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+18"/>
+ <location line="+532"/>
+ <source>Pay To:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-498"/>
+ <location line="+536"/>
<source>Memo:</source>
<translation type="unfinished"/>
</message>
@@ -1810,6 +2421,19 @@ Adress: %4
</message>
</context>
<context>
+ <name>ShutdownWindow</name>
+ <message>
+ <location filename="../utilitydialog.cpp" line="+48"/>
+ <source>Bitcoin Core is shutting down...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Do not shut down the computer until this window disappears.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>SignVerifyMessageDialog</name>
<message>
<location filename="../forms/signverifymessagedialog.ui" line="+14"/>
@@ -1817,7 +2441,7 @@ Adress: %4
<translation>Signaturer - Signera / Verifiera ett Meddelande</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+10"/>
<source>&amp;Sign Message</source>
<translation>&amp;Signera Meddelande</translation>
</message>
@@ -1920,7 +2544,7 @@ Adress: %4
<translation>Rensa alla fält</translation>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+27"/>
+ <location filename="../signverifymessagedialog.cpp" line="+29"/>
<location line="+3"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>Ange en Bitcoin-adress (t.ex. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
@@ -1936,7 +2560,7 @@ Adress: %4
<translation>Ange Bitcoin-signatur</translation>
</message>
<message>
- <location line="+85"/>
+ <location line="+84"/>
<location line="+81"/>
<source>The entered address is invalid.</source>
<translation>Den angivna adressen är ogiltig.</translation>
@@ -2005,9 +2629,14 @@ Adress: %4
<context>
<name>SplashScreen</name>
<message>
- <location filename="../splashscreen.cpp" line="+23"/>
- <source>The Bitcoin developers</source>
- <translation>Bitcoin-utvecklarna</translation>
+ <location filename="../splashscreen.cpp" line="+28"/>
+ <source>Bitcoin Core</source>
+ <translation>Bitcoin Kärna</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>The Bitcoin Core developers</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
@@ -2018,7 +2647,7 @@ Adress: %4
<context>
<name>TrafficGraphWidget</name>
<message>
- <location filename="../trafficgraphwidget.cpp" line="+75"/>
+ <location filename="../trafficgraphwidget.cpp" line="+79"/>
<source>KB/s</source>
<translation>KB/s</translation>
</message>
@@ -2026,7 +2655,7 @@ Adress: %4
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="+22"/>
+ <location filename="../transactiondesc.cpp" line="+28"/>
<source>Open until %1</source>
<translation>Öppet till %1</translation>
</message>
@@ -2099,12 +2728,12 @@ Adress: %4
<location line="+12"/>
<location line="+45"/>
<location line="+17"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Credit</source>
<translation>Kredit</translation>
</message>
<message numerus="yes">
- <location line="-120"/>
+ <location line="-125"/>
<source>matures in %n more block(s)</source>
<translation><numerusform>mognar om %n block</numerusform><numerusform>mognar om %n fler block</numerusform></translation>
</message>
@@ -2117,12 +2746,12 @@ Adress: %4
<location line="+44"/>
<location line="+8"/>
<location line="+15"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Debit</source>
<translation>Belasta</translation>
</message>
<message>
- <location line="-57"/>
+ <location line="-62"/>
<source>Transaction fee</source>
<translation>Transaktionsavgift</translation>
</message>
@@ -2133,11 +2762,12 @@ Adress: %4
</message>
<message>
<location line="+6"/>
+ <location line="+9"/>
<source>Message</source>
<translation>Meddelande</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="-7"/>
<source>Comment</source>
<translation>Kommentar</translation>
</message>
@@ -2147,7 +2777,7 @@ Adress: %4
<translation>Transaktions-ID</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+18"/>
<source>Merchant</source>
<translation type="unfinished"/>
</message>
@@ -2187,7 +2817,7 @@ Adress: %4
<translation>falsk</translation>
</message>
<message>
- <location line="-227"/>
+ <location line="-232"/>
<source>, has not been successfully broadcast yet</source>
<translation>, har inte lyckats skickas ännu</translation>
</message>
@@ -2218,7 +2848,7 @@ Adress: %4
<context>
<name>TransactionTableModel</name>
<message>
- <location filename="../transactiontablemodel.cpp" line="+227"/>
+ <location filename="../transactiontablemodel.cpp" line="+234"/>
<source>Date</source>
<translation>Datum</translation>
</message>
@@ -2237,8 +2867,13 @@ Adress: %4
<source>Amount</source>
<translation>Mängd</translation>
</message>
+ <message>
+ <location line="+59"/>
+ <source>Immature (%1 confirmations, will be available after %2)</source>
+ <translation type="unfinished"/>
+ </message>
<message numerus="yes">
- <location line="+57"/>
+ <location line="+16"/>
<source>Open for %n more block(s)</source>
<translation><numerusform>Öppet för %n mer block</numerusform><numerusform>Öppet för %n mer block</numerusform></translation>
</message>
@@ -2258,17 +2893,13 @@ Adress: %4
<translation>Obekräftad (%1 av %2 bekräftelser)</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="-22"/>
+ <location line="+25"/>
<source>Confirmed (%1 confirmations)</source>
<translation>Bekräftad (%1 bekräftelser)</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>Genererade balansen kommer att finnas tillgänglig när den mognar om %n mer block</numerusform><numerusform>Genererade balansen kommer att finnas tillgänglig när den mognar om %n fler block</numerusform></translation>
- </message>
<message>
- <location line="+5"/>
+ <location line="-22"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation>Det här blocket togs inte emot av några andra noder och kommer antagligen inte att bli godkänt.</translation>
</message>
@@ -2278,7 +2909,7 @@ Adress: %4
<translation>Genererad men inte accepterad</translation>
</message>
<message>
- <location line="+43"/>
+ <location line="+62"/>
<source>Received with</source>
<translation>Mottagen med</translation>
</message>
@@ -2336,7 +2967,7 @@ Adress: %4
<context>
<name>TransactionView</name>
<message>
- <location filename="../transactionview.cpp" line="+52"/>
+ <location filename="../transactionview.cpp" line="+57"/>
<location line="+16"/>
<source>All</source>
<translation>Alla</translation>
@@ -2397,12 +3028,12 @@ Adress: %4
<translation>Övriga</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+6"/>
<source>Enter address or label to search</source>
<translation>Sök efter adress eller etikett </translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+6"/>
<source>Min amount</source>
<translation>Minsta mängd</translation>
</message>
@@ -2437,17 +3068,37 @@ Adress: %4
<translation>Visa transaktionsdetaljer</translation>
</message>
<message>
- <location line="+143"/>
- <source>Export Transaction Data</source>
- <translation>Exportera Transaktionsdata</translation>
+ <location line="+142"/>
+ <source>Export Transaction History</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="+19"/>
+ <source>Exporting Failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>There was an error trying to save the transaction history to %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Exporting Successful</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The transaction history was successfully saved to %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-22"/>
<source>Comma separated file (*.csv)</source>
<translation>Kommaseparerad fil (*. csv)</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+9"/>
<source>Confirmed</source>
<translation>Bekräftad</translation>
</message>
@@ -2482,17 +3133,7 @@ Adress: %4
<translation>ID</translation>
</message>
<message>
- <location line="+4"/>
- <source>Error exporting</source>
- <translation>Fel vid export</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation>Kunde inte skriva till filen %1.</translation>
- </message>
- <message>
- <location line="+100"/>
+ <location line="+107"/>
<source>Range:</source>
<translation>Intervall:</translation>
</message>
@@ -2503,9 +3144,17 @@ Adress: %4
</message>
</context>
<context>
+ <name>WalletFrame</name>
+ <message>
+ <location filename="../walletframe.cpp" line="+26"/>
+ <source>No wallet has been loaded.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>WalletModel</name>
<message>
- <location filename="../walletmodel.cpp" line="+218"/>
+ <location filename="../walletmodel.cpp" line="+245"/>
<source>Send Coins</source>
<translation>Skicka pengar</translation>
</message>
@@ -2513,7 +3162,7 @@ Adress: %4
<context>
<name>WalletView</name>
<message>
- <location filename="../walletview.cpp" line="+46"/>
+ <location filename="../walletview.cpp" line="+43"/>
<source>&amp;Export</source>
<translation>&amp;Exportera</translation>
</message>
@@ -2523,65 +3172,60 @@ Adress: %4
<translation>Exportera informationen i den nuvarande fliken till en fil</translation>
</message>
<message>
- <location line="+183"/>
+ <location line="+181"/>
<source>Backup Wallet</source>
<translation>Säkerhetskopiera Plånbok</translation>
</message>
<message>
- <location line="+0"/>
+ <location line="+1"/>
<source>Wallet Data (*.dat)</source>
<translation>Plånboks-data (*.dat)</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="+6"/>
<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>
+ <source>There was an error trying to save the wallet data to %1.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+4"/>
- <source>Backup Successful</source>
- <translation>Säkerhetskopiering lyckades</translation>
+ <source>The wallet data was successfully saved to %1.</source>
+ <translation type="unfinished"/>
</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>
+ <source>Backup Successful</source>
+ <translation>Säkerhetskopiering lyckades</translation>
</message>
</context>
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+102"/>
- <source>Bitcoin version</source>
- <translation>Bitcoin version</translation>
- </message>
- <message>
- <location line="+107"/>
+ <location filename="../bitcoinstrings.cpp" line="+221"/>
<source>Usage:</source>
<translation>Användning:</translation>
</message>
<message>
- <location line="-55"/>
+ <location line="-54"/>
<source>List commands</source>
<translation>Lista kommandon</translation>
</message>
<message>
- <location line="-13"/>
+ <location line="-14"/>
<source>Get help for a command</source>
<translation>Få hjälp med ett kommando</translation>
</message>
<message>
- <location line="+25"/>
+ <location line="+26"/>
<source>Options:</source>
<translation>Inställningar:</translation>
</message>
<message>
- <location line="+24"/>
+ <location line="+22"/>
<source>Specify configuration file (default: bitcoin.conf)</source>
<translation>Ange konfigurationsfil (förvalt: bitcoin.conf)</translation>
</message>
@@ -2601,7 +3245,7 @@ Adress: %4
<translation>Sätt databas cache storleken i megabyte (förvalt: 25)</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-26"/>
<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>
@@ -2611,7 +3255,7 @@ Adress: %4
<translation>Ha som mest &lt;n&gt; anslutningar till andra klienter (förvalt: 125)</translation>
</message>
<message>
- <location line="-49"/>
+ <location line="-51"/>
<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>
@@ -2621,37 +3265,37 @@ Adress: %4
<translation>Ange din egen publika adress</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<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="-142"/>
+ <location line="-148"/>
<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="-33"/>
+ <location line="-36"/>
<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="+31"/>
+ <location line="+34"/>
<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="+40"/>
+ <location line="+45"/>
<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="+79"/>
+ <location line="+80"/>
<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="+40"/>
+ <location line="+39"/>
<source>Use the test network</source>
<translation>Använd testnätverket</translation>
</message>
@@ -2661,7 +3305,7 @@ Adress: %4
<translation>Acceptera anslutningar utifrån (förvalt: 1 om ingen -proxy eller -connect)</translation>
</message>
<message>
- <location line="-87"/>
+ <location line="-95"/>
<source>%s, you must set a rpcpassword in the configuration file:
%s
It is recommended you use the following random password:
@@ -2712,6 +3356,11 @@ till exempel: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo
</message>
<message>
<location line="+4"/>
+ <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</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>Fel: Transaktionen avslogs! Detta kan hända om några av mynten i plånboken redan spenderats, t.ex om du använt en kopia av wallet.dat och mynt spenderades i kopian men inte markerats som spenderas här.</translation>
</message>
@@ -2726,17 +3375,17 @@ till exempel: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo
<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="+6"/>
+ <location line="+18"/>
<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>
<message>
<location line="+5"/>
+ <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
<source>Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source>
<translation>Varning: -paytxfee är satt väldigt hög! Detta är avgiften du kommer betala för varje transaktion.</translation>
</message>
@@ -2766,17 +3415,27 @@ till exempel: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo
<translation>Varning: wallet.dat korrupt, datan har räddats! Den ursprungliga wallet.dat har sparas som wallet.{timestamp}.bak i %s; om ditt saldo eller transaktioner är felaktiga ska du återställa från en säkerhetskopia.</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="+9"/>
+ <source>&lt;category&gt; can be:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
<source>Attempt to recover private keys from a corrupt wallet.dat</source>
<translation>Försök att rädda de privata nycklarna från en korrupt wallet.dat</translation>
</message>
<message>
<location line="+1"/>
+ <source>Bitcoin Core Daemon</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Bitcoin RPC client version</source>
<translation>Bitcoin RPC-klient version</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
<source>Block creation options:</source>
<translation>Block skapande inställningar:</translation>
</message>
@@ -2786,7 +3445,12 @@ till exempel: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo
<translation>Koppla enbart upp till den/de specificerade noden/noder</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
+ <source>Connect through SOCKS proxy</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect to JSON-RPC on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation type="unfinished"/>
</message>
@@ -2802,6 +3466,11 @@ till exempel: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo
</message>
<message>
<location line="+1"/>
+ <source>Do not load the wallet and disable wallet RPC calls</source>
+ <translation type="unfinished"/>
+ </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>
@@ -2896,7 +3565,12 @@ till exempel: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo
<translation>Misslyckades att skriva ångradata</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
+ <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="+1"/>
<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>
@@ -2916,6 +3590,11 @@ till exempel: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo
<translation>Hur grundlig blockverifikationen är (0-4, förvalt: 3)</translation>
</message>
<message>
+ <location line="+1"/>
+ <source>If &lt;category&gt; is not supplied, output all debugging information.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+2"/>
<source>Incorrect or no genesis block found. Wrong datadir for network?</source>
<translation>Felaktig eller inget genesisblock hittades. Fel datadir för nätverket?</translation>
@@ -2931,17 +3610,37 @@ till exempel: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo
<translation>Inte tillräckligt med filbeskrivningar tillgängliga.</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+5"/>
+ <source>Prepend debug output with timestamp (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>RPC client options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<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="+6"/>
+ <location line="+5"/>
+ <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Send command to Bitcoin server</source>
<translation>Skicka commando till Bitcoinserver</translation>
</message>
<message>
- <location line="+10"/>
+ <location line="+7"/>
+ <source>Set maximum block size in bytes (default: %d)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Set the number of threads to service RPC calls (default: 4)</source>
<translation>Ange antalet trådar för att hantera RPC anrop (standard: 4)</translation>
</message>
@@ -2956,12 +3655,17 @@ till exempel: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo
<translation>Starta Bitcoinserver</translation>
</message>
<message>
- <location line="+12"/>
+ <location line="+3"/>
+ <source>This is intended for regression testing tools and app development.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Usage (deprecated, use bitcoin-cli):</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+8"/>
+ <location line="+7"/>
<source>Verifying blocks...</source>
<translation>Verifierar block...</translation>
</message>
@@ -2972,31 +3676,56 @@ till exempel: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo
</message>
<message>
<location line="+1"/>
+ <source>Wait for RPC server to start</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Wallet %s resides outside data directory %s</source>
<translation>Plånbok %s ligger utanför datakatalogen %s</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+2"/>
+ <source>Wallet options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>You need to rebuild the database using -reindex to change -txindex</source>
<translation>Du måste återskapa databasen med -reindex för att ändra -txindex</translation>
</message>
<message>
- <location line="-78"/>
+ <location line="-79"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation>Importerar block från extern blk000??.dat fil</translation>
</message>
<message>
- <location line="-98"/>
+ <location line="-105"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation>Exekvera kommando när ett relevant meddelande är mottagen eller när vi ser en väldigt lång förgrening (%s i cmd är utbytt med ett meddelande)</translation>
</message>
<message>
- <location line="+17"/>
+ <location line="+14"/>
+ <source>Output debugging information (default: 0, supplying &lt;category&gt; is optional)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
<translation>Ange antalet skriptkontrolltrådar (upp till 16, 0 = auto, &lt;0 = lämna så många kärnor lediga, förval: 0)</translation>
</message>
<message>
- <location line="+83"/>
+ <location line="+89"/>
<source>Information</source>
<translation>Information</translation>
</message>
@@ -3036,47 +3765,17 @@ till exempel: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo
<translation>Anslut enbart till noder i nätverket &lt;net&gt; (IPv4, IPv6 eller Tor)</translation>
</message>
<message>
- <location line="+2"/>
- <source>Output extra debugging information. Implies all other -debug* options</source>
- <translation>Skriv ut extra felsökningsinformation. Gäller alla andra -debug* alternativ</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Output extra network debugging information</source>
- <translation>Skriv ut extra felsökningsinformation om nätverk</translation>
- </message>
- <message>
- <location line="+2"/>
- <source>Prepend debug output with timestamp</source>
- <translation>Skriv ut tid i felsökningsinformationen</translation>
- </message>
- <message>
- <location line="+5"/>
+ <location line="+9"/>
<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>
<message>
- <location line="+1"/>
- <source>Select the version of socks proxy to use (4-5, default: 5)</source>
- <translation>Välj socks-proxy version att använda (4-5, förvalt: 5)</translation>
- </message>
- <message>
- <location line="+3"/>
+ <location line="+4"/>
<source>Send trace/debug info to console instead of debug.log file</source>
<translation>Skicka trace-/debuginformation till terminalen istället för till debug.log</translation>
</message>
<message>
- <location line="+1"/>
- <source>Send trace/debug info to debugger</source>
- <translation>Skicka trace-/debuginformation till debugger</translation>
- </message>
- <message>
- <location line="+5"/>
- <source>Set maximum block size in bytes (default: 250000)</source>
- <translation>Sätt maximal blockstorlek i byte (förvalt: 250000)</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+6"/>
<source>Set minimum block size in bytes (default: 0)</source>
<translation>Sätt minsta blockstorlek i byte (förvalt: 0)</translation>
</message>
@@ -3101,7 +3800,7 @@ till exempel: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo
<translation>Systemfel:</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Transaction amount too small</source>
<translation>Transaktions belopp för liten</translation>
</message>
@@ -3126,32 +3825,32 @@ till exempel: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo
<translation>Använd UPnP för att mappa den lyssnande porten (förvalt: 1 under lyssning)</translation>
</message>
<message>
- <location line="+1"/>
- <source>Use proxy to reach tor hidden services (default: same as -proxy)</source>
- <translation>Använd en proxy för att nå tor (förvalt: samma som -proxy)</translation>
- </message>
- <message>
<location line="+2"/>
<source>Username for JSON-RPC connections</source>
<translation>Användarnamn för JSON-RPC-anslutningar</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+7"/>
<source>Warning</source>
<translation>Varning</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Warning: This version is obsolete, upgrade required!</source>
<translation>Varning: denna version är föråldrad, uppgradering krävs!</translation>
</message>
<message>
<location line="+2"/>
+ <source>version</source>
+ <translation>version</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="-54"/>
+ <location line="-58"/>
<source>Password for JSON-RPC connections</source>
<translation>Lösenord för JSON-RPC-anslutningar</translation>
</message>
@@ -3161,27 +3860,27 @@ till exempel: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo
<translation>Tillåt JSON-RPC-anslutningar från specifika IP-adresser</translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<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="-126"/>
+ <location line="-132"/>
<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="+155"/>
+ <location line="+161"/>
<source>Upgrade wallet to latest format</source>
<translation>Uppgradera plånboken till senaste formatet</translation>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<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>
<message>
- <location line="-12"/>
+ <location line="-11"/>
<source>Rescan the block chain for missing wallet transactions</source>
<translation>Sök i blockkedjan efter saknade plånboks transaktioner</translation>
</message>
@@ -3191,7 +3890,7 @@ till exempel: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo
<translation>Använd OpenSSL (https) för JSON-RPC-anslutningar</translation>
</message>
<message>
- <location line="-29"/>
+ <location line="-30"/>
<source>Server certificate file (default: server.cert)</source>
<translation>Serverns certifikatfil (förvalt: server.cert)</translation>
</message>
@@ -3206,27 +3905,22 @@ till exempel: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo
<translation>Det här hjälp medelandet</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Unable to bind to %s on this computer (bind returned error %d, %s)</source>
<translation>Det går inte att binda till %s på den här datorn (bind returnerade felmeddelande %d, %s)</translation>
</message>
<message>
- <location line="-95"/>
- <source>Connect through socks proxy</source>
- <translation>Anslut genom socks-proxy</translation>
- </message>
- <message>
- <location line="-11"/>
+ <location line="-107"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation>Tillåt DNS-sökningar för -addnode, -seednode och -connect</translation>
</message>
<message>
- <location line="+58"/>
+ <location line="+60"/>
<source>Loading addresses...</source>
<translation>Laddar adresser...</translation>
</message>
<message>
- <location line="-36"/>
+ <location line="-37"/>
<source>Error loading wallet.dat: Wallet corrupted</source>
<translation>Fel vid inläsningen av wallet.dat: Plånboken är skadad</translation>
</message>
@@ -3246,12 +3940,12 @@ till exempel: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo
<translation>Fel vid inläsning av plånboksfilen wallet.dat</translation>
</message>
<message>
- <location line="+30"/>
+ <location line="+31"/>
<source>Invalid -proxy address: &apos;%s&apos;</source>
<translation>Ogiltig -proxy adress: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+57"/>
+ <location line="+56"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation>Okänt nätverk som anges i -onlynet: &apos;%s&apos;</translation>
</message>
@@ -3261,7 +3955,7 @@ till exempel: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo
<translation>Okänd -socks proxy version begärd: %i</translation>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation>Kan inte matcha -bind adress: &apos;%s&apos;</translation>
</message>
@@ -3271,7 +3965,7 @@ till exempel: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo
<translation>Kan inte matcha -externalip adress: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+46"/>
+ <location line="+48"/>
<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>
@@ -3291,27 +3985,22 @@ till exempel: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo
<translation>Laddar blockindex...</translation>
</message>
<message>
- <location line="-60"/>
+ <location line="-62"/>
<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>
<message>
- <location line="-28"/>
+ <location line="-32"/>
<source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source>
<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="+69"/>
- <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="+20"/>
+ <location line="+95"/>
<source>Loading wallet...</source>
<translation>Laddar plånbok...</translation>
</message>
<message>
- <location line="-54"/>
+ <location line="-56"/>
<source>Cannot downgrade wallet</source>
<translation>Kan inte nedgradera plånboken</translation>
</message>
@@ -3321,7 +4010,7 @@ till exempel: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo
<translation>Kan inte skriva standardadress</translation>
</message>
<message>
- <location line="+66"/>
+ <location line="+67"/>
<source>Rescanning...</source>
<translation>Söker igen...</translation>
</message>
@@ -3341,7 +4030,7 @@ till exempel: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo
<translation>Fel</translation>
</message>
<message>
- <location line="-33"/>
+ <location line="-35"/>
<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 3e9fb808f0..9ddaf0ead7 100644
--- a/src/qt/locale/bitcoin_th_TH.ts
+++ b/src/qt/locale/bitcoin_th_TH.ts
@@ -3,13 +3,13 @@
<name>AboutDialog</name>
<message>
<location filename="../forms/aboutdialog.ui" line="+14"/>
- <source>About Bitcoin</source>
- <translation>เà¸à¸µà¹ˆà¸¢à¸§à¸à¸±à¸š บิตคอย์น</translation>
+ <source>About Bitcoin Core</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+39"/>
- <source>&lt;b&gt;Bitcoin&lt;/b&gt; version</source>
- <translation>&lt;b&gt;บิตคอย์น&lt;b&gt;รุ่น</translation>
+ <source>&lt;b&gt;Bitcoin Core&lt;/b&gt; version</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+57"/>
@@ -22,13 +22,13 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location filename="../aboutdialog.cpp" line="+14"/>
+ <location filename="../utilitydialog.cpp" line="+29"/>
<source>Copyright</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+0"/>
- <source>The Bitcoin developers</source>
+ <source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
</context>
@@ -65,7 +65,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location filename="../addressbookpage.cpp" line="+72"/>
+ <location filename="../addressbookpage.cpp" line="+74"/>
<source>&amp;Copy Address</source>
<translation type="unfinished"/>
</message>
@@ -135,7 +135,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+197"/>
+ <location line="+194"/>
<source>Export Address List</source>
<translation type="unfinished"/>
</message>
@@ -146,19 +146,19 @@ This product includes software developed by the OpenSSL Project for use in the O
</message>
<message>
<location line="+13"/>
- <source>Error exporting</source>
- <translation>ส่งออà¸à¸œà¸´à¸”พลาด</translation>
+ <source>Exporting Failed</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation>ไม่สามารถเขียนไปยังไฟล์ %1</translation>
+ <location line="+1"/>
+ <source>There was an error trying to save the address list to %1.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<name>AddressTableModel</name>
<message>
- <location filename="../addresstablemodel.cpp" line="+164"/>
+ <location filename="../addresstablemodel.cpp" line="+168"/>
<source>Label</source>
<translation>ชื่อ</translation>
</message>
@@ -196,7 +196,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>à¸à¸£à¸¸à¸“าà¸à¸£à¸­à¸à¸£à¸«à¸±à¸ªà¸œà¹ˆà¸²à¸™à¹ƒà¸«à¸¡à¹ˆà¸­à¸µà¸à¸„รั้งหนึ่ง</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="+34"/>
+ <location filename="../askpassphrasedialog.cpp" line="+40"/>
<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>
@@ -317,22 +317,27 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+250"/>
+ <location filename="../bitcoingui.cpp" line="+295"/>
<source>Sign &amp;message...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+254"/>
+ <location line="+335"/>
<source>Synchronizing with network...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-324"/>
+ <location line="-407"/>
<source>&amp;Overview</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="-137"/>
+ <source>Node</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+138"/>
<source>Show general overview of wallet</source>
<translation type="unfinished"/>
</message>
@@ -347,7 +352,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>E&amp;xit</source>
<translation type="unfinished"/>
</message>
@@ -393,7 +398,22 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+259"/>
+ <location line="+10"/>
+ <source>&amp;Sending addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Receiving addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open &amp;URI...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+325"/>
<source>Importing blocks from disk...</source>
<translation type="unfinished"/>
</message>
@@ -403,12 +423,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="-322"/>
+ <location line="-405"/>
<source>Send coins to a Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+47"/>
+ <location line="+49"/>
<source>Modify configuration options for Bitcoin</source>
<translation type="unfinished"/>
</message>
@@ -438,20 +458,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="-180"/>
- <location line="+6"/>
- <location line="+513"/>
+ <location line="+430"/>
<source>Bitcoin</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-519"/>
- <location line="+6"/>
+ <location line="-643"/>
<source>Wallet</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+109"/>
+ <location line="+146"/>
<source>&amp;Send</source>
<translation type="unfinished"/>
</message>
@@ -461,13 +478,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+28"/>
- <location line="+2"/>
- <source>&amp;About Bitcoin</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+14"/>
+ <location line="+46"/>
<location line="+2"/>
<source>&amp;Show / Hide</source>
<translation type="unfinished"/>
@@ -493,64 +504,80 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+35"/>
+ <location line="+48"/>
<source>&amp;File</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
+ <location line="+14"/>
<source>&amp;Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>&amp;Help</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+9"/>
+ <location line="+15"/>
<source>Tabs toolbar</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-235"/>
- <location line="+294"/>
+ <location line="-284"/>
+ <location line="+376"/>
<source>[testnet]</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-177"/>
+ <location line="-401"/>
+ <source>Bitcoin Core</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+163"/>
<source>Request payments (generates QR codes and bitcoin: URIs)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+63"/>
- <source>&amp;Used sending addresses...</source>
+ <location line="+29"/>
+ <location line="+2"/>
+ <source>&amp;About Bitcoin Core</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="+35"/>
<source>Show the list of used sending addresses and labels</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Used &amp;receiving addresses...</source>
+ <location line="+2"/>
+ <source>Show the list of used receiving addresses and labels</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open a bitcoin: URI or payment request</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Command-line options</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
- <source>Show the list of used receiving addresses and labels</source>
+ <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+106"/>
+ <location line="+159"/>
<location line="+5"/>
<source>Bitcoin client</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+120"/>
+ <location line="+142"/>
<source>%n active connection(s) to Bitcoin network</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
@@ -570,7 +597,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+20"/>
+ <location line="+23"/>
<source>%n hour(s)</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
@@ -590,7 +617,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
+ <location line="+21"/>
<source>Last received block was generated %1 ago.</source>
<translation type="unfinished"/>
</message>
@@ -615,27 +642,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+77"/>
- <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="-152"/>
+ <location line="-85"/>
<source>Up to date</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Catching up...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+124"/>
- <source>Confirm transaction fee</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+130"/>
<source>Sent transaction</source>
<translation type="unfinished"/>
</message>
@@ -654,17 +671,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+34"/>
- <source>URI handling</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+0"/>
- <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="+45"/>
+ <location line="+69"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation type="unfinished"/>
</message>
@@ -674,7 +681,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+110"/>
+ <location filename="../bitcoin.cpp" line="+438"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation type="unfinished"/>
</message>
@@ -682,12 +689,304 @@ Address: %4
<context>
<name>ClientModel</name>
<message>
- <location filename="../clientmodel.cpp" line="+115"/>
+ <location filename="../clientmodel.cpp" line="+119"/>
<source>Network Alert</source>
<translation type="unfinished"/>
</message>
</context>
<context>
+ <name>CoinControlDialog</name>
+ <message>
+ <location filename="../forms/coincontroldialog.ui" line="+14"/>
+ <source>Coin Control Address Selection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>Quantity:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Bytes:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>Amount:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Priority:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Low Output:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>After Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Change:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+63"/>
+ <source>(un)select all</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Tree mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>List mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>Amount</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Address</source>
+ <translation>ที่อยู่</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Date</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Confirmations</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Confirmed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../coincontroldialog.cpp" line="+42"/>
+ <source>Copy address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy label</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+26"/>
+ <source>Copy amount</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-25"/>
+ <source>Copy transaction ID</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Lock unspent</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Unlock unspent</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+22"/>
+ <source>Copy quantity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Copy fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy after fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy bytes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy low output</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy change</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+323"/>
+ <source>highest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>higher</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>high</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>medium-high</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>medium</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>low-medium</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>low</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>lower</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>lowest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>(%1 locked)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+140"/>
+ <source>Dust</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>yes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>no</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>This label turns red, if the transaction size is greater than 1000 bytes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+5"/>
+ <source>This means a fee of at least %1 per kB is required.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-4"/>
+ <source>Can vary +/- 1 byte per input.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Transactions with higher priority are more likely to get included into a block.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>This label turns red, if the priority is smaller than &quot;medium&quot;.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>This label turns red, if any recipient receives an amount smaller than %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+4"/>
+ <source>This means a fee of at least %1 is required.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-3"/>
+ <source>Amounts below 0.546 times the minimum relay fee are shown as dust.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>This label turns red, if the change is smaller than %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
+ <location line="+66"/>
+ <source>(no label)</source>
+ <translation>(ไม่มีชื่อ)</translation>
+ </message>
+ <message>
+ <location line="-9"/>
+ <source>change from %1 (%2)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>(change)</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>EditAddressDialog</name>
<message>
<location filename="../forms/editaddressdialog.ui" line="+14"/>
@@ -715,7 +1014,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+21"/>
+ <location filename="../editaddressdialog.cpp" line="+28"/>
<source>New receiving address</source>
<translation type="unfinished"/>
</message>
@@ -758,7 +1057,7 @@ Address: %4
<context>
<name>FreespaceChecker</name>
<message>
- <location filename="../intro.cpp" line="+61"/>
+ <location filename="../intro.cpp" line="+65"/>
<source>A new data directory will be created.</source>
<translation type="unfinished"/>
</message>
@@ -784,15 +1083,19 @@ Address: %4
</message>
</context>
<context>
- <name>GUIUtil::HelpMessageBox</name>
+ <name>HelpMessageDialog</name>
<message>
- <location filename="../guiutil.cpp" line="+558"/>
- <location line="+13"/>
- <source>Bitcoin-Qt</source>
+ <location filename="../forms/helpmessagedialog.ui" line="+19"/>
+ <source>Bitcoin Core - Command-line options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-13"/>
+ <location filename="../utilitydialog.cpp" line="+38"/>
+ <source>Bitcoin Core</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
<source>version</source>
<translation type="unfinished"/>
</message>
@@ -841,17 +1144,17 @@ Address: %4
</message>
<message>
<location line="+9"/>
- <source>Welcome to Bitcoin-Qt.</source>
+ <source>Welcome to Bitcoin Core.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+26"/>
- <source>As this is the first time the program is launched, you can choose where Bitcoin-Qt will store its data.</source>
+ <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+10"/>
- <source>Bitcoin-Qt will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
+ <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -865,7 +1168,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../intro.cpp" line="+105"/>
+ <location filename="../intro.cpp" line="+85"/>
+ <source>Bitcoin</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error: Specified data directory &quot;%1&quot; can not be created.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+19"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
@@ -881,6 +1194,34 @@ Address: %4
</message>
</context>
<context>
+ <name>OpenURIDialog</name>
+ <message>
+ <location filename="../forms/openuridialog.ui" line="+14"/>
+ <source>Open URI</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Open payment request from URI or file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>URI:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Select payment request file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../openuridialog.cpp" line="+47"/>
+ <source>Select payment request file to open</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OptionsDialog</name>
<message>
<location filename="../forms/optionsdialog.ui" line="+14"/>
@@ -888,7 +1229,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+13"/>
<source>&amp;Main</source>
<translation type="unfinished"/>
</message>
@@ -913,57 +1254,87 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+35"/>
- <source>Reset all client options to default.</source>
+ <location line="+9"/>
+ <source>Size of &amp;database cache</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>&amp;Reset Options</source>
+ <location line="+13"/>
+ <source>Set database cache size in megabytes (default: 25)</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+13"/>
- <source>&amp;Network</source>
+ <source>MB</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>
+ <location line="+27"/>
+ <source>Number of script &amp;verification threads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Connect to the Bitcoin network through a SOCKS proxy.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
- <source>Map port using &amp;UPnP</source>
+ <source>&amp;Connect through SOCKS proxy (default proxy):</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>
+ <location line="+34"/>
+ <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+224"/>
+ <source>Active command-line options that override above options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
+ <source>Reset all client options to default.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
- <source>&amp;Connect through SOCKS proxy:</source>
+ <source>&amp;Reset Options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+9"/>
- <source>Proxy &amp;IP:</source>
+ <location line="-323"/>
+ <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="+19"/>
- <source>IP address of the proxy (e.g. 127.0.0.1)</source>
+ <source>Proxy &amp;IP:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="+32"/>
<source>&amp;Port:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+19"/>
+ <location line="+25"/>
<source>Port of the proxy (e.g. 9050)</source>
<translation type="unfinished"/>
</message>
@@ -1038,7 +1409,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+71"/>
+ <location line="+7"/>
+ <source>Whether to show coin control features or not.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Display coin &amp;control features (experts only)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+136"/>
<source>&amp;OK</source>
<translation type="unfinished"/>
</message>
@@ -1048,44 +1429,38 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>&amp;Apply</source>
+ <location filename="../optionsdialog.cpp" line="+67"/>
+ <source>default</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+58"/>
- <source>default</source>
+ <location line="+57"/>
+ <source>none</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+130"/>
+ <location line="+75"/>
<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>
+ <location line="+29"/>
+ <source>Client restart required to activate changes.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
- <location line="+9"/>
- <source>Warning</source>
+ <location line="-29"/>
+ <source>Client will be shutdown, do you want to proceed?</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-9"/>
- <location line="+9"/>
- <source>This setting will take effect after restarting Bitcoin.</source>
+ <location line="+33"/>
+ <source>This change would require a client restart.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+29"/>
+ <location line="+34"/>
<source>The supplied proxy address is invalid.</source>
<translation type="unfinished"/>
</message>
@@ -1099,22 +1474,22 @@ Address: %4
</message>
<message>
<location line="+50"/>
- <location line="+202"/>
+ <location line="+231"/>
<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="-131"/>
+ <location line="-155"/>
<source>Unconfirmed:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-78"/>
+ <location line="-83"/>
<source>Wallet</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+49"/>
+ <location line="+51"/>
<source>Confirmed:</source>
<translation type="unfinished"/>
</message>
@@ -1124,12 +1499,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+29"/>
+ <location line="+32"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+16"/>
<source>Immature:</source>
<translation type="unfinished"/>
</message>
@@ -1139,7 +1514,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+16"/>
<source>Total:</source>
<translation type="unfinished"/>
</message>
@@ -1149,12 +1524,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+53"/>
+ <location line="+71"/>
<source>&lt;b&gt;Recent transactions&lt;/b&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../overviewpage.cpp" line="+116"/>
+ <location filename="../overviewpage.cpp" line="+120"/>
<location line="+1"/>
<source>out of sync</source>
<translation type="unfinished"/>
@@ -1163,7 +1538,8 @@ Address: %4
<context>
<name>PaymentServer</name>
<message>
- <location filename="../paymentserver.cpp" line="+392"/>
+ <location filename="../paymentserver.cpp" line="+403"/>
+ <location line="+13"/>
<source>URI handling</source>
<translation type="unfinished"/>
</message>
@@ -1173,45 +1549,82 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+69"/>
+ <location line="+96"/>
<source>Requested payment amount of %1 is too small (considered dust).</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
- <location line="+37"/>
+ <location line="-221"/>
+ <location line="+212"/>
+ <location line="+13"/>
+ <location line="+95"/>
+ <location line="+18"/>
+ <location line="+16"/>
<source>Payment request error</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="-353"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Net manager warning</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+1"/>
- <source>Insecure requests to custom payment scripts unsupported</source>
+ <source>Your active proxy doesn&apos;t support SOCKS5, which is required for payment requests via proxy.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+38"/>
+ <location line="+52"/>
+ <source>Payment request fetch URL is invalid: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Payment request file handling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Payment request file can not be read or processed! This can be caused by an invalid payment request file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+73"/>
+ <source>Unverified payment requests to custom payment scripts are unsupported.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+59"/>
<source>Refund from %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
+ <location line="+43"/>
<source>Error communicating with %1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+24"/>
+ <source>Payment request can not be parsed or processed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
<source>Bad response from server %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+32"/>
+ <location line="+33"/>
<source>Payment acknowledged</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-58"/>
- <location line="+30"/>
- <location line="+17"/>
+ <location line="-11"/>
<source>Network request error</source>
<translation type="unfinished"/>
</message>
@@ -1219,32 +1632,26 @@ Address: %4
<context>
<name>QObject</name>
<message>
- <location filename="../bitcoin.cpp" line="+114"/>
- <location line="+5"/>
- <location filename="../intro.cpp" line="-32"/>
+ <location filename="../bitcoin.cpp" line="+71"/>
+ <location line="+11"/>
<source>Bitcoin</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-4"/>
+ <location line="+1"/>
<source>Error: Specified data directory &quot;%1&quot; does not exist.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="-12"/>
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../intro.cpp" line="+1"/>
- <source>Error: Specified data directory &quot;%1&quot; can not be created.</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>QRImageWidget</name>
<message>
- <location filename="../receiverequestdialog.cpp" line="+32"/>
+ <location filename="../receiverequestdialog.cpp" line="+36"/>
<source>&amp;Save Image...</source>
<translation type="unfinished"/>
</message>
@@ -1260,7 +1667,7 @@ Address: %4
</message>
<message>
<location line="+0"/>
- <source>PNG Images (*.png)</source>
+ <source>PNG Image (*.png)</source>
<translation type="unfinished"/>
</message>
</context>
@@ -1278,15 +1685,16 @@ Address: %4
<location line="+23"/>
<location line="+23"/>
<location line="+36"/>
- <location line="+53"/>
+ <location line="+23"/>
+ <location line="+36"/>
<location line="+23"/>
<location line="+23"/>
- <location filename="../rpcconsole.cpp" line="+352"/>
+ <location filename="../rpcconsole.cpp" line="+359"/>
<source>N/A</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-217"/>
+ <location line="-223"/>
<source>Client version</source>
<translation type="unfinished"/>
</message>
@@ -1296,7 +1704,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+68"/>
+ <location line="-10"/>
+ <source>Debug window</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+25"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+53"/>
<source>Using OpenSSL version</source>
<translation type="unfinished"/>
</message>
@@ -1312,16 +1730,16 @@ Address: %4
</message>
<message>
<location line="+7"/>
- <source>Number of connections</source>
+ <source>Name</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+23"/>
- <source>On testnet</source>
+ <source>Number of connections</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+23"/>
+ <location line="+29"/>
<source>Block chain</source>
<translation type="unfinished"/>
</message>
@@ -1346,21 +1764,6 @@ Address: %4
<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"/>
@@ -1391,22 +1794,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-541"/>
+ <location line="-521"/>
<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"/>
+ <location line="+206"/>
<source>Debug log file</source>
<translation type="unfinished"/>
</message>
@@ -1416,7 +1809,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+102"/>
+ <location line="+76"/>
<source>Clear console</source>
<translation type="unfinished"/>
</message>
@@ -1436,7 +1829,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+128"/>
+ <location line="+122"/>
<source>%1 B</source>
<translation type="unfinished"/>
</message>
@@ -1474,48 +1867,48 @@ Address: %4
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+22"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
<source>&amp;Amount:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
- <source>The amount to request</source>
+ <location line="-13"/>
+ <source>&amp;Label:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>&amp;Label:</source>
+ <location line="-34"/>
+ <source>&amp;Message:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>The label to associate with the receiving address</source>
+ <location line="-17"/>
+ <source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>&amp;Message:</source>
+ <location line="+3"/>
+ <source>R&amp;euse an existing receiving address (not recommended)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>The message to attach to payment request</source>
+ <location line="+27"/>
+ <source>An optional label to associate with the new receiving address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
- <source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
+ <location line="+7"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>R&amp;euse an existing receiving address (not recommended)</source>
+ <location line="+7"/>
+ <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>Use this form to request payments. All fields are optional.</source>
+ <location line="+39"/>
+ <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1533,6 +1926,31 @@ Address: %4
<source>&amp;Request payment</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+47"/>
+ <source>Requested payments</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Show the selected request (does the same as double clicking an entry)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Show</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Remove the selected entries from the list</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Remove</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
@@ -1553,16 +1971,11 @@ Address: %4
</message>
<message>
<location line="+7"/>
- <source>&amp;Copy Image</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+7"/>
<source>&amp;Save Image...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../receiverequestdialog.cpp" line="+58"/>
+ <location filename="../receiverequestdialog.cpp" line="+56"/>
<source>Request payment to %1</source>
<translation type="unfinished"/>
</message>
@@ -1608,16 +2021,119 @@ Address: %4
</message>
</context>
<context>
+ <name>RecentRequestsTableModel</name>
+ <message>
+ <location filename="../recentrequeststablemodel.cpp" line="+24"/>
+ <source>Date</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Label</source>
+ <translation>ชื่อ</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Amount</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+38"/>
+ <source>(no label)</source>
+ <translation>(ไม่มีชื่อ)</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>(no message)</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+140"/>
- <location line="+213"/>
+ <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location line="+80"/>
<source>Send Coins</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+50"/>
+ <location line="+76"/>
+ <source>Coin Control Features</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Inputs...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>automatically selected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Insufficient funds!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+89"/>
+ <source>Quantity:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+35"/>
+ <source>Bytes:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Amount:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Priority:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Low Output:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>After Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Change:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+44"/>
+ <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Custom change address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+115"/>
<source>Send to multiple recipients at once</source>
<translation type="unfinished"/>
</message>
@@ -1642,12 +2158,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>123.456 BTC</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+31"/>
+ <location line="+41"/>
<source>Confirm the send action</source>
<translation type="unfinished"/>
</message>
@@ -1657,69 +2168,135 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-154"/>
+ <location filename="../sendcoinsdialog.cpp" line="-228"/>
<source>Confirm send coins</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-90"/>
+ <location line="-74"/>
<location line="+5"/>
<location line="+5"/>
+ <location line="+4"/>
<source>%1 to %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+26"/>
+ <location line="-136"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Copy quantity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy after fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy bytes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy low output</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy change</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+170"/>
+ <source>Total Amount %1 (= %2)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>or</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+202"/>
<source>The recipient address is not valid, please recheck.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The amount to pay must be larger than 0.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The amount exceeds your balance.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The total exceeds your balance when the %1 transaction fee is included.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+3"/>
<source>Duplicate address found, can only send to each address once per send operation.</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="+3"/>
+ <source>Transaction creation failed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+4"/>
- <source>Error: Transaction creation failed!</source>
+ <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+15"/>
- <source>Are you sure you want to send?</source>
+ <location line="+112"/>
+ <source>Warning: Invalid Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+9"/>
- <source>added as transaction fee</source>
+ <location line="+21"/>
+ <source>(no label)</source>
+ <translation>(ไม่มีชื่อ)</translation>
+ </message>
+ <message>
+ <location line="-11"/>
+ <source>Warning: Unknown change address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
- <source>Total Amount %1</source>
+ <location line="-366"/>
+ <source>Are you sure you want to send?</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+20"/>
- <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>
+ <location line="+9"/>
+ <source>added as transaction fee</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+144"/>
+ <location line="+170"/>
<source>Payment request expired</source>
<translation type="unfinished"/>
</message>
@@ -1732,39 +2309,44 @@ Address: %4
<context>
<name>SendCoinsEntry</name>
<message>
- <location filename="../forms/sendcoinsentry.ui" line="+33"/>
- <location line="+585"/>
+ <location filename="../forms/sendcoinsentry.ui" line="+131"/>
+ <location line="+521"/>
+ <location line="+536"/>
<source>A&amp;mount:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-572"/>
- <location line="+585"/>
+ <location line="-1152"/>
<source>Pay &amp;To:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-551"/>
+ <location line="+18"/>
<source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../sendcoinsentry.cpp" line="+28"/>
+ <location filename="../sendcoinsentry.cpp" line="+30"/>
<source>Enter a label for this address to add it to your address book</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../forms/sendcoinsentry.ui" line="-18"/>
+ <location filename="../forms/sendcoinsentry.ui" line="+57"/>
<source>&amp;Label:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+28"/>
+ <location line="-50"/>
<source>Choose previously used address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
+ <location line="-40"/>
+ <source>This is a normal payment.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+50"/>
<source>Alt+A</source>
<translation type="unfinished"/>
</message>
@@ -1780,16 +2362,45 @@ Address: %4
</message>
<message>
<location line="+7"/>
- <source>Remove this recipient</source>
+ <location line="+524"/>
+ <location line="+536"/>
+ <source>Remove this entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="-1008"/>
+ <source>Message:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+958"/>
+ <source>This is a verified payment request.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-991"/>
<source>Enter a label for this address to add it to the list of used addresses</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+465"/>
+ <location line="+459"/>
+ <source>This is an unverified payment request.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+18"/>
+ <location line="+532"/>
+ <source>Pay To:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-498"/>
+ <location line="+536"/>
<source>Memo:</source>
<translation type="unfinished"/>
</message>
@@ -1800,6 +2411,19 @@ Address: %4
</message>
</context>
<context>
+ <name>ShutdownWindow</name>
+ <message>
+ <location filename="../utilitydialog.cpp" line="+48"/>
+ <source>Bitcoin Core is shutting down...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Do not shut down the computer until this window disappears.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>SignVerifyMessageDialog</name>
<message>
<location filename="../forms/signverifymessagedialog.ui" line="+14"/>
@@ -1807,7 +2431,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+10"/>
<source>&amp;Sign Message</source>
<translation type="unfinished"/>
</message>
@@ -1910,7 +2534,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+27"/>
+ <location filename="../signverifymessagedialog.cpp" line="+29"/>
<location line="+3"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation type="unfinished"/>
@@ -1926,7 +2550,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+85"/>
+ <location line="+84"/>
<location line="+81"/>
<source>The entered address is invalid.</source>
<translation type="unfinished"/>
@@ -1995,8 +2619,13 @@ Address: %4
<context>
<name>SplashScreen</name>
<message>
- <location filename="../splashscreen.cpp" line="+23"/>
- <source>The Bitcoin developers</source>
+ <location filename="../splashscreen.cpp" line="+28"/>
+ <source>Bitcoin Core</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
<message>
@@ -2008,7 +2637,7 @@ Address: %4
<context>
<name>TrafficGraphWidget</name>
<message>
- <location filename="../trafficgraphwidget.cpp" line="+75"/>
+ <location filename="../trafficgraphwidget.cpp" line="+79"/>
<source>KB/s</source>
<translation type="unfinished"/>
</message>
@@ -2016,7 +2645,7 @@ Address: %4
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="+22"/>
+ <location filename="../transactiondesc.cpp" line="+28"/>
<source>Open until %1</source>
<translation type="unfinished"/>
</message>
@@ -2089,12 +2718,12 @@ Address: %4
<location line="+12"/>
<location line="+45"/>
<location line="+17"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Credit</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="-120"/>
+ <location line="-125"/>
<source>matures in %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
@@ -2107,12 +2736,12 @@ Address: %4
<location line="+44"/>
<location line="+8"/>
<location line="+15"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Debit</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-57"/>
+ <location line="-62"/>
<source>Transaction fee</source>
<translation type="unfinished"/>
</message>
@@ -2123,11 +2752,12 @@ Address: %4
</message>
<message>
<location line="+6"/>
+ <location line="+9"/>
<source>Message</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="-7"/>
<source>Comment</source>
<translation type="unfinished"/>
</message>
@@ -2137,7 +2767,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+18"/>
<source>Merchant</source>
<translation type="unfinished"/>
</message>
@@ -2177,7 +2807,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-227"/>
+ <location line="-232"/>
<source>, has not been successfully broadcast yet</source>
<translation type="unfinished"/>
</message>
@@ -2208,7 +2838,7 @@ Address: %4
<context>
<name>TransactionTableModel</name>
<message>
- <location filename="../transactiontablemodel.cpp" line="+227"/>
+ <location filename="../transactiontablemodel.cpp" line="+234"/>
<source>Date</source>
<translation type="unfinished"/>
</message>
@@ -2227,8 +2857,13 @@ Address: %4
<source>Amount</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+59"/>
+ <source>Immature (%1 confirmations, will be available after %2)</source>
+ <translation type="unfinished"/>
+ </message>
<message numerus="yes">
- <location line="+57"/>
+ <location line="+16"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
@@ -2248,17 +2883,13 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
+ <location line="-22"/>
+ <location line="+25"/>
<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></translation>
- </message>
<message>
- <location line="+5"/>
+ <location line="-22"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation type="unfinished"/>
</message>
@@ -2268,7 +2899,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+43"/>
+ <location line="+62"/>
<source>Received with</source>
<translation type="unfinished"/>
</message>
@@ -2326,7 +2957,7 @@ Address: %4
<context>
<name>TransactionView</name>
<message>
- <location filename="../transactionview.cpp" line="+52"/>
+ <location filename="../transactionview.cpp" line="+57"/>
<location line="+16"/>
<source>All</source>
<translation type="unfinished"/>
@@ -2387,12 +3018,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="+6"/>
<source>Enter address or label to search</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="+6"/>
<source>Min amount</source>
<translation type="unfinished"/>
</message>
@@ -2427,17 +3058,37 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+143"/>
- <source>Export Transaction Data</source>
+ <location line="+142"/>
+ <source>Export Transaction History</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="+19"/>
+ <source>Exporting Failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>There was an error trying to save the transaction history to %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Exporting Successful</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The transaction history was successfully saved to %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-22"/>
<source>Comma separated file (*.csv)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+8"/>
+ <location line="+9"/>
<source>Confirmed</source>
<translation type="unfinished"/>
</message>
@@ -2472,17 +3123,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
- <source>Error exporting</source>
- <translation>ส่งออà¸à¸œà¸´à¸”พลาด</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation>ไม่สามารถเขียนไปยังไฟล์ %1</translation>
- </message>
- <message>
- <location line="+100"/>
+ <location line="+107"/>
<source>Range:</source>
<translation type="unfinished"/>
</message>
@@ -2493,9 +3134,17 @@ Address: %4
</message>
</context>
<context>
+ <name>WalletFrame</name>
+ <message>
+ <location filename="../walletframe.cpp" line="+26"/>
+ <source>No wallet has been loaded.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>WalletModel</name>
<message>
- <location filename="../walletmodel.cpp" line="+218"/>
+ <location filename="../walletmodel.cpp" line="+245"/>
<source>Send Coins</source>
<translation type="unfinished"/>
</message>
@@ -2503,7 +3152,7 @@ Address: %4
<context>
<name>WalletView</name>
<message>
- <location filename="../walletview.cpp" line="+46"/>
+ <location filename="../walletview.cpp" line="+43"/>
<source>&amp;Export</source>
<translation type="unfinished"/>
</message>
@@ -2513,65 +3162,60 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+183"/>
+ <location line="+181"/>
<source>Backup Wallet</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
+ <location line="+1"/>
<source>Wallet Data (*.dat)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
+ <location line="+6"/>
<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>
+ <source>There was an error trying to save the wallet data to %1.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+4"/>
- <source>Backup Successful</source>
+ <source>The wallet data was successfully saved to %1.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+0"/>
- <source>The wallet data was successfully saved to the new location.</source>
+ <source>Backup Successful</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+102"/>
- <source>Bitcoin version</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+107"/>
+ <location filename="../bitcoinstrings.cpp" line="+221"/>
<source>Usage:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-55"/>
+ <location line="-54"/>
<source>List commands</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-13"/>
+ <location line="-14"/>
<source>Get help for a command</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+25"/>
+ <location line="+26"/>
<source>Options:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+24"/>
+ <location line="+22"/>
<source>Specify configuration file (default: bitcoin.conf)</source>
<translation type="unfinished"/>
</message>
@@ -2591,7 +3235,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-28"/>
+ <location line="-26"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
<translation type="unfinished"/>
</message>
@@ -2601,7 +3245,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-49"/>
+ <location line="-51"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation type="unfinished"/>
</message>
@@ -2611,37 +3255,37 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-142"/>
+ <location line="-148"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-33"/>
+ <location line="-36"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+40"/>
+ <location line="+45"/>
<source>Accept command line and JSON-RPC commands</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<source>Run in the background as a daemon and accept commands</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+40"/>
+ <location line="+39"/>
<source>Use the test network</source>
<translation type="unfinished"/>
</message>
@@ -2651,7 +3295,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-87"/>
+ <location line="-95"/>
<source>%s, you must set a rpcpassword in the configuration file:
%s
It is recommended you use the following random password:
@@ -2692,6 +3336,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+4"/>
+ <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</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>
@@ -2706,17 +3355,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+11"/>
- <source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source>
+ <location line="+18"/>
+ <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="+6"/>
- <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
+ <location line="+5"/>
+ <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+3"/>
<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>
@@ -2746,17 +3395,27 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
+ <location line="+9"/>
+ <source>&lt;category&gt; can be:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
<source>Attempt to recover private keys from a corrupt wallet.dat</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
+ <source>Bitcoin Core Daemon</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Bitcoin RPC client version</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
<source>Block creation options:</source>
<translation type="unfinished"/>
</message>
@@ -2766,7 +3425,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
+ <source>Connect through SOCKS proxy</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect to JSON-RPC on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation type="unfinished"/>
</message>
@@ -2782,6 +3446,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+1"/>
+ <source>Do not load the wallet and disable wallet RPC calls</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Do you want to rebuild the block database now?</source>
<translation type="unfinished"/>
</message>
@@ -2876,7 +3545,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
+ <source>Fee per kB to add to transactions you send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Find peers using DNS lookup (default: 1 unless -connect)</source>
<translation type="unfinished"/>
</message>
@@ -2896,6 +3570,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
+ <location line="+1"/>
+ <source>If &lt;category&gt; is not supplied, output all debugging information.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+2"/>
<source>Incorrect or no genesis block found. Wrong datadir for network?</source>
<translation type="unfinished"/>
@@ -2911,17 +3590,37 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+8"/>
+ <location line="+5"/>
+ <source>Prepend debug output with timestamp (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>RPC client options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Rebuild block chain index from current blk000??.dat files</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+5"/>
+ <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Send command to Bitcoin server</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
+ <location line="+7"/>
+ <source>Set maximum block size in bytes (default: %d)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Set the number of threads to service RPC calls (default: 4)</source>
<translation type="unfinished"/>
</message>
@@ -2936,12 +3635,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+12"/>
+ <location line="+3"/>
+ <source>This is intended for regression testing tools and app development.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Usage (deprecated, use bitcoin-cli):</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+8"/>
+ <location line="+7"/>
<source>Verifying blocks...</source>
<translation type="unfinished"/>
</message>
@@ -2952,31 +3656,56 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+1"/>
+ <source>Wait for RPC server to start</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Wallet %s resides outside data directory %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+2"/>
+ <source>Wallet options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>You need to rebuild the database using -reindex to change -txindex</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-78"/>
+ <location line="-79"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-98"/>
+ <location line="-105"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+17"/>
+ <location line="+14"/>
+ <source>Output debugging information (default: 0, supplying &lt;category&gt; is optional)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+83"/>
+ <location line="+89"/>
<source>Information</source>
<translation type="unfinished"/>
</message>
@@ -3016,47 +3745,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<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"/>
+ <location line="+9"/>
<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"/>
+ <location line="+4"/>
<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"/>
+ <location line="+6"/>
<source>Set minimum block size in bytes (default: 0)</source>
<translation type="unfinished"/>
</message>
@@ -3081,7 +3780,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Transaction amount too small</source>
<translation type="unfinished"/>
</message>
@@ -3106,32 +3805,32 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<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="+5"/>
+ <location line="+7"/>
<source>Warning</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Warning: This version is obsolete, upgrade required!</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+2"/>
+ <source>version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>wallet.dat corrupt, salvage failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-54"/>
+ <location line="-58"/>
<source>Password for JSON-RPC connections</source>
<translation type="unfinished"/>
</message>
@@ -3141,27 +3840,27 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-126"/>
+ <location line="-132"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+155"/>
+ <location line="+161"/>
<source>Upgrade wallet to latest format</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-12"/>
+ <location line="-11"/>
<source>Rescan the block chain for missing wallet transactions</source>
<translation type="unfinished"/>
</message>
@@ -3171,7 +3870,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-29"/>
+ <location line="-30"/>
<source>Server certificate file (default: server.cert)</source>
<translation type="unfinished"/>
</message>
@@ -3186,27 +3885,22 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Unable to bind to %s on this computer (bind returned error %d, %s)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-95"/>
- <source>Connect through socks proxy</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="-11"/>
+ <location line="-107"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+58"/>
+ <location line="+60"/>
<source>Loading addresses...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-36"/>
+ <location line="-37"/>
<source>Error loading wallet.dat: Wallet corrupted</source>
<translation type="unfinished"/>
</message>
@@ -3226,12 +3920,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+30"/>
+ <location line="+31"/>
<source>Invalid -proxy address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+57"/>
+ <location line="+56"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3241,7 +3935,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3251,7 +3945,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+46"/>
+ <location line="+48"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3271,27 +3965,22 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-60"/>
+ <location line="-62"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-28"/>
+ <location line="-32"/>
<source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+69"/>
- <source>Fee per KB to add to transactions you send</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+20"/>
+ <location line="+95"/>
<source>Loading wallet...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-54"/>
+ <location line="-56"/>
<source>Cannot downgrade wallet</source>
<translation type="unfinished"/>
</message>
@@ -3301,7 +3990,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+66"/>
+ <location line="+67"/>
<source>Rescanning...</source>
<translation type="unfinished"/>
</message>
@@ -3321,7 +4010,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-33"/>
+ <location line="-35"/>
<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 d062e28b52..9b17da2b0e 100644
--- a/src/qt/locale/bitcoin_tr.ts
+++ b/src/qt/locale/bitcoin_tr.ts
@@ -3,13 +3,13 @@
<name>AboutDialog</name>
<message>
<location filename="../forms/aboutdialog.ui" line="+14"/>
- <source>About Bitcoin</source>
- <translation>Bitcoin Hakkında</translation>
+ <source>About Bitcoin Core</source>
+ <translation>Bitcoin Çekirdeği hakkında</translation>
</message>
<message>
<location line="+39"/>
- <source>&lt;b&gt;Bitcoin&lt;/b&gt; version</source>
- <translation>&lt;b&gt;Bitcoin&lt;/b&gt; sürüm</translation>
+ <source>&lt;b&gt;Bitcoin Core&lt;/b&gt; version</source>
+ <translation>&lt;b&gt;Bitcoin Çekirdek&lt;/b&gt; sürümü</translation>
</message>
<message>
<location line="+57"/>
@@ -27,14 +27,14 @@ This product includes software developed by the OpenSSL Project for use in the O
Bu ürün OpenSSL projesi tarafından OpenSSL araç takımı (http://www.openssl.org/) için geliştirilen yazılımlar, Eric Young (eay@cryptsoft.com) tarafından hazırlanmış şifreleme yazılımları ve Thomas Bernard tarafından programlanmış UPnP yazılımı içerir.</translation>
</message>
<message>
- <location filename="../aboutdialog.cpp" line="+14"/>
+ <location filename="../utilitydialog.cpp" line="+29"/>
<source>Copyright</source>
<translation>Telif hakkı</translation>
</message>
<message>
<location line="+0"/>
- <source>The Bitcoin developers</source>
- <translation>Bitcoin geliÅŸtiricileri</translation>
+ <source>The Bitcoin Core developers</source>
+ <translation>Bitcoin Çekirdeği geliştiricileri</translation>
</message>
</context>
<context>
@@ -70,7 +70,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>K&amp;apat</translation>
</message>
<message>
- <location filename="../addressbookpage.cpp" line="+72"/>
+ <location filename="../addressbookpage.cpp" line="+74"/>
<source>&amp;Copy Address</source>
<translation>Adresi &amp;kopyala</translation>
</message>
@@ -140,7 +140,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>&amp;Düzenle</translation>
</message>
<message>
- <location line="+197"/>
+ <location line="+194"/>
<source>Export Address List</source>
<translation>Adres listesini dışa aktar</translation>
</message>
@@ -151,19 +151,19 @@ This product includes software developed by the OpenSSL Project for use in the O
</message>
<message>
<location line="+13"/>
- <source>Error exporting</source>
- <translation>Dışa aktarımda hata oluştu</translation>
+ <source>Exporting Failed</source>
+ <translation>Dışa aktarım başarısız oldu</translation>
</message>
<message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation>%1 dosyasına yazılamadı.</translation>
+ <location line="+1"/>
+ <source>There was an error trying to save the address list to %1.</source>
+ <translation>Adres listesinin %1 konumuna kaydedilmesi sırasında bir hata meydana geldi.</translation>
</message>
</context>
<context>
<name>AddressTableModel</name>
<message>
- <location filename="../addresstablemodel.cpp" line="+164"/>
+ <location filename="../addresstablemodel.cpp" line="+168"/>
<source>Label</source>
<translation>Etiket</translation>
</message>
@@ -201,7 +201,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Yeni parolayı tekrarlayınız</translation>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="+34"/>
+ <location filename="../askpassphrasedialog.cpp" line="+40"/>
<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>Cüzdanınız için yeni parolayı giriniz.&lt;br/&gt;Lütfen &lt;b&gt;10 ya da daha fazla rastgele karakter&lt;/b&gt; veya &lt;b&gt;sekiz ya da daha fazla kelime&lt;/b&gt; içeren bir parola seçiniz.</translation>
</message>
@@ -322,22 +322,27 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+250"/>
+ <location filename="../bitcoingui.cpp" line="+295"/>
<source>Sign &amp;message...</source>
<translation>&amp;Mesaj imzala...</translation>
</message>
<message>
- <location line="+254"/>
+ <location line="+335"/>
<source>Synchronizing with network...</source>
<translation>Åžebeke ile senkronizasyon...</translation>
</message>
<message>
- <location line="-324"/>
+ <location line="-407"/>
<source>&amp;Overview</source>
<translation>&amp;Genel bakış</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="-137"/>
+ <source>Node</source>
+ <translation>Düğüm</translation>
+ </message>
+ <message>
+ <location line="+138"/>
<source>Show general overview of wallet</source>
<translation>Cüzdana genel bakışı göster</translation>
</message>
@@ -352,7 +357,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Muamele tarihçesini tara</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>E&amp;xit</source>
<translation>&amp;Çık</translation>
</message>
@@ -398,7 +403,22 @@ 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="+10"/>
+ <source>&amp;Sending addresses...</source>
+ <translation>&amp;Gönderme adresleri...</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Receiving addresses...</source>
+ <translation>&amp;Alma adresleri...</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open &amp;URI...</source>
+ <translation>&amp;URI aç...</translation>
+ </message>
+ <message>
+ <location line="+325"/>
<source>Importing blocks from disk...</source>
<translation>Bloklar diskten içe aktarılıyor...</translation>
</message>
@@ -408,12 +428,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Diskteki bloklar yeniden endeksleniyor...</translation>
</message>
<message>
- <location line="-322"/>
+ <location line="-405"/>
<source>Send coins to a Bitcoin address</source>
<translation>Bir Bitcoin adresine Bitcoin yolla</translation>
</message>
<message>
- <location line="+47"/>
+ <location line="+49"/>
<source>Modify configuration options for Bitcoin</source>
<translation>Bitcoin seçeneklerinin yapılandırmasını değiştir</translation>
</message>
@@ -443,20 +463,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Mesaj &amp;kontrol et...</translation>
</message>
<message>
- <location line="-180"/>
- <location line="+6"/>
- <location line="+513"/>
+ <location line="+430"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-519"/>
- <location line="+6"/>
+ <location line="-643"/>
<source>Wallet</source>
<translation>Cüzdan</translation>
</message>
<message>
- <location line="+109"/>
+ <location line="+146"/>
<source>&amp;Send</source>
<translation>&amp;Gönder</translation>
</message>
@@ -466,13 +483,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>&amp;Al</translation>
</message>
<message>
- <location line="+28"/>
- <location line="+2"/>
- <source>&amp;About Bitcoin</source>
- <translation>Bitcoin &amp;Hakkında</translation>
- </message>
- <message>
- <location line="+14"/>
+ <location line="+46"/>
<location line="+2"/>
<source>&amp;Show / Hide</source>
<translation>&amp;Göster / Sakla</translation>
@@ -498,64 +509,80 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Belirtilen Bitcoin adresleri ile imzalandıklarından emin olmak için mesajları kontrol et</translation>
</message>
<message>
- <location line="+35"/>
+ <location line="+48"/>
<source>&amp;File</source>
<translation>&amp;Dosya</translation>
</message>
<message>
- <location line="+10"/>
+ <location line="+14"/>
<source>&amp;Settings</source>
<translation>&amp;Ayarlar</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>&amp;Help</source>
<translation>&amp;Yardım</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+15"/>
<source>Tabs toolbar</source>
<translation>Sekme araç çubuğu</translation>
</message>
<message>
- <location line="-235"/>
- <location line="+294"/>
+ <location line="-284"/>
+ <location line="+376"/>
<source>[testnet]</source>
<translation>[testnet]</translation>
</message>
<message>
- <location line="-177"/>
+ <location line="-401"/>
+ <source>Bitcoin Core</source>
+ <translation>Bitcoin Çekirdeği</translation>
+ </message>
+ <message>
+ <location line="+163"/>
<source>Request payments (generates QR codes and bitcoin: URIs)</source>
<translation>Ödeme talep et (QR kodu ve bitcoin URI&apos;si oluşturur)</translation>
</message>
<message>
- <location line="+63"/>
- <source>&amp;Used sending addresses...</source>
- <translation>K&amp;ullanıılmış gönderi adresleri...</translation>
+ <location line="+29"/>
+ <location line="+2"/>
+ <source>&amp;About Bitcoin Core</source>
+ <translation>Bitcoin Çekirdeği &amp;hakkında</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+35"/>
<source>Show the list of used sending addresses and labels</source>
<translation>Kullanılmış gönderme adresleri ve etiketlerin listesini göster</translation>
</message>
<message>
- <location line="+1"/>
- <source>Used &amp;receiving addresses...</source>
- <translation>Kullanılmış &amp;alım adresleri...</translation>
+ <location line="+2"/>
+ <source>Show the list of used receiving addresses and labels</source>
+ <translation>Kullanılmış alım adresleri ve etiketlerin listesini göster</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open a bitcoin: URI or payment request</source>
+ <translation>Bir bitcoin: bağlantısı ya da ödeme talebi aç</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Command-line options</source>
+ <translation>&amp;Komut satırı seçenekleri</translation>
</message>
<message>
<location line="+1"/>
- <source>Show the list of used receiving addresses and labels</source>
- <translation>Kullanılmış alım adresleri ve etiketlerin listesini göster</translation>
+ <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
+ <translation>Bitcoin komut satırı seçeneklerinin listesini elde etmek için Bitcoin Çekirdeği yardım mesajını göster</translation>
</message>
<message>
- <location line="+106"/>
+ <location line="+159"/>
<location line="+5"/>
<source>Bitcoin client</source>
<translation>Bitcoin istemcisi</translation>
</message>
<message numerus="yes">
- <location line="+120"/>
+ <location line="+142"/>
<source>%n active connection(s) to Bitcoin network</source>
<translation><numerusform>Bitcoin şebekesine %n faal bağlantı</numerusform><numerusform>Bitcoin şebekesine %n faal bağlantı</numerusform></translation>
</message>
@@ -575,7 +602,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Muamele tarihçesinde %1 blok işlendi.</translation>
</message>
<message numerus="yes">
- <location line="+20"/>
+ <location line="+23"/>
<source>%n hour(s)</source>
<translation><numerusform>%n saat</numerusform><numerusform>%n saat</numerusform></translation>
</message>
@@ -595,7 +622,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>%1 geride</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="+21"/>
<source>Last received block was generated %1 ago.</source>
<translation>Son alınan blok %1 evvel oluşturulmuştu.</translation>
</message>
@@ -620,27 +647,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Bilgi</translation>
</message>
<message>
- <location line="+77"/>
- <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="-152"/>
+ <location line="-85"/>
<source>Up to date</source>
<translation>Güncel</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Catching up...</source>
<translation>Aralık kapatılıyor...</translation>
</message>
<message>
- <location line="+124"/>
- <source>Confirm transaction fee</source>
- <translation>Muamele ücretini teyit et</translation>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+130"/>
<source>Sent transaction</source>
<translation>Muamele yollandı</translation>
</message>
@@ -657,23 +674,13 @@ Type: %3
Address: %4
</source>
<translation>Tarih: %1
-Miktar: %2
+MeblaÄŸ: %2
Tür: %3
Adres: %4
</translation>
</message>
<message>
- <location line="+34"/>
- <source>URI handling</source>
- <translation>URI yönetimi</translation>
- </message>
- <message>
- <location line="+0"/>
- <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>
- <message>
- <location line="+45"/>
+ <location line="+69"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation>Cüzdan &lt;b&gt;şifrelenmiştir&lt;/b&gt; ve şu anda &lt;b&gt;kilidi açıktır&lt;/b&gt;</translation>
</message>
@@ -683,7 +690,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 filename="../bitcoin.cpp" line="+110"/>
+ <location filename="../bitcoin.cpp" line="+438"/>
<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>
@@ -691,12 +698,304 @@ Adres: %4
<context>
<name>ClientModel</name>
<message>
- <location filename="../clientmodel.cpp" line="+115"/>
+ <location filename="../clientmodel.cpp" line="+119"/>
<source>Network Alert</source>
<translation>Şebeke hakkında uyarı</translation>
</message>
</context>
<context>
+ <name>CoinControlDialog</name>
+ <message>
+ <location filename="../forms/coincontroldialog.ui" line="+14"/>
+ <source>Coin Control Address Selection</source>
+ <translation>Para kontrolü adres seçimi</translation>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>Quantity:</source>
+ <translation>Miktar:</translation>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Bytes:</source>
+ <translation>Bayt:</translation>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>Amount:</source>
+ <translation>MeblaÄŸ:</translation>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Priority:</source>
+ <translation>Öncelik:</translation>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>Fee:</source>
+ <translation>Ãœcret:</translation>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Low Output:</source>
+ <translation>Düşük çıktı:</translation>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>After Fee:</source>
+ <translation>Ãœcretten sonra:</translation>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Change:</source>
+ <translation>Para üstü:</translation>
+ </message>
+ <message>
+ <location line="+63"/>
+ <source>(un)select all</source>
+ <translation>tümünü seç(me)</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Tree mode</source>
+ <translation>Ağaç kipi</translation>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>List mode</source>
+ <translation>Liste kipi</translation>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>Amount</source>
+ <translation>MeblaÄŸ</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Address</source>
+ <translation>Adres</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Date</source>
+ <translation>Tarih</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Confirmations</source>
+ <translation>DoÄŸrulamalar</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Confirmed</source>
+ <translation>Doğrulandı</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Priority</source>
+ <translation>Öncelik</translation>
+ </message>
+ <message>
+ <location filename="../coincontroldialog.cpp" line="+42"/>
+ <source>Copy address</source>
+ <translation>Adresi kopyala</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy label</source>
+ <translation>Etiketi kopyala</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+26"/>
+ <source>Copy amount</source>
+ <translation>Meblağı kopyala</translation>
+ </message>
+ <message>
+ <location line="-25"/>
+ <source>Copy transaction ID</source>
+ <translation>Muamele kimliÄŸini kopyala</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Lock unspent</source>
+ <translation>Harcanmamışı kilitle</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Unlock unspent</source>
+ <translation>Harcanmamışın kilidini aç</translation>
+ </message>
+ <message>
+ <location line="+22"/>
+ <source>Copy quantity</source>
+ <translation>Miktarı kopyala</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Copy fee</source>
+ <translation>Ãœcreti kopyala</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy after fee</source>
+ <translation>Ãœcretten sonrakini kopyala</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy bytes</source>
+ <translation>Baytları kopyala</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy priority</source>
+ <translation>Önceliği kopyala</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy low output</source>
+ <translation>Düşük çıktıyı kopyala</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy change</source>
+ <translation>Para üstünü kopyala</translation>
+ </message>
+ <message>
+ <location line="+323"/>
+ <source>highest</source>
+ <translation>azami</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>higher</source>
+ <translation>daha yüksek</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>high</source>
+ <translation>yüksek</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>medium-high</source>
+ <translation>orta-yüksek</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>medium</source>
+ <translation>orta</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>low-medium</source>
+ <translation>düşük-orta</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>low</source>
+ <translation>düşük</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>lower</source>
+ <translation>daha düşük</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>lowest</source>
+ <translation>asgari</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>(%1 locked)</source>
+ <translation>(%1 kilitlendi)</translation>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>none</source>
+ <translation>boÅŸ</translation>
+ </message>
+ <message>
+ <location line="+140"/>
+ <source>Dust</source>
+ <translation>Toz</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>yes</source>
+ <translation>evet</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>no</source>
+ <translation>hayır</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>This label turns red, if the transaction size is greater than 1000 bytes.</source>
+ <translation>Eğer muamele boyutu 1000 bayttan büyükse bu etkiket kırmızı olur.</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+5"/>
+ <source>This means a fee of at least %1 per kB is required.</source>
+ <translation>Bu, kB başına en az %1 ücret gerektiği anlamnına gelir.</translation>
+ </message>
+ <message>
+ <location line="-4"/>
+ <source>Can vary +/- 1 byte per input.</source>
+ <translation>Girdi başına +/- 1 bayt değişebilir.</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Transactions with higher priority are more likely to get included into a block.</source>
+ <translation>Yüksek öncelikli muamelelerin bir bloğa dahil olmaları daha olasıdır.</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>This label turns red, if the priority is smaller than &quot;medium&quot;.</source>
+ <translation>Eğer öncelik &quot;ortadan&quot; düşükse bu etiket kırmızı olur.</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>This label turns red, if any recipient receives an amount smaller than %1.</source>
+ <translation>Eğer herhangi bir alıcı %1&apos;den düşük bir meblağ alırsa bu etiket kırmızı olur.</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+4"/>
+ <source>This means a fee of at least %1 is required.</source>
+ <translation>Bu, en az %1 tutarında bir ücret gerektiği anlamına gelir.</translation>
+ </message>
+ <message>
+ <location line="-3"/>
+ <source>Amounts below 0.546 times the minimum relay fee are shown as dust.</source>
+ <translation>Asgari yönlendirme ücretinin 0.546 oranının altındaki meblağlar toz olarak gösterilir.</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>This label turns red, if the change is smaller than %1.</source>
+ <translation>Eğer para üstü %1&apos;den düşükse bu etiket kırmızı olur.</translation>
+ </message>
+ <message>
+ <location line="+43"/>
+ <location line="+66"/>
+ <source>(no label)</source>
+ <translation>(boÅŸ etiket)</translation>
+ </message>
+ <message>
+ <location line="-9"/>
+ <source>change from %1 (%2)</source>
+ <translation>%1 unsurundan para üstü (%2)</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>(change)</source>
+ <translation>(para üstü)</translation>
+ </message>
+</context>
+<context>
<name>EditAddressDialog</name>
<message>
<location filename="../forms/editaddressdialog.ui" line="+14"/>
@@ -724,7 +1023,7 @@ Adres: %4
<translation>&amp;Adres</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+21"/>
+ <location filename="../editaddressdialog.cpp" line="+28"/>
<source>New receiving address</source>
<translation>Yeni alım adresi</translation>
</message>
@@ -767,7 +1066,7 @@ Adres: %4
<context>
<name>FreespaceChecker</name>
<message>
- <location filename="../intro.cpp" line="+61"/>
+ <location filename="../intro.cpp" line="+65"/>
<source>A new data directory will be created.</source>
<translation>Yeni bir veri klasörü oluşturulacaktır.</translation>
</message>
@@ -793,15 +1092,19 @@ Adres: %4
</message>
</context>
<context>
- <name>GUIUtil::HelpMessageBox</name>
+ <name>HelpMessageDialog</name>
<message>
- <location filename="../guiutil.cpp" line="+558"/>
- <location line="+13"/>
- <source>Bitcoin-Qt</source>
- <translation>Bitcoin-Qt</translation>
+ <location filename="../forms/helpmessagedialog.ui" line="+19"/>
+ <source>Bitcoin Core - Command-line options</source>
+ <translation>Bitcoin Çekirdeği - Komut satırı seçenekleri</translation>
</message>
<message>
- <location line="-13"/>
+ <location filename="../utilitydialog.cpp" line="+38"/>
+ <source>Bitcoin Core</source>
+ <translation>Bitcoin Çekirdeği</translation>
+ </message>
+ <message>
+ <location line="+0"/>
<source>version</source>
<translation>sürüm</translation>
</message>
@@ -850,18 +1153,18 @@ Adres: %4
</message>
<message>
<location line="+9"/>
- <source>Welcome to Bitcoin-Qt.</source>
- <translation>Bitcoin-Qt&apos;a hoÅŸ geldiniz.</translation>
+ <source>Welcome to Bitcoin Core.</source>
+ <translation>Bitcoin Çekirdeğine hoş geldiniz.</translation>
</message>
<message>
<location line="+26"/>
- <source>As this is the first time the program is launched, you can choose where Bitcoin-Qt will store its data.</source>
- <translation>Bu programın ilk kez başlatılmasından dolayı Bitcoin-Qt&apos;un verilerini nerede saklayacağını seçebilirsiniz.</translation>
+ <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
+ <translation>Bu programı ilk kez başlattığınızdan dolayı Bitcoin Çekirdeğinin verilerini nereye saklayacağını seçebilirsiniz.</translation>
</message>
<message>
<location line="+10"/>
- <source>Bitcoin-Qt will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
- <translation>Bitcoin-Qt, blok zincirinin bir kopyasını indirecek ve saklayacaktır. Bu klasörde en az %1GB veri saklanacak ve bu zamanla artacaktır. Cüzdan da bu klasörde saklanacaktır.</translation>
+ <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
+ <translation>Bitcoin çekirdeği Bitcoin blok zincirinin bir kopyasını indirip saklayacaktır. Asgari %1GB bouyutunda veri bu klasörde saklanacak ve zamanla bu boyut artacaktır. Cüzdan da bu klasörde saklanacaktır. </translation>
</message>
<message>
<location line="+10"/>
@@ -874,7 +1177,17 @@ Adres: %4
<translation>Özel bir veri klasörü kullan:</translation>
</message>
<message>
- <location filename="../intro.cpp" line="+105"/>
+ <location filename="../intro.cpp" line="+85"/>
+ <source>Bitcoin</source>
+ <translation>Bitcoin</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error: Specified data directory &quot;%1&quot; can not be created.</source>
+ <translation>Hata: belirtilen &quot;%1&quot; veri klasörü oluşturulamaz.</translation>
+ </message>
+ <message>
+ <location line="+19"/>
<source>Error</source>
<translation>Hata</translation>
</message>
@@ -890,6 +1203,34 @@ Adres: %4
</message>
</context>
<context>
+ <name>OpenURIDialog</name>
+ <message>
+ <location filename="../forms/openuridialog.ui" line="+14"/>
+ <source>Open URI</source>
+ <translation>URI aç</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Open payment request from URI or file</source>
+ <translation>Dosyadan veya URI&apos;den ödeme talebi aç</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>URI:</source>
+ <translation>URI:</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Select payment request file</source>
+ <translation>Ödeme talebi dosyasını seç</translation>
+ </message>
+ <message>
+ <location filename="../openuridialog.cpp" line="+47"/>
+ <source>Select payment request file to open</source>
+ <translation>Açılacak ödeme talebi dosyasını seç</translation>
+ </message>
+</context>
+<context>
<name>OptionsDialog</name>
<message>
<location filename="../forms/optionsdialog.ui" line="+14"/>
@@ -897,7 +1238,7 @@ Adres: %4
<translation>Seçenekler</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+13"/>
<source>&amp;Main</source>
<translation>&amp;Esas ayarlar</translation>
</message>
@@ -922,7 +1263,52 @@ Adres: %4
<translation>Bitcoin&apos;i sistem oturumuyla &amp;baÅŸlat</translation>
</message>
<message>
- <location line="+35"/>
+ <location line="+9"/>
+ <source>Size of &amp;database cache</source>
+ <translation>&amp;Veritabanı tamponunun boyutu</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set database cache size in megabytes (default: 25)</source>
+ <translation>Veritabanı önbellek boyutunu megabayt olarak belirt (varsayılan: 25)</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>MB</source>
+ <translation>MB</translation>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Number of script &amp;verification threads</source>
+ <translation>İş parçacıklarını &amp;denetleme betiği sayısı</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
+ <translation>Betik kontrolü iş parçacığı sayısını belirt (azami 16, 0 = otomatik, &lt;0 = bu sayıda çekirdeği boş bırak, varsayılan: 0)</translation>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Connect to the Bitcoin network through a SOCKS proxy.</source>
+ <translation>Bitcoin şebekesine bir SOCKS vekil sunucusu vasıtasıyla bağlan.</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Connect through SOCKS proxy (default proxy):</source>
+ <translation>SOCKS vekil sunucusuyla &amp;bağlan (varsayılan vekil):</translation>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
+ <translation>Vekil sunucusunun IP adresi (mesela IPv4: 127.0.0.1 / IPv6: ::1)</translation>
+ </message>
+ <message>
+ <location line="+224"/>
+ <source>Active command-line options that override above options:</source>
+ <translation>Yukarıdaki seçeneklerin yerine geçen faal komut satırı seçenekleri:</translation>
+ </message>
+ <message>
+ <location line="+43"/>
<source>Reset all client options to default.</source>
<translation>İstemcinin tüm seçeneklerini varsayılan değerlere geri al.</translation>
</message>
@@ -932,7 +1318,7 @@ Adres: %4
<translation>Seçenekleri Sıfı&amp;rla</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="-323"/>
<source>&amp;Network</source>
<translation>&amp;Åžebeke</translation>
</message>
@@ -947,32 +1333,17 @@ Adres: %4
<translation>Portları &amp;UPnP kullanarak haritala</translation>
</message>
<message>
- <location line="+7"/>
- <source>Connect to the Bitcoin network through a SOCKS proxy (e.g. when connecting through Tor).</source>
- <translation>Bitcoin şebekesine SOCKS vekil sunucusu vasıtasıyla bağlan (mesela Tor ile bağlanıldığında).</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>&amp;Connect through SOCKS proxy:</source>
- <translation>SOCKS vekil sunucusu vasıtasıyla ba&amp;ğlan:</translation>
- </message>
- <message>
- <location line="+9"/>
+ <location line="+19"/>
<source>Proxy &amp;IP:</source>
<translation>Vekil &amp;Ä°P:</translation>
</message>
<message>
- <location line="+19"/>
- <source>IP address of the proxy (e.g. 127.0.0.1)</source>
- <translation>Vekil sunucunun Ä°P adresi (mesela 127.0.0.1)</translation>
- </message>
- <message>
- <location line="+7"/>
+ <location line="+32"/>
<source>&amp;Port:</source>
<translation>&amp;Port:</translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+25"/>
<source>Port of the proxy (e.g. 9050)</source>
<translation>Vekil sunucunun portu (mesela 9050)</translation>
</message>
@@ -1029,7 +1400,7 @@ Adres: %4
<message>
<location line="+11"/>
<source>&amp;Unit to show amounts in:</source>
- <translation>Miktarı göstermek için &amp;birim:</translation>
+ <translation>Meblağları göstermek için &amp;birim:</translation>
</message>
<message>
<location line="+13"/>
@@ -1047,7 +1418,17 @@ Adres: %4
<translation>Muamele listesinde adresleri &amp;göster</translation>
</message>
<message>
- <location line="+71"/>
+ <location line="+7"/>
+ <source>Whether to show coin control features or not.</source>
+ <translation>Para kontrol özelliklerinin gösterilip gösterilmeyeceğini ayarlar.</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Display coin &amp;control features (experts only)</source>
+ <translation>Para &amp;kontrol özelliklerini görüntüle (sadece uzman kullanıcılar için)</translation>
+ </message>
+ <message>
+ <location line="+136"/>
<source>&amp;OK</source>
<translation>&amp;Tamam</translation>
</message>
@@ -1057,44 +1438,38 @@ Adres: %4
<translation>&amp;Ä°ptal</translation>
</message>
<message>
- <location line="+10"/>
- <source>&amp;Apply</source>
- <translation>&amp;Uygula</translation>
- </message>
- <message>
- <location filename="../optionsdialog.cpp" line="+58"/>
+ <location filename="../optionsdialog.cpp" line="+67"/>
<source>default</source>
<translation>varsayılan</translation>
</message>
<message>
- <location line="+130"/>
+ <location line="+57"/>
+ <source>none</source>
+ <translation>boÅŸ</translation>
+ </message>
+ <message>
+ <location line="+75"/>
<source>Confirm options reset</source>
<translation>Seçeneklerin sıfırlanmasını teyit et</translation>
</message>
<message>
<location line="+1"/>
- <source>Some settings may require a client restart to take effect.</source>
- <translation>Bazı ayarların dikkate alınması istemcinin tekrar başlatılmasını gerektirebilir.</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Do you want to proceed?</source>
- <translation>Devam etmek istiyor musunuz?</translation>
+ <location line="+29"/>
+ <source>Client restart required to activate changes.</source>
+ <translation>Değişikliklerin uygulanması için istemcinin yeniden başlatılması lazımdır.</translation>
</message>
<message>
- <location line="+42"/>
- <location line="+9"/>
- <source>Warning</source>
- <translation>Uyarı</translation>
+ <location line="-29"/>
+ <source>Client will be shutdown, do you want to proceed?</source>
+ <translation>İstemci kapanacaktır, devam etmek istiyor musunuz?</translation>
</message>
<message>
- <location line="-9"/>
- <location line="+9"/>
- <source>This setting will take effect after restarting Bitcoin.</source>
- <translation>Bu ayarlar Bitcoin tekrar başlatıldığında etkinleşecektir.</translation>
+ <location line="+33"/>
+ <source>This change would require a client restart.</source>
+ <translation>Bu değişiklik istemcinin tekrar başlatılmasını gerektirir.</translation>
</message>
<message>
- <location line="+29"/>
+ <location line="+34"/>
<source>The supplied proxy address is invalid.</source>
<translation>Girilen vekil sunucu adresi geçersizdir.</translation>
</message>
@@ -1108,22 +1483,22 @@ Adres: %4
</message>
<message>
<location line="+50"/>
- <location line="+202"/>
+ <location line="+231"/>
<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="-131"/>
+ <location line="-155"/>
<source>Unconfirmed:</source>
<translation>Doğrulanmamış:</translation>
</message>
<message>
- <location line="-78"/>
+ <location line="-83"/>
<source>Wallet</source>
<translation>Cüzdan</translation>
</message>
<message>
- <location line="+49"/>
+ <location line="+51"/>
<source>Confirmed:</source>
<translation>Teyit edilmiÅŸ:</translation>
</message>
@@ -1133,12 +1508,12 @@ Adres: %4
<translation>Güncel harcanabilir bakiyeniz</translation>
</message>
<message>
- <location line="+29"/>
+ <location line="+32"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation>Henüz teyit edilmemiş ve harcanabilir bakiyeye eklenmemiş muamelelerin toplamı</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+16"/>
<source>Immature:</source>
<translation>Olgunlaşmamış:</translation>
</message>
@@ -1148,7 +1523,7 @@ Adres: %4
<translation>Oluşturulan bakiye henüz olgunlaşmamıştır</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+16"/>
<source>Total:</source>
<translation>Toplam:</translation>
</message>
@@ -1158,12 +1533,12 @@ Adres: %4
<translation>Güncel toplam bakiyeniz</translation>
</message>
<message>
- <location line="+53"/>
+ <location line="+71"/>
<source>&lt;b&gt;Recent transactions&lt;/b&gt;</source>
<translation>&lt;b&gt;Son muameleler&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../overviewpage.cpp" line="+116"/>
+ <location filename="../overviewpage.cpp" line="+120"/>
<location line="+1"/>
<source>out of sync</source>
<translation>eşleşme dışı</translation>
@@ -1172,7 +1547,8 @@ Adres: %4
<context>
<name>PaymentServer</name>
<message>
- <location filename="../paymentserver.cpp" line="+392"/>
+ <location filename="../paymentserver.cpp" line="+403"/>
+ <location line="+13"/>
<source>URI handling</source>
<translation>URI yönetimi</translation>
</message>
@@ -1182,45 +1558,82 @@ Adres: %4
<translation>URI okunamadı! Sebebi geçersiz bir Bitcoin adresi veya hatalı URI parametreleri olabilir.</translation>
</message>
<message>
- <location line="+69"/>
+ <location line="+96"/>
<source>Requested payment amount of %1 is too small (considered dust).</source>
<translation>Talep edilen %1 meblağında ödeme çok düşüktür (toz olarak kabul edilir).</translation>
</message>
<message>
- <location line="+4"/>
- <location line="+37"/>
+ <location line="-221"/>
+ <location line="+212"/>
+ <location line="+13"/>
+ <location line="+95"/>
+ <location line="+18"/>
+ <location line="+16"/>
<source>Payment request error</source>
<translation>Ödeme talebi hatası</translation>
</message>
<message>
+ <location line="-353"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
+ <translation>Bitcoin başlatılamadı: tıkla-ve-öde yöneticisi</translation>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Net manager warning</source>
+ <translation>Şebeke yöneticisi uyarısı</translation>
+ </message>
+ <message>
<location line="+1"/>
- <source>Insecure requests to custom payment scripts unsupported</source>
- <translation>Özel ödeme betiklerine güvensiz talepler desteklenmez</translation>
+ <source>Your active proxy doesn&apos;t support SOCKS5, which is required for payment requests via proxy.</source>
+ <translation>Faal vekil sunucunuz, vekil vasıtasıyla ödeme talepleri için gereken SOCKS5&apos;i desteklememektedir.</translation>
</message>
<message>
- <location line="+38"/>
+ <location line="+52"/>
+ <source>Payment request fetch URL is invalid: %1</source>
+ <translation>Ödeme talebini alma URL&apos;i geçersiz: %1</translation>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Payment request file handling</source>
+ <translation>Ödeme talebi dosyası yönetimi</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Payment request file can not be read or processed! This can be caused by an invalid payment request file.</source>
+ <translation>Ödeme talebi okunamaz ya da işlenemez! Bunun sebebi geçersiz bir ödeme talebi dosyası olabilir.</translation>
+ </message>
+ <message>
+ <location line="+73"/>
+ <source>Unverified payment requests to custom payment scripts are unsupported.</source>
+ <translation>Özel ödeme betiklerine teyit edilmemiş ödeme talepleri desteklenmez.</translation>
+ </message>
+ <message>
+ <location line="+59"/>
<source>Refund from %1</source>
<translation>%1 öğesinden iade</translation>
</message>
<message>
- <location line="+42"/>
+ <location line="+43"/>
<source>Error communicating with %1: %2</source>
<translation>%1 ile iletiÅŸimde hata: %2</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+24"/>
+ <source>Payment request can not be parsed or processed!</source>
+ <translation>Ödeme talebi ayrıştırılamaz ya da işlenemez!</translation>
+ </message>
+ <message>
+ <location line="+11"/>
<source>Bad response from server %1</source>
<translation>%1 sunucusundan hatalı cevap</translation>
</message>
<message>
- <location line="+32"/>
+ <location line="+33"/>
<source>Payment acknowledged</source>
<translation>Ödeme teyit edildi</translation>
</message>
<message>
- <location line="-58"/>
- <location line="+30"/>
- <location line="+17"/>
+ <location line="-11"/>
<source>Network request error</source>
<translation>Şebeke talebi hatası</translation>
</message>
@@ -1228,32 +1641,26 @@ Adres: %4
<context>
<name>QObject</name>
<message>
- <location filename="../bitcoin.cpp" line="+114"/>
- <location line="+5"/>
- <location filename="../intro.cpp" line="-32"/>
+ <location filename="../bitcoin.cpp" line="+71"/>
+ <location line="+11"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-4"/>
+ <location line="+1"/>
<source>Error: Specified data directory &quot;%1&quot; does not exist.</source>
<translation>Hata: belirtilen &quot;%1&quot; veri klasörü yoktur.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="-12"/>
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation>Hata: -regtest ve -testnet&apos;in geçersiz kombinasyonu.</translation>
</message>
- <message>
- <location filename="../intro.cpp" line="+1"/>
- <source>Error: Specified data directory &quot;%1&quot; can not be created.</source>
- <translation>Hata: belirtilen &quot;%1&quot; veri klasörü oluşturulamaz.</translation>
- </message>
</context>
<context>
<name>QRImageWidget</name>
<message>
- <location filename="../receiverequestdialog.cpp" line="+32"/>
+ <location filename="../receiverequestdialog.cpp" line="+36"/>
<source>&amp;Save Image...</source>
<translation>Resmi k&amp;aydet...</translation>
</message>
@@ -1269,8 +1676,8 @@ Adres: %4
</message>
<message>
<location line="+0"/>
- <source>PNG Images (*.png)</source>
- <translation>PNG resimleri (*.png)</translation>
+ <source>PNG Image (*.png)</source>
+ <translation>PNG resim (*.png)</translation>
</message>
</context>
<context>
@@ -1287,15 +1694,16 @@ Adres: %4
<location line="+23"/>
<location line="+23"/>
<location line="+36"/>
- <location line="+53"/>
+ <location line="+23"/>
+ <location line="+36"/>
<location line="+23"/>
<location line="+23"/>
- <location filename="../rpcconsole.cpp" line="+352"/>
+ <location filename="../rpcconsole.cpp" line="+359"/>
<source>N/A</source>
<translation>Mevcut deÄŸil</translation>
</message>
<message>
- <location line="-217"/>
+ <location line="-223"/>
<source>Client version</source>
<translation>İstemci sürümü</translation>
</message>
@@ -1305,7 +1713,17 @@ Adres: %4
<translation>&amp;Malumat</translation>
</message>
<message>
- <location line="+68"/>
+ <location line="-10"/>
+ <source>Debug window</source>
+ <translation>Hata ayıklama penceresi</translation>
+ </message>
+ <message>
+ <location line="+25"/>
+ <source>General</source>
+ <translation>Genel</translation>
+ </message>
+ <message>
+ <location line="+53"/>
<source>Using OpenSSL version</source>
<translation>Kullanılan OpenSSL sürümü</translation>
</message>
@@ -1321,16 +1739,16 @@ Adres: %4
</message>
<message>
<location line="+7"/>
- <source>Number of connections</source>
- <translation>Bağlantı sayısı</translation>
+ <source>Name</source>
+ <translation>Ä°sim</translation>
</message>
<message>
<location line="+23"/>
- <source>On testnet</source>
- <translation>Testnet üzerinde</translation>
+ <source>Number of connections</source>
+ <translation>Bağlantı sayısı</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+29"/>
<source>Block chain</source>
<translation>Blok zinciri</translation>
</message>
@@ -1355,21 +1773,6 @@ Adres: %4
<translation>&amp;Aç</translation>
</message>
<message>
- <location line="+16"/>
- <source>Command-line options</source>
- <translation>Komut satırı seçenekleri</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>Mevcut Bitcoin komut satırı seçeneklerinin listesini içeren Bitcoin-Qt yardımını göster.</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>&amp;Show</source>
- <translation>&amp;Göster</translation>
- </message>
- <message>
<location line="+24"/>
<source>&amp;Console</source>
<translation>&amp;Konsol</translation>
@@ -1400,22 +1803,12 @@ Adres: %4
<translation>Dışarı:</translation>
</message>
<message>
- <location line="-541"/>
+ <location line="-521"/>
<source>Build date</source>
<translation>Derleme tarihi</translation>
</message>
<message>
- <location line="-104"/>
- <source>Bitcoin - Debug window</source>
- <translation>Bitcoin - Hata ayıklama penceresi</translation>
- </message>
- <message>
- <location line="+25"/>
- <source>Bitcoin Core</source>
- <translation>Bitcoin Çekirdeği</translation>
- </message>
- <message>
- <location line="+279"/>
+ <location line="+206"/>
<source>Debug log file</source>
<translation>Hata ayıklama kütük dosyası</translation>
</message>
@@ -1425,7 +1818,7 @@ Adres: %4
<translation>Güncel veri klasöründen Bitcoin hata ayıklama kütük dosyasını açar. Büyük kütük dosyaları için bu birkaç saniye alabilir.</translation>
</message>
<message>
- <location line="+102"/>
+ <location line="+76"/>
<source>Clear console</source>
<translation>Konsolu temizle</translation>
</message>
@@ -1445,7 +1838,7 @@ Adres: %4
<translation>Mevcut komutların listesi için &lt;b&gt;help&lt;/b&gt; yazınız.</translation>
</message>
<message>
- <location line="+128"/>
+ <location line="+122"/>
<source>%1 B</source>
<translation>%1 B</translation>
</message>
@@ -1483,37 +1876,22 @@ Adres: %4
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+22"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
<source>&amp;Amount:</source>
<translation>&amp;MeblaÄŸ:</translation>
</message>
<message>
- <location line="+16"/>
- <source>The amount to request</source>
- <translation>Talep edilecek meblaÄŸ</translation>
- </message>
- <message>
- <location line="+7"/>
+ <location line="-13"/>
<source>&amp;Label:</source>
<translation>&amp;Etiket:</translation>
</message>
<message>
- <location line="+10"/>
- <source>The label to associate with the receiving address</source>
- <translation>Alım adresi ile ilişkilendirilecek etiket</translation>
- </message>
- <message>
- <location line="+7"/>
+ <location line="-34"/>
<source>&amp;Message:</source>
<translation>Me&amp;saj:</translation>
</message>
<message>
- <location line="+10"/>
- <source>The message to attach to payment request</source>
- <translation>Ödeme talebine ilâve edilecek mesaj</translation>
- </message>
- <message>
- <location line="+14"/>
+ <location line="-17"/>
<source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation>Daha önce kullanılmış bir alım adresini kullan. Adresleri tekrar kullanmak güvenlik ve gizlilik sorunları doğurur. Bunu, daha önce yaptığınız bir talebi tekrar oluşturmak durumu dışında kullanmayınız.</translation>
</message>
@@ -1523,9 +1901,24 @@ Adres: %4
<translation>&amp;Hâlihazırda bulunan bir alım adresini kullan (önerilmez)</translation>
</message>
<message>
+ <location line="+27"/>
+ <source>An optional label to associate with the new receiving address</source>
+ <translation>Yeni alım adresi ile ilişkili, seçiminize dayalı etiket</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
+ <translation>Talep açıldığında gösterilecek, isteğinize dayalı, ödeme talebi ile ilişkilendirilecek bir mesaj. Not: Bu mesaj ödeme ile birlikte Bitcoin şebekesi üzerinden gönderilmeyecektir.</translation>
+ </message>
+ <message>
<location line="+7"/>
- <source>Use this form to request payments. All fields are optional.</source>
- <translation>Ödeme istemek için bu formu kullanın. Tüm alanlar seçime dayalıdır.</translation>
+ <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
+ <translation>Ödeme talep etmek için bu formu kullanın. Tüm alanlar &lt;b&gt;seçime dayalıdır&lt;/b&gt;.</translation>
+ </message>
+ <message>
+ <location line="+39"/>
+ <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
+ <translation>Seçiminize dayalı talep edilecek meblağ. Belli bir meblağ talep etmemek için bunu boş bırakın veya sıfır değerini kullanın.</translation>
</message>
<message>
<location line="+17"/>
@@ -1542,6 +1935,31 @@ Adres: %4
<source>&amp;Request payment</source>
<translation>Ödeme &amp;talep et</translation>
</message>
+ <message>
+ <location line="+47"/>
+ <source>Requested payments</source>
+ <translation>Talep edilen ödemeler</translation>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Show the selected request (does the same as double clicking an entry)</source>
+ <translation>Seçilen talebi göster (bir unsura çift tıklamakla aynı anlama gelir)</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Show</source>
+ <translation>Göster</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Remove the selected entries from the list</source>
+ <translation>Seçilen unsurları listeden kaldır</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Remove</source>
+ <translation>Kaldır</translation>
+ </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
@@ -1562,16 +1980,11 @@ Adres: %4
</message>
<message>
<location line="+7"/>
- <source>&amp;Copy Image</source>
- <translation>Resmi &amp;kopyala</translation>
- </message>
- <message>
- <location line="+7"/>
<source>&amp;Save Image...</source>
<translation>Resmi ka&amp;ydet...</translation>
</message>
<message>
- <location filename="../receiverequestdialog.cpp" line="+58"/>
+ <location filename="../receiverequestdialog.cpp" line="+56"/>
<source>Request payment to %1</source>
<translation>%1 unsuruna ödeme talep et</translation>
</message>
@@ -1593,7 +2006,7 @@ Adres: %4
<message>
<location line="+2"/>
<source>Amount</source>
- <translation>Miktar</translation>
+ <translation>MeblaÄŸ</translation>
</message>
<message>
<location line="+2"/>
@@ -1617,16 +2030,119 @@ Adres: %4
</message>
</context>
<context>
+ <name>RecentRequestsTableModel</name>
+ <message>
+ <location filename="../recentrequeststablemodel.cpp" line="+24"/>
+ <source>Date</source>
+ <translation>Tarih</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Label</source>
+ <translation>Etiket</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Message</source>
+ <translation>Mesaj</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Amount</source>
+ <translation>MeblaÄŸ</translation>
+ </message>
+ <message>
+ <location line="+38"/>
+ <source>(no label)</source>
+ <translation>(boÅŸ etiket)</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>(no message)</source>
+ <translation>(boÅŸ mesaj)</translation>
+ </message>
+</context>
+<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+140"/>
- <location line="+213"/>
+ <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location line="+80"/>
<source>Send Coins</source>
<translation>Bitcoin yolla</translation>
</message>
<message>
- <location line="+50"/>
+ <location line="+76"/>
+ <source>Coin Control Features</source>
+ <translation>Para kontrolü özellikleri</translation>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Inputs...</source>
+ <translation>Girdiler...</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>automatically selected</source>
+ <translation>otomatik seçilmiş</translation>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Insufficient funds!</source>
+ <translation>Yetersiz fon!</translation>
+ </message>
+ <message>
+ <location line="+89"/>
+ <source>Quantity:</source>
+ <translation>Miktar:</translation>
+ </message>
+ <message>
+ <location line="+35"/>
+ <source>Bytes:</source>
+ <translation>Bayt:</translation>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Amount:</source>
+ <translation>MeblaÄŸ:</translation>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Priority:</source>
+ <translation>Öncelik:</translation>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Fee:</source>
+ <translation>Ãœcret:</translation>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Low Output:</source>
+ <translation>Düşük çıktı:</translation>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>After Fee:</source>
+ <translation>Ãœcretten sonra:</translation>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Change:</source>
+ <translation>Para üstü:</translation>
+ </message>
+ <message>
+ <location line="+44"/>
+ <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source>
+ <translation>Bu etkinleştirildiyse fakat para üstü adresi boş ya da geçersizse para üstü yeni oluşturulan bir adrese gönderilecektir.</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Custom change address</source>
+ <translation>Özel para üstü adresi</translation>
+ </message>
+ <message>
+ <location line="+115"/>
<source>Send to multiple recipients at once</source>
<translation>Birçok alıcıya aynı anda gönder</translation>
</message>
@@ -1651,12 +2167,7 @@ Adres: %4
<translation>Bakiye:</translation>
</message>
<message>
- <location line="+10"/>
- <source>123.456 BTC</source>
- <translation>123.456 BTC</translation>
- </message>
- <message>
- <location line="+31"/>
+ <location line="+41"/>
<source>Confirm the send action</source>
<translation>Yollama etkinliÄŸini teyit ediniz</translation>
</message>
@@ -1666,49 +2177,125 @@ Adres: %4
<translation>G&amp;önder</translation>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-154"/>
+ <location filename="../sendcoinsdialog.cpp" line="-228"/>
<source>Confirm send coins</source>
<translation>Gönderiyi teyit ediniz</translation>
</message>
<message>
- <location line="-90"/>
+ <location line="-74"/>
<location line="+5"/>
<location line="+5"/>
+ <location line="+4"/>
<source>%1 to %2</source>
<translation>%1 öğesinden %2 unsuruna</translation>
</message>
<message>
- <location line="+26"/>
+ <location line="-136"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation>Bitcoin adresi giriniz (mesela 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Copy quantity</source>
+ <translation>Miktarı kopyala</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation>Meblağı kopyala</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy fee</source>
+ <translation>Ãœcreti kopyala</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy after fee</source>
+ <translation>Ãœcretten sonrakini kopyala</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy bytes</source>
+ <translation>Baytları kopyala</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy priority</source>
+ <translation>Önceliği kopyala</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy low output</source>
+ <translation>Düşük çıktıyı kopyala</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy change</source>
+ <translation>Para üstünü kopyala</translation>
+ </message>
+ <message>
+ <location line="+170"/>
+ <source>Total Amount %1 (= %2)</source>
+ <translation>Toplam meblaÄŸ %1 (= %2)</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>or</source>
+ <translation>veya</translation>
+ </message>
+ <message>
+ <location line="+202"/>
<source>The recipient address is not valid, please recheck.</source>
<translation>Alıcı adresi geçerli değildir, lütfen denetleyiniz.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The amount to pay must be larger than 0.</source>
<translation>Ödeyeceğiniz tutarın sıfırdan yüksek olması gerekir.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The amount exceeds your balance.</source>
<translation>Tutar bakiyenizden yüksektir.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The total exceeds your balance when the %1 transaction fee is included.</source>
<translation>Toplam, %1 muamele ücreti ilâve edildiğinde bakiyenizi geçmektedir.</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+3"/>
<source>Duplicate address found, can only send to each address once per send operation.</source>
<translation>Çift adres bulundu, belli bir gönderi sırasında her adrese sadece tek bir gönderide bulunulabilir.</translation>
</message>
<message>
+ <location line="+3"/>
+ <source>Transaction creation failed!</source>
+ <translation>Muamelenin oluşturulması başarısız oldu!</translation>
+ </message>
+ <message>
<location line="+4"/>
- <source>Error: Transaction creation failed!</source>
- <translation>Hata: Muamele oluşturması başarısız oldu!</translation>
+ <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
+ <translation>Muamele reddedildi! Cüzdanınızdaki madenî paraların bazıları zaten harcanmış olduğunda bu meydana gelebilir. Örneğin wallet.dat dosyasının bir kopyasını kullandıysanız ve kopyada para harcandığında ancak burada harcandığı işaretlenmediğinde.</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+112"/>
+ <source>Warning: Invalid Bitcoin address</source>
+ <translation>Uyarı: geçersiz Bitcoin adresi</translation>
+ </message>
+ <message>
+ <location line="+21"/>
+ <source>(no label)</source>
+ <translation>(boÅŸ etiket)</translation>
+ </message>
+ <message>
+ <location line="-11"/>
+ <source>Warning: Unknown change address</source>
+ <translation>Uyarı: geçersiz para üstü adresi</translation>
+ </message>
+ <message>
+ <location line="-366"/>
<source>Are you sure you want to send?</source>
<translation>Göndermek istediğinizden emin misiniz?</translation>
</message>
@@ -1718,17 +2305,7 @@ Adres: %4
<translation>muamele ücreti olarak eklendi</translation>
</message>
<message>
- <location line="+6"/>
- <source>Total Amount %1</source>
- <translation>Toplam meblaÄŸ %1</translation>
- </message>
- <message>
- <location line="+20"/>
- <source>Error: The transaction was rejected. This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
- <translation>Hata: Muamele reddedildi. Cüzdanınızdaki madenî paraların bazıları zaten harcanmış olduğunda bu meydana gelebilir. Örneğin wallet.dat dosyasının bir kopyasını kullandıysanız ve kopyada para harcandığında ancak burada harcandığı işaretlenmediğinde.</translation>
- </message>
- <message>
- <location line="+144"/>
+ <location line="+170"/>
<source>Payment request expired</source>
<translation>Ödeme talebinin ömrü doldu</translation>
</message>
@@ -1741,39 +2318,44 @@ Adres: %4
<context>
<name>SendCoinsEntry</name>
<message>
- <location filename="../forms/sendcoinsentry.ui" line="+33"/>
- <location line="+585"/>
+ <location filename="../forms/sendcoinsentry.ui" line="+131"/>
+ <location line="+521"/>
+ <location line="+536"/>
<source>A&amp;mount:</source>
- <translation>M&amp;iktar:</translation>
+ <translation>Mebla&amp;ÄŸ:</translation>
</message>
<message>
- <location line="-572"/>
- <location line="+585"/>
+ <location line="-1152"/>
<source>Pay &amp;To:</source>
- <translation>&amp;Şu kişiye öde:</translation>
+ <translation>&amp;Şu adrese öde:</translation>
</message>
<message>
- <location line="-551"/>
+ <location line="+18"/>
<source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>Ödemenin gönderileceği adres (mesela 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
- <location filename="../sendcoinsentry.cpp" line="+28"/>
+ <location filename="../sendcoinsentry.cpp" line="+30"/>
<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>
<message>
- <location filename="../forms/sendcoinsentry.ui" line="-18"/>
+ <location filename="../forms/sendcoinsentry.ui" line="+57"/>
<source>&amp;Label:</source>
<translation>&amp;Etiket:</translation>
</message>
<message>
- <location line="+28"/>
+ <location line="-50"/>
<source>Choose previously used address</source>
<translation>Önceden kullanılmış adres seç</translation>
</message>
<message>
- <location line="+10"/>
+ <location line="-40"/>
+ <source>This is a normal payment.</source>
+ <translation>Bu, normal bir ödemedir.</translation>
+ </message>
+ <message>
+ <location line="+50"/>
<source>Alt+A</source>
<translation>Alt+A</translation>
</message>
@@ -1789,16 +2371,45 @@ Adres: %4
</message>
<message>
<location line="+7"/>
- <source>Remove this recipient</source>
- <translation>Bu alıcıyı kaldır</translation>
+ <location line="+524"/>
+ <location line="+536"/>
+ <source>Remove this entry</source>
+ <translation>Bu unsuru kaldır</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="-1008"/>
+ <source>Message:</source>
+ <translation>Mesaj:</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation>Bitcoin URI&apos;siyle ilişkili ve bilginiz için muameleyle saklanacak bir mesaj. Not: Bu mesaj Bitcoin şebekesi üzerinden gönderilmeyecektir.</translation>
+ </message>
+ <message>
+ <location line="+958"/>
+ <source>This is a verified payment request.</source>
+ <translation>Bu, teyit edilmiş bir ödeme talebidir.</translation>
+ </message>
+ <message>
+ <location line="-991"/>
<source>Enter a label for this address to add it to the list of used addresses</source>
<translation>Kullanılmış adres listesine eklemek için bu adrese bir etiket girin</translation>
</message>
<message>
- <location line="+465"/>
+ <location line="+459"/>
+ <source>This is an unverified payment request.</source>
+ <translation>Bu, teyit edilmemiş bir ödeme talebidir.</translation>
+ </message>
+ <message>
+ <location line="+18"/>
+ <location line="+532"/>
+ <source>Pay To:</source>
+ <translation>Şu adrese öde:</translation>
+ </message>
+ <message>
+ <location line="-498"/>
+ <location line="+536"/>
<source>Memo:</source>
<translation>Not:</translation>
</message>
@@ -1809,6 +2420,19 @@ Adres: %4
</message>
</context>
<context>
+ <name>ShutdownWindow</name>
+ <message>
+ <location filename="../utilitydialog.cpp" line="+48"/>
+ <source>Bitcoin Core is shutting down...</source>
+ <translation>Bitcoin Çekirdeği kapanıyor...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Do not shut down the computer until this window disappears.</source>
+ <translation>Bu pencere kalkıncaya dek bilgisayarı kapatmayınız.</translation>
+ </message>
+</context>
+<context>
<name>SignVerifyMessageDialog</name>
<message>
<location filename="../forms/signverifymessagedialog.ui" line="+14"/>
@@ -1816,7 +2440,7 @@ Adres: %4
<translation>Ä°mzalar - Mesaj Ä°mzala / Kontrol et</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+10"/>
<source>&amp;Sign Message</source>
<translation>Mesaj &amp;imzala</translation>
</message>
@@ -1919,7 +2543,7 @@ Adres: %4
<translation>Tüm mesaj kontrolü alanlarını sıfırla</translation>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+27"/>
+ <location filename="../signverifymessagedialog.cpp" line="+29"/>
<location line="+3"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation>Bitcoin adresi giriniz (mesela 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
@@ -1935,7 +2559,7 @@ Adres: %4
<translation>Bitcoin imzası gir</translation>
</message>
<message>
- <location line="+85"/>
+ <location line="+84"/>
<location line="+81"/>
<source>The entered address is invalid.</source>
<translation>Girilen adres geçersizdir.</translation>
@@ -2004,9 +2628,14 @@ Adres: %4
<context>
<name>SplashScreen</name>
<message>
- <location filename="../splashscreen.cpp" line="+23"/>
- <source>The Bitcoin developers</source>
- <translation>Bitcoin geliÅŸtiricileri</translation>
+ <location filename="../splashscreen.cpp" line="+28"/>
+ <source>Bitcoin Core</source>
+ <translation>Bitcoin Çekirdeği</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>The Bitcoin Core developers</source>
+ <translation>Bitcoin Çekirdeği geliştiricileri</translation>
</message>
<message>
<location line="+1"/>
@@ -2017,7 +2646,7 @@ Adres: %4
<context>
<name>TrafficGraphWidget</name>
<message>
- <location filename="../trafficgraphwidget.cpp" line="+75"/>
+ <location filename="../trafficgraphwidget.cpp" line="+79"/>
<source>KB/s</source>
<translation>KB/s</translation>
</message>
@@ -2025,7 +2654,7 @@ Adres: %4
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="+22"/>
+ <location filename="../transactiondesc.cpp" line="+28"/>
<source>Open until %1</source>
<translation>%1 değerine dek açık</translation>
</message>
@@ -2098,12 +2727,12 @@ Adres: %4
<location line="+12"/>
<location line="+45"/>
<location line="+17"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Credit</source>
<translation>Gider</translation>
</message>
<message numerus="yes">
- <location line="-120"/>
+ <location line="-125"/>
<source>matures in %n more block(s)</source>
<translation><numerusform>%n ek blok sonrasında olgunlaşacak</numerusform><numerusform>%n ek blok sonrasında olgunlaşacak</numerusform></translation>
</message>
@@ -2116,27 +2745,28 @@ Adres: %4
<location line="+44"/>
<location line="+8"/>
<location line="+15"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Debit</source>
<translation>Gelir</translation>
</message>
<message>
- <location line="-57"/>
+ <location line="-62"/>
<source>Transaction fee</source>
<translation>Muamele ücreti</translation>
</message>
<message>
<location line="+16"/>
<source>Net amount</source>
- <translation>Net miktar</translation>
+ <translation>Net meblaÄŸ</translation>
</message>
<message>
<location line="+6"/>
+ <location line="+9"/>
<source>Message</source>
<translation>Mesaj</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="-7"/>
<source>Comment</source>
<translation>Yorum</translation>
</message>
@@ -2146,7 +2776,7 @@ Adres: %4
<translation>Muamele tanımlayıcı</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+18"/>
<source>Merchant</source>
<translation>Tüccar</translation>
</message>
@@ -2173,7 +2803,7 @@ Adres: %4
<message>
<location line="+23"/>
<source>Amount</source>
- <translation>Miktar</translation>
+ <translation>MeblaÄŸ</translation>
</message>
<message>
<location line="+1"/>
@@ -2186,7 +2816,7 @@ Adres: %4
<translation>yanlış</translation>
</message>
<message>
- <location line="-227"/>
+ <location line="-232"/>
<source>, has not been successfully broadcast yet</source>
<translation>, henüz başarılı bir şekilde yayınlanmadı</translation>
</message>
@@ -2217,7 +2847,7 @@ Adres: %4
<context>
<name>TransactionTableModel</name>
<message>
- <location filename="../transactiontablemodel.cpp" line="+227"/>
+ <location filename="../transactiontablemodel.cpp" line="+234"/>
<source>Date</source>
<translation>Tarih</translation>
</message>
@@ -2234,10 +2864,15 @@ Adres: %4
<message>
<location line="+0"/>
<source>Amount</source>
- <translation>Miktar</translation>
+ <translation>MeblaÄŸ</translation>
+ </message>
+ <message>
+ <location line="+59"/>
+ <source>Immature (%1 confirmations, will be available after %2)</source>
+ <translation>Olgunlaşmamış (%1 teyit, %2 teyit ardından kullanılabilir olacaktır)</translation>
</message>
<message numerus="yes">
- <location line="+57"/>
+ <location line="+16"/>
<source>Open for %n more block(s)</source>
<translation><numerusform>%n ilâve blok için açık</numerusform><numerusform>%n ilâve blok için açık</numerusform></translation>
</message>
@@ -2257,17 +2892,13 @@ Adres: %4
<translation>Doğrulanmadı (%1 (toplam %2 üzerinden) teyit)</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="-22"/>
+ <location line="+25"/>
<source>Confirmed (%1 confirmations)</source>
<translation>Doğrulandı (%1 teyit)</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>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"/>
+ <location line="-22"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation>Bu blok başka hiçbir düğüm tarafından alınmamıştır ve muhtemelen kabul edilmeyecektir!</translation>
</message>
@@ -2277,7 +2908,7 @@ Adres: %4
<translation>OluÅŸturuldu ama kabul edilmedi</translation>
</message>
<message>
- <location line="+43"/>
+ <location line="+62"/>
<source>Received with</source>
<translation>Şununla alındı</translation>
</message>
@@ -2329,13 +2960,13 @@ Adres: %4
<message>
<location line="+2"/>
<source>Amount removed from or added to balance.</source>
- <translation>Bakiyeden alınan ya da bakiyeye eklenen miktar.</translation>
+ <translation>Bakiyeden alınan ya da bakiyeye eklenen meblağ.</translation>
</message>
</context>
<context>
<name>TransactionView</name>
<message>
- <location filename="../transactionview.cpp" line="+52"/>
+ <location filename="../transactionview.cpp" line="+57"/>
<location line="+16"/>
<source>All</source>
<translation>Hepsi</translation>
@@ -2396,14 +3027,14 @@ Adres: %4
<translation>DiÄŸer</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+6"/>
<source>Enter address or label to search</source>
<translation>Aranacak adres ya da etiket giriniz</translation>
</message>
<message>
- <location line="+7"/>
+ <location line="+6"/>
<source>Min amount</source>
- <translation>Asgari miktar</translation>
+ <translation>Asgari meblaÄŸ</translation>
</message>
<message>
<location line="+34"/>
@@ -2418,7 +3049,7 @@ Adres: %4
<message>
<location line="+1"/>
<source>Copy amount</source>
- <translation>Miktarı kopyala</translation>
+ <translation>Meblağı kopyala</translation>
</message>
<message>
<location line="+1"/>
@@ -2436,17 +3067,37 @@ Adres: %4
<translation>Muamele detaylarını göster</translation>
</message>
<message>
- <location line="+143"/>
- <source>Export Transaction Data</source>
- <translation>Muamele verilerini dışa aktar</translation>
+ <location line="+142"/>
+ <source>Export Transaction History</source>
+ <translation>Muamele tarihçesini dışa aktar</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+19"/>
+ <source>Exporting Failed</source>
+ <translation>Dışa aktarım başarısız oldu</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>There was an error trying to save the transaction history to %1.</source>
+ <translation>Muamele tarihçesinin %1 konumuna kaydedilmesi sırasında bir hata meydana geldi.</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Exporting Successful</source>
+ <translation>Dışa aktarım başarılı oldu</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The transaction history was successfully saved to %1.</source>
+ <translation>Muamele tarihçesi başarılı bir şekilde %1 konumuna kaydedildi.</translation>
+ </message>
+ <message>
+ <location line="-22"/>
<source>Comma separated file (*.csv)</source>
<translation>Virgülle ayrılmış değerler dosyası (*.csv)</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+9"/>
<source>Confirmed</source>
<translation>Doğrulandı</translation>
</message>
@@ -2473,7 +3124,7 @@ Adres: %4
<message>
<location line="+1"/>
<source>Amount</source>
- <translation>Miktar</translation>
+ <translation>MeblaÄŸ</translation>
</message>
<message>
<location line="+1"/>
@@ -2481,17 +3132,7 @@ Adres: %4
<translation>Tanımlayıcı</translation>
</message>
<message>
- <location line="+4"/>
- <source>Error exporting</source>
- <translation>Dışa aktarımda hata oluştu</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation>%1 dosyasına yazılamadı.</translation>
- </message>
- <message>
- <location line="+100"/>
+ <location line="+107"/>
<source>Range:</source>
<translation>Aralık:</translation>
</message>
@@ -2502,9 +3143,17 @@ Adres: %4
</message>
</context>
<context>
+ <name>WalletFrame</name>
+ <message>
+ <location filename="../walletframe.cpp" line="+26"/>
+ <source>No wallet has been loaded.</source>
+ <translation>Hiçbir cüzdan yüklenmemiştir.</translation>
+ </message>
+</context>
+<context>
<name>WalletModel</name>
<message>
- <location filename="../walletmodel.cpp" line="+218"/>
+ <location filename="../walletmodel.cpp" line="+245"/>
<source>Send Coins</source>
<translation>Bitcoin yolla</translation>
</message>
@@ -2512,7 +3161,7 @@ Adres: %4
<context>
<name>WalletView</name>
<message>
- <location filename="../walletview.cpp" line="+46"/>
+ <location filename="../walletview.cpp" line="+43"/>
<source>&amp;Export</source>
<translation>&amp;Dışa aktar</translation>
</message>
@@ -2522,65 +3171,60 @@ Adres: %4
<translation>Güncel sekmedeki verileri bir dosyaya aktar</translation>
</message>
<message>
- <location line="+183"/>
+ <location line="+181"/>
<source>Backup Wallet</source>
<translation>Cüzdanı Yedekle</translation>
</message>
<message>
- <location line="+0"/>
+ <location line="+1"/>
<source>Wallet Data (*.dat)</source>
<translation>Cüzdan verileri (*.dat)</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="+6"/>
<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>
+ <source>There was an error trying to save the wallet data to %1.</source>
+ <translation>Cüzdan verilerinin %1 konumuna kaydedilmesi sırasında bir hata meydana geldi.</translation>
</message>
<message>
<location line="+4"/>
- <source>Backup Successful</source>
- <translation>Yedekleme başarılı</translation>
+ <source>The wallet data was successfully saved to %1.</source>
+ <translation>Cüzdan verileri %1 konumuna başarıyla kaydedildi.</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>
+ <source>Backup Successful</source>
+ <translation>Yedekleme başarılı</translation>
</message>
</context>
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+102"/>
- <source>Bitcoin version</source>
- <translation>Bitcoin sürümü</translation>
- </message>
- <message>
- <location line="+107"/>
+ <location filename="../bitcoinstrings.cpp" line="+221"/>
<source>Usage:</source>
<translation>Kullanım:</translation>
</message>
<message>
- <location line="-55"/>
+ <location line="-54"/>
<source>List commands</source>
<translation>Komutları listele</translation>
</message>
<message>
- <location line="-13"/>
+ <location line="-14"/>
<source>Get help for a command</source>
<translation>Bir komut için yardım al</translation>
</message>
<message>
- <location line="+25"/>
+ <location line="+26"/>
<source>Options:</source>
<translation>Seçenekler:</translation>
</message>
<message>
- <location line="+24"/>
+ <location line="+22"/>
<source>Specify configuration file (default: bitcoin.conf)</source>
<translation>Yapılandırma dosyası belirt (varsayılan: bitcoin.conf)</translation>
</message>
@@ -2600,7 +3244,7 @@ Adres: %4
<translation>Veritabanı önbellek boyutunu megabayt olarak belirt (varsayılan: 25)</translation>
</message>
<message>
- <location line="-28"/>
+ <location line="-26"/>
<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>
@@ -2610,7 +3254,7 @@ Adres: %4
<translation>Eşler ile en çok &lt;n&gt; adet bağlantı kur (varsayılan: 125)</translation>
</message>
<message>
- <location line="-49"/>
+ <location line="-51"/>
<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>
@@ -2620,37 +3264,37 @@ Adres: %4
<translation>Kendi genel adresinizi tanımlayın</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<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="-142"/>
+ <location line="-148"/>
<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="-33"/>
+ <location line="-36"/>
<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="+31"/>
+ <location line="+34"/>
<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="+40"/>
+ <location line="+45"/>
<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="+79"/>
+ <location line="+80"/>
<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="+40"/>
+ <location line="+39"/>
<source>Use the test network</source>
<translation>Deneme ÅŸebekesini kullan</translation>
</message>
@@ -2660,7 +3304,7 @@ Adres: %4
<translation>Dışarıdan gelen bağlantıları kabul et (varsayılan: -proxy veya -connect yoksa 1)</translation>
</message>
<message>
- <location line="-87"/>
+ <location line="-95"/>
<source>%s, you must set a rpcpassword in the configuration file:
%s
It is recommended you use the following random password:
@@ -2711,13 +3355,18 @@ mesela: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
</message>
<message>
<location line="+4"/>
+ <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</source>
+ <translation>Blokların anında çözülebileceği özel bir zincir kullanan regresyon deneme kipine gir.</translation>
+ </message>
+ <message>
+ <location line="+3"/>
<source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
<translation>Hata: Muamele reddedildi! Cüzdanınızdaki madenî paraların bazıları zaten harcanmış olduğunda bu meydana gelebilir. Örneğin wallet.dat dosyasının bir kopyasını kullandıysanız ve kopyada para harcandığında ancak burada harcandığı işaretlenmediğinde.</translation>
</message>
<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>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>
+ <translation>Hata: Muamelenin meblağı, 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="+6"/>
@@ -2725,17 +3374,17 @@ mesela: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
<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="+6"/>
+ <location line="+18"/>
<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>
<message>
<location line="+5"/>
+ <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source>
+ <translation>Eşlere gizli Tor servisleri ile ulaşmak için ayrı SOCKS5 vekil sunucusu kullan (varsayılan: -proxy)</translation>
+ </message>
+ <message>
+ <location line="+3"/>
<source>Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction.</source>
<translation>Uyarı: -paytxfee çok yüksek bir değere ayarlanmış! Bu, muamele gönderirseniz ödeyeceğiniz muamele ücretidir.</translation>
</message>
@@ -2765,17 +3414,27 @@ mesela: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Uyarı: wallet.dat bozuk, veriler geri kazanıldı! Özgün wallet.dat, wallet.{zamandamgası}.bak olarak %s klasörüne kaydedildi; bakiyeniz ya da muameleleriniz yanlışsa bir yedeklemeden tekrar yüklemeniz gerekir.</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="+9"/>
+ <source>&lt;category&gt; can be:</source>
+ <translation>&lt;kategori&gt; ÅŸunlar olabilir:</translation>
+ </message>
+ <message>
+ <location line="+6"/>
<source>Attempt to recover private keys from a corrupt wallet.dat</source>
<translation>Bozuk bir wallet.dat dosyasından özel anahtarları geri kazanmayı dene</translation>
</message>
<message>
<location line="+1"/>
+ <source>Bitcoin Core Daemon</source>
+ <translation>Bitcoin Çekirdek servisi</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Bitcoin RPC client version</source>
<translation>Bitcoin RPC istemci sürümü</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
<source>Block creation options:</source>
<translation>Blok oluşturma seçenekleri:</translation>
</message>
@@ -2785,7 +3444,12 @@ mesela: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Sadece belirtilen düğüme veya düğümlere bağlan</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
+ <source>Connect through SOCKS proxy</source>
+ <translation>SOCKS vekil sunucusuyla baÄŸlan</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect to JSON-RPC on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation>&lt;port&gt; numarasında JSON-RPC&apos;ye bağlan (varsayılan: 8332 veya testnet: 18332)</translation>
</message>
@@ -2801,6 +3465,11 @@ mesela: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
</message>
<message>
<location line="+1"/>
+ <source>Do not load the wallet and disable wallet RPC calls</source>
+ <translation>Cüzdanı yükleme ve cüzdan RPC çağrılarını devre dışı bırak</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>
@@ -2895,7 +3564,12 @@ mesela: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Geri alma verilerinin yazılamadı</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
+ <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="+1"/>
<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>
@@ -2915,6 +3589,11 @@ mesela: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Blok kontrolünün ne kadar derin olacağı (0 ilâ 4, varsayılan: 3)</translation>
</message>
<message>
+ <location line="+1"/>
+ <source>If &lt;category&gt; is not supplied, output all debugging information.</source>
+ <translation>&lt;kategori&gt; sağlanmamışsa tüm hata ayıklama verilerini dök.</translation>
+ </message>
+ <message>
<location line="+2"/>
<source>Incorrect or no genesis block found. Wrong datadir for network?</source>
<translation>Yanlış ya da bulunamamış doğuş bloku. Şebeke için yanlış veri klasörü mü?</translation>
@@ -2930,17 +3609,37 @@ mesela: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Kafi derecede dosya tanımlayıcıları mevcut değil.</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+5"/>
+ <source>Prepend debug output with timestamp (default: 1)</source>
+ <translation>Hata ayıklama verilerinin önüne zaman damgası ekle (varsayılan: 1)</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>RPC client options:</source>
+ <translation>RPC istemci seçenekleri:</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<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="+6"/>
+ <location line="+5"/>
+ <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source>
+ <translation>-proxy için SOCKS sürümünü seç (4 veya 5, varsayılan: 5)</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Send command to Bitcoin server</source>
<translation>Bitcoin sunucusuna komut gönder</translation>
</message>
<message>
- <location line="+10"/>
+ <location line="+7"/>
+ <source>Set maximum block size in bytes (default: %d)</source>
+ <translation>Azami blok boyutunu bayt olarak ayarla (varsayılan: %d)</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Set the number of threads to service RPC calls (default: 4)</source>
<translation>RPC aramaları için iş parçacığı sayısını belirle (varsayılan: 4)</translation>
</message>
@@ -2955,12 +3654,17 @@ mesela: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Bitcoin sunucusunu baÅŸlat</translation>
</message>
<message>
- <location line="+12"/>
+ <location line="+3"/>
+ <source>This is intended for regression testing tools and app development.</source>
+ <translation>Bu, regresyon deneme araçları ve uygulama geliştirmesi için tasarlanmıştır. </translation>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Usage (deprecated, use bitcoin-cli):</source>
<translation>Kullanım (önerilmemektedir, bitcoin-cli kullanın):</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+7"/>
<source>Verifying blocks...</source>
<translation>Bloklar kontrol ediliyor...</translation>
</message>
@@ -2971,31 +3675,56 @@ mesela: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
</message>
<message>
<location line="+1"/>
+ <source>Wait for RPC server to start</source>
+ <translation>RPC sunucusunun başlamasını bekle</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Wallet %s resides outside data directory %s</source>
<translation>%s cüzdan %s veri klasörünün dışında bulunuyor</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+2"/>
+ <source>Wallet options:</source>
+ <translation>Cüzdan seçenekleri:</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source>
+ <translation>Uyarı: eskimiş seçenek -debugnet görmezden gelinir, -debug=net kullanınız</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>You need to rebuild the database using -reindex to change -txindex</source>
<translation>-txindex&apos;i değiştirmek için veritabanını -reindex kullanarak tekrar inşa etmeniz gerekmektedir</translation>
</message>
<message>
- <location line="-78"/>
+ <location line="-79"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation>Harici blk000??.dat dosyasından blokları içe aktarır</translation>
</message>
<message>
- <location line="-98"/>
+ <location line="-105"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation>İlgili bir uyarı alındığında ya da gerçekten uzun bir çatallama gördüğümüzde komutu çalıştır (komuttaki %s mesaj ile değiştirilir)</translation>
</message>
<message>
- <location line="+17"/>
+ <location line="+14"/>
+ <source>Output debugging information (default: 0, supplying &lt;category&gt; is optional)</source>
+ <translation>Hata ayıklama bilgisi dök (varsayılan:0, &lt;kategori&gt; sağlanması seçime dayalıdır)</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
+ <translation>Yüksek öncelikli/düşük ücretli muamelelerin azami boyutunu bayt olarak ayarla (varsayılan: %d)</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
<translation>Betik kontrolü iş parçacığı sayısını belirt (azami 16, 0 = otomatik, &lt;0 = bu sayıda çekirdeği boş bırak, varsayılan: 0)</translation>
</message>
<message>
- <location line="+83"/>
+ <location line="+89"/>
<source>Information</source>
<translation>Bilgi</translation>
</message>
@@ -3035,47 +3764,17 @@ mesela: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Sadece &lt;net&gt; şebekesindeki düğümlere bağlan (IPv4, IPv6 ya da Tor)</translation>
</message>
<message>
- <location line="+2"/>
- <source>Output extra debugging information. Implies all other -debug* options</source>
- <translation>İlâve hata ayıklama verileri çıkart. Diğer tüm -debug* seçeneklerini ima eder</translation>
- </message>
- <message>
- <location line="+1"/>
- <source>Output extra network debugging information</source>
- <translation>İlâve şebeke hata ayıklama verileri çıkart</translation>
- </message>
- <message>
- <location line="+2"/>
- <source>Prepend debug output with timestamp</source>
- <translation>Hata ayıklama çıktısına tarih ön ekleri ilâve et</translation>
- </message>
- <message>
- <location line="+5"/>
+ <location line="+9"/>
<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>
<message>
- <location line="+1"/>
- <source>Select the version of socks proxy to use (4-5, default: 5)</source>
- <translation>Kullanılacak socks vekil sunucu sürümünü seç (4-5, varsayılan: 5)</translation>
- </message>
- <message>
- <location line="+3"/>
+ <location line="+4"/>
<source>Send trace/debug info to console instead of debug.log file</source>
<translation>Trace/hata ayıklama verilerini debug.log dosyası yerine konsola gönder</translation>
</message>
<message>
- <location line="+1"/>
- <source>Send trace/debug info to debugger</source>
- <translation>Hata ayıklayıcıya -debugger- trace/hata ayıklama verileri gönder</translation>
- </message>
- <message>
- <location line="+5"/>
- <source>Set maximum block size in bytes (default: 250000)</source>
- <translation>Bayt olarak azami blok boyutunu tanımla (varsayılan: 250000)</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+6"/>
<source>Set minimum block size in bytes (default: 0)</source>
<translation>Bayt olarak asgari blok boyutunu tanımla (varsayılan: 0)</translation>
</message>
@@ -3100,7 +3799,7 @@ mesela: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Sistem hatası:</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Transaction amount too small</source>
<translation>Muamele meblağı çok düşük</translation>
</message>
@@ -3125,32 +3824,32 @@ mesela: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Dinlenecek portu haritalamak için UPnP kullan (varsayılan: dinlenildiğinde 1)</translation>
</message>
<message>
- <location line="+1"/>
- <source>Use proxy to reach tor hidden services (default: same as -proxy)</source>
- <translation>Gizli tor servislerine erişmek için vekil sunucu kullan (varsayılan: -proxy ile aynısı)</translation>
- </message>
- <message>
<location line="+2"/>
<source>Username for JSON-RPC connections</source>
<translation>JSON-RPC bağlantıları için kullanıcı ismi</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="+7"/>
<source>Warning</source>
<translation>Uyarı</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Warning: This version is obsolete, upgrade required!</source>
<translation>Uyarı: Bu sürüm çok eskidir, güncellemeniz gerekir!</translation>
</message>
<message>
<location line="+2"/>
+ <source>version</source>
+ <translation>sürüm</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="-54"/>
+ <location line="-58"/>
<source>Password for JSON-RPC connections</source>
<translation>JSON-RPC bağlantıları için parola</translation>
</message>
@@ -3160,27 +3859,27 @@ mesela: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Belirtilen İP adresinden JSON-RPC bağlantılarını kabul et</translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<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="-126"/>
+ <location line="-132"/>
<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="+155"/>
+ <location line="+161"/>
<source>Upgrade wallet to latest format</source>
<translation>Cüzdanı en yeni biçime güncelle</translation>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<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>
<message>
- <location line="-12"/>
+ <location line="-11"/>
<source>Rescan the block chain for missing wallet transactions</source>
<translation>Blok zincirini eksik cüzdan muameleleri için tekrar tara</translation>
</message>
@@ -3190,7 +3889,7 @@ mesela: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>JSON-RPC bağlantıları için OpenSSL (https) kullan</translation>
</message>
<message>
- <location line="-29"/>
+ <location line="-30"/>
<source>Server certificate file (default: server.cert)</source>
<translation>Sunucu sertifika dosyası (varsayılan: server.cert)</translation>
</message>
@@ -3205,27 +3904,22 @@ mesela: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Bu yardım mesajı</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Unable to bind to %s on this computer (bind returned error %d, %s)</source>
<translation>Bu bilgisayarda %s unsuruna bağlanılamadı. (bind şu hatayı iletti: %d, %s)</translation>
</message>
<message>
- <location line="-95"/>
- <source>Connect through socks proxy</source>
- <translation>Socks vekil sunucusu vasıtasıyla bağlan</translation>
- </message>
- <message>
- <location line="-11"/>
+ <location line="-107"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation>-addnode, -seednode ve -connect için DNS aramalarına izin ver</translation>
</message>
<message>
- <location line="+58"/>
+ <location line="+60"/>
<source>Loading addresses...</source>
<translation>Adresler yükleniyor...</translation>
</message>
<message>
- <location line="-36"/>
+ <location line="-37"/>
<source>Error loading wallet.dat: Wallet corrupted</source>
<translation>wallet.dat dosyasının yüklenmesinde hata oluştu: bozuk cüzdan</translation>
</message>
@@ -3245,12 +3939,12 @@ mesela: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>wallet.dat dosyasının yüklenmesinde hata oluştu</translation>
</message>
<message>
- <location line="+30"/>
+ <location line="+31"/>
<source>Invalid -proxy address: &apos;%s&apos;</source>
<translation>Geçersiz -proxy adresi: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+57"/>
+ <location line="+56"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation>-onlynet için bilinmeyen bir şebeke belirtildi: &apos;%s&apos;</translation>
</message>
@@ -3260,7 +3954,7 @@ mesela: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Bilinmeyen bir -socks vekil sürümü talep edildi: %i</translation>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation>-bind adresi çözümlenemedi: &apos;%s&apos;</translation>
</message>
@@ -3270,14 +3964,14 @@ mesela: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>-externalip adresi çözümlenemedi: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+46"/>
+ <location line="+48"/>
<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>
+ <translation>-paytxfee=&lt;meblağ&gt; için geçersiz meblağ: &apos;%s&apos;</translation>
</message>
<message>
<location line="+1"/>
<source>Invalid amount</source>
- <translation>Geçersiz miktar</translation>
+ <translation>Geçersiz meblağ</translation>
</message>
<message>
<location line="-6"/>
@@ -3290,27 +3984,22 @@ mesela: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Blok indeksi yükleniyor...</translation>
</message>
<message>
- <location line="-60"/>
+ <location line="-62"/>
<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>
<message>
- <location line="-28"/>
+ <location line="-32"/>
<source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source>
<translation>Bu bilgisayarda %s unsuruna bağlanılamadı. Bitcoin muhtemelen hâlihazırda çalışmaktadır.</translation>
</message>
<message>
- <location line="+69"/>
- <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="+20"/>
+ <location line="+95"/>
<source>Loading wallet...</source>
<translation>Cüzdan yükleniyor...</translation>
</message>
<message>
- <location line="-54"/>
+ <location line="-56"/>
<source>Cannot downgrade wallet</source>
<translation>Cüzdan eski biçime geri alınamaz</translation>
</message>
@@ -3320,7 +4009,7 @@ mesela: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Varsayılan adres yazılamadı</translation>
</message>
<message>
- <location line="+66"/>
+ <location line="+67"/>
<source>Rescanning...</source>
<translation>Yeniden tarama...</translation>
</message>
@@ -3340,7 +4029,7 @@ mesela: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com
<translation>Hata</translation>
</message>
<message>
- <location line="-33"/>
+ <location line="-35"/>
<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 41dcd4b0aa..a52245ea73 100644
--- a/src/qt/locale/bitcoin_uk.ts
+++ b/src/qt/locale/bitcoin_uk.ts
@@ -27,14 +27,14 @@ This product includes software developed by the OpenSSL Project for use in the O
Цей продукт включає в Ñебе програмне забезпеченнÑ, розроблене в рамках проекту OpenSSL (http://www.openssl.org/), криптографічне програмне забезпеченнÑ, напиÑане Еріком Янгом (eay@cryptsoft.com), та функції Ð´Ð»Ñ Ñ€Ð¾Ð±Ð¾Ñ‚Ð¸ з UPnP, напиÑані ТомаÑом Бернардом.</translation>
</message>
<message>
- <location filename="../aboutdialog.cpp" line="+19"/>
+ <location filename="../utilitydialog.cpp" line="+29"/>
<source>Copyright</source>
<translation>ÐвторÑьке право</translation>
</message>
<message>
<location line="+0"/>
- <source>The Bitcoin developers</source>
- <translation>Розробники Bitcoin</translation>
+ <source>The Bitcoin Core developers</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -151,13 +151,13 @@ This product includes software developed by the OpenSSL Project for use in the O
</message>
<message>
<location line="+13"/>
- <source>Error exporting</source>
- <translation>Помилка при екÑпортуванні</translation>
+ <source>Exporting Failed</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation>Ðеможливо запиÑати у файл %1.</translation>
+ <location line="+1"/>
+ <source>There was an error trying to save the address list to %1.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -322,22 +322,27 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+260"/>
+ <location filename="../bitcoingui.cpp" line="+295"/>
<source>Sign &amp;message...</source>
<translation>&amp;ПідпиÑати повідомленнÑ...</translation>
</message>
<message>
- <location line="+290"/>
+ <location line="+335"/>
<source>Synchronizing with network...</source>
<translation>Ð¡Ð¸Ð½Ñ…Ñ€Ð¾Ð½Ñ–Ð·Ð°Ñ†Ñ–Ñ Ð· мережею...</translation>
</message>
<message>
- <location line="-360"/>
+ <location line="-407"/>
<source>&amp;Overview</source>
<translation>&amp;ОглÑд</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="-137"/>
+ <source>Node</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+138"/>
<source>Show general overview of wallet</source>
<translation>Показати загальний оглÑд гаманцÑ</translation>
</message>
@@ -352,7 +357,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>ПереглÑнути Ñ–Ñторію транзакцій</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>E&amp;xit</source>
<translation>&amp;Вихід</translation>
</message>
@@ -398,7 +403,22 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Змінити парол&amp;ь...</translation>
</message>
<message>
- <location line="+295"/>
+ <location line="+10"/>
+ <source>&amp;Sending addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Receiving addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open &amp;URI...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+325"/>
<source>Importing blocks from disk...</source>
<translation>Імпорт блоків з диÑку...</translation>
</message>
@@ -408,12 +428,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>ПереіндекÑÐ°Ñ†Ñ–Ñ Ð±Ð»Ð¾ÐºÑ–Ð² на диÑку ...</translation>
</message>
<message>
- <location line="-358"/>
+ <location line="-405"/>
<source>Send coins to a Bitcoin address</source>
<translation>Відправити монети на вказану адреÑу</translation>
</message>
<message>
- <location line="+47"/>
+ <location line="+49"/>
<source>Modify configuration options for Bitcoin</source>
<translation>Редагувати параметри</translation>
</message>
@@ -443,18 +463,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Перевірити повідомленнÑ...</translation>
</message>
<message>
- <location line="+375"/>
+ <location line="+430"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-563"/>
- <location line="+10"/>
+ <location line="-643"/>
<source>Wallet</source>
<translation>Гаманець</translation>
</message>
<message>
- <location line="+113"/>
+ <location line="+146"/>
<source>&amp;Send</source>
<translation>&amp;Відправити</translation>
</message>
@@ -464,7 +483,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>&amp;Отримати</translation>
</message>
<message>
- <location line="+44"/>
+ <location line="+46"/>
<location line="+2"/>
<source>&amp;Show / Hide</source>
<translation>Показати / Приховати</translation>
@@ -490,86 +509,80 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Перевірте Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð´Ð»Ñ Ð²Ð¿ÐµÐ²Ð½ÐµÐ½Ð¾ÑÑ‚Ñ–, що воно підпиÑано вказаною Bitcoin-адреÑою</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+48"/>
<source>&amp;File</source>
<translation>&amp;Файл</translation>
</message>
<message>
- <location line="+11"/>
+ <location line="+14"/>
<source>&amp;Settings</source>
<translation>&amp;ÐалаштуваннÑ</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>&amp;Help</source>
<translation>&amp;Довідка</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+15"/>
<source>Tabs toolbar</source>
<translation>Панель вкладок</translation>
</message>
<message>
- <location line="-244"/>
- <location line="+321"/>
+ <location line="-284"/>
+ <location line="+376"/>
<source>[testnet]</source>
<translation>[теÑтова мережа]</translation>
</message>
<message>
- <location line="-331"/>
- <location line="+10"/>
+ <location line="-401"/>
<source>Bitcoin Core</source>
<translation>Bitcoin Ядро</translation>
</message>
<message>
- <location line="+121"/>
+ <location line="+163"/>
<source>Request payments (generates QR codes and bitcoin: URIs)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+27"/>
+ <location line="+29"/>
<location line="+2"/>
<source>&amp;About Bitcoin Core</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+34"/>
- <source>&amp;Used sending addresses...</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+35"/>
<source>Show the list of used sending addresses and labels</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Used &amp;receiving addresses...</source>
+ <location line="+2"/>
+ <source>Show the list of used receiving addresses and labels</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Show the list of used receiving addresses and labels</source>
+ <location line="+3"/>
+ <source>Open a bitcoin: URI or payment request</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+2"/>
- <source>Open URI...</source>
+ <source>&amp;Command-line options</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
- <source>Open a bitcoin: URI or payment request</source>
+ <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+126"/>
+ <location line="+159"/>
<location line="+5"/>
<source>Bitcoin client</source>
<translation>Bitcoin-клієнт</translation>
</message>
<message numerus="yes">
- <location line="+133"/>
+ <location line="+142"/>
<source>%n active connection(s) to Bitcoin network</source>
<translation><numerusform>%n активне з&apos;Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð· мережею</numerusform><numerusform>%n активні з&apos;Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð· мережею</numerusform><numerusform>%n активних з&apos;єднань з мережею</numerusform></translation>
</message>
@@ -589,7 +602,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>Оброблено %1 блоків Ñ–Ñторії транзакцій.</translation>
</message>
<message numerus="yes">
- <location line="+20"/>
+ <location line="+23"/>
<source>%n hour(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -609,7 +622,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
+ <location line="+21"/>
<source>Last received block was generated %1 ago.</source>
<translation type="unfinished"/>
</message>
@@ -634,27 +647,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>ІнформаціÑ</translation>
</message>
<message>
- <location line="+77"/>
- <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="-152"/>
+ <location line="-85"/>
<source>Up to date</source>
<translation>Синхронізовано</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Catching up...</source>
<translation>СинхронізуєтьÑÑ...</translation>
</message>
<message>
- <location line="+124"/>
- <source>Confirm transaction fee</source>
- <translation>Підтвердити коміÑÑ–ÑŽ</translation>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+130"/>
<source>Sent transaction</source>
<translation>ÐадіÑлані транзакції</translation>
</message>
@@ -677,7 +680,7 @@ Address: %4
</translation>
</message>
<message>
- <location line="+67"/>
+ <location line="+69"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation>&lt;b&gt;Зашифрований&lt;/b&gt; гаманець &lt;b&gt;розблоковано&lt;/b&gt;</translation>
</message>
@@ -687,7 +690,7 @@ Address: %4
<translation>&lt;b&gt;Зашифрований&lt;/b&gt; гаманець &lt;b&gt;заблоковано&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+116"/>
+ <location filename="../bitcoin.cpp" line="+438"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation>СталаÑÑ Ñ„Ð°Ñ‚Ð°Ð»ÑŒÐ½Ð° помилка. Bitcoin більше не може продовжувати безпечно Ñ– піде.</translation>
</message>
@@ -909,7 +912,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+171"/>
+ <location line="+31"/>
+ <source>none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+140"/>
<source>Dust</source>
<translation type="unfinished"/>
</message>
@@ -946,7 +954,7 @@ Address: %4
</message>
<message>
<location line="+1"/>
- <source>This label turns red, if the priority is smaller than &quot;medium&quot;</source>
+ <source>This label turns red, if the priority is smaller than &quot;medium&quot;.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1015,7 +1023,7 @@ Address: %4
<translation>&amp;ÐдреÑа</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+25"/>
+ <location filename="../editaddressdialog.cpp" line="+28"/>
<source>New receiving address</source>
<translation>Ðова адреÑа Ð´Ð»Ñ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ</translation>
</message>
@@ -1084,20 +1092,24 @@ Address: %4
</message>
</context>
<context>
- <name>GUIUtil::HelpMessageBox</name>
+ <name>HelpMessageDialog</name>
<message>
- <location filename="../guiutil.cpp" line="+597"/>
- <source>version</source>
- <translation>верÑÑ–Ñ</translation>
+ <location filename="../forms/helpmessagedialog.ui" line="+19"/>
+ <source>Bitcoin Core - Command-line options</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <location line="+13"/>
+ <location filename="../utilitydialog.cpp" line="+38"/>
<source>Bitcoin Core</source>
<translation>Bitcoin Ядро</translation>
</message>
<message>
- <location line="-11"/>
+ <location line="+0"/>
+ <source>version</source>
+ <translation>верÑÑ–Ñ</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Usage:</source>
<translation>ВикориÑтаннÑ:</translation>
</message>
@@ -1226,7 +1238,7 @@ Address: %4
<translation>Параметри</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+13"/>
<source>&amp;Main</source>
<translation>&amp;Головні</translation>
</message>
@@ -1251,7 +1263,52 @@ Address: %4
<translation>&amp;ЗапуÑкати гаманець при вході в ÑиÑтему</translation>
</message>
<message>
- <location line="+35"/>
+ <location line="+9"/>
+ <source>Size of &amp;database cache</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set database cache size in megabytes (default: 25)</source>
+ <translation>Ð’Ñтановити розмір кешу бази даних в мегабайтах (типово: 25)</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>MB</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Number of script &amp;verification threads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
+ <translation>Ð’Ñтановіть кількіÑÑ‚ÑŒ перевірки Ñкрипт потоків (до 16, 0 = авто, &lt;0 = залишити, що багато Ñердечники безкоштовно, за замовчуваннÑм: 0)</translation>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Connect to the Bitcoin network through a SOCKS proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Connect through SOCKS proxy (default proxy):</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+224"/>
+ <source>Active command-line options that override above options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
<source>Reset all client options to default.</source>
<translation>Скинути вÑÑ– параметри клієнта на типові.</translation>
</message>
@@ -1261,7 +1318,7 @@ Address: %4
<translation>Скинути параметри</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="-323"/>
<source>&amp;Network</source>
<translation>&amp;Мережа</translation>
</message>
@@ -1276,32 +1333,17 @@ Address: %4
<translation>Ð’Ñ–Ð´Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð½Ñ Ð¿Ð¾Ñ€Ñ‚Ñƒ через &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>ПідключатиÑÑŒ до мережі Bitcoin через SOCKS-прокÑÑ– (наприклад при викориÑтанні Tor).</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>&amp;Connect through SOCKS proxy:</source>
- <translation>ПідключатиÑÑŒ через &amp;SOCKS-прокÑÑ–:</translation>
- </message>
- <message>
- <location line="+9"/>
+ <location line="+19"/>
<source>Proxy &amp;IP:</source>
<translation>&amp;IP прокÑÑ–:</translation>
</message>
<message>
- <location line="+19"/>
- <source>IP address of the proxy (e.g. 127.0.0.1)</source>
- <translation>IP-адреÑа прокÑÑ–-Ñервера (наприклад 127.0.0.1)</translation>
- </message>
- <message>
- <location line="+7"/>
+ <location line="+32"/>
<source>&amp;Port:</source>
<translation>&amp;Порт:</translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+25"/>
<source>Port of the proxy (e.g. 9050)</source>
<translation>Порт прокÑÑ–-Ñервера (наприклад 9050)</translation>
</message>
@@ -1386,7 +1428,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+71"/>
+ <location line="+136"/>
<source>&amp;OK</source>
<translation>&amp;Гаразд</translation>
</message>
@@ -1396,44 +1438,38 @@ Address: %4
<translation>&amp;СкаÑувати</translation>
</message>
<message>
- <location line="+10"/>
- <source>&amp;Apply</source>
- <translation>&amp;ЗаÑтоÑувати</translation>
- </message>
- <message>
- <location filename="../optionsdialog.cpp" line="+63"/>
+ <location filename="../optionsdialog.cpp" line="+67"/>
<source>default</source>
<translation>типово</translation>
</message>
<message>
- <location line="+131"/>
+ <location line="+57"/>
+ <source>none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+75"/>
<source>Confirm options reset</source>
<translation>ÐŸÑ–Ð´Ñ‚Ð²ÐµÑ€Ð´Ð¶ÐµÐ½Ð½Ñ ÑÐºÐ¸Ð´Ð°Ð½Ð½Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ñ–Ð²</translation>
</message>
<message>
<location line="+1"/>
- <source>Some settings may require a client restart to take effect.</source>
- <translation>ДеÑкі параметри потребують перезапуÑк клієнта Ð´Ð»Ñ Ð½Ð°Ð±ÑƒÑ‚Ñ‚Ñ Ñ‡Ð¸Ð½Ð½Ð¾ÑÑ‚Ñ–.</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Do you want to proceed?</source>
- <translation>Продовжувати?</translation>
+ <location line="+29"/>
+ <source>Client restart required to activate changes.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
- <location line="+9"/>
- <source>Warning</source>
- <translation>Увага</translation>
+ <location line="-29"/>
+ <source>Client will be shutdown, do you want to proceed?</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="-9"/>
- <location line="+9"/>
- <source>This setting will take effect after restarting Bitcoin.</source>
- <translation>Цей параметр набуде чинноÑÑ‚Ñ– піÑÐ»Ñ Ð¿ÐµÑ€ÐµÐ·Ð°Ð¿ÑƒÑку Bitcoin.</translation>
+ <location line="+33"/>
+ <source>This change would require a client restart.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+29"/>
+ <location line="+34"/>
<source>The supplied proxy address is invalid.</source>
<translation>Ðевірно вказано адреÑу прокÑÑ–.</translation>
</message>
@@ -1447,22 +1483,22 @@ Address: %4
</message>
<message>
<location line="+50"/>
- <location line="+214"/>
+ <location line="+231"/>
<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="-140"/>
+ <location line="-155"/>
<source>Unconfirmed:</source>
<translation>Ðепідтверджені:</translation>
</message>
<message>
- <location line="-81"/>
+ <location line="-83"/>
<source>Wallet</source>
<translation>Гаманець</translation>
</message>
<message>
- <location line="+49"/>
+ <location line="+51"/>
<source>Confirmed:</source>
<translation>підтверджено:</translation>
</message>
@@ -1497,7 +1533,7 @@ Address: %4
<translation>Ваше поточне Сукупний баланÑ</translation>
</message>
<message>
- <location line="+56"/>
+ <location line="+71"/>
<source>&lt;b&gt;Recent transactions&lt;/b&gt;</source>
<translation>&lt;b&gt;Ðедавні транзакції&lt;/b&gt;</translation>
</message>
@@ -1511,7 +1547,8 @@ Address: %4
<context>
<name>PaymentServer</name>
<message>
- <location filename="../paymentserver.cpp" line="+397"/>
+ <location filename="../paymentserver.cpp" line="+403"/>
+ <location line="+13"/>
<source>URI handling</source>
<translation>Обробка URI</translation>
</message>
@@ -1521,24 +1558,52 @@ Address: %4
<translation>Ðеможливо обробити URI! Це може бути викликано неправильною Bitcoin-адреÑою, чи невірними параметрами URI.</translation>
</message>
<message>
- <location line="+91"/>
+ <location line="+96"/>
<source>Requested payment amount of %1 is too small (considered dust).</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-204"/>
- <location line="+195"/>
+ <location line="-221"/>
+ <location line="+212"/>
<location line="+13"/>
+ <location line="+95"/>
+ <location line="+18"/>
+ <location line="+16"/>
<source>Payment request error</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-207"/>
+ <location line="-353"/>
<source>Cannot start bitcoin: click-to-pay handler</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+195"/>
+ <location line="+58"/>
+ <source>Net manager warning</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Your active proxy doesn&apos;t support SOCKS5, which is required for payment requests via proxy.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>Payment request fetch URL is invalid: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Payment request file handling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Payment request file can not be read or processed! This can be caused by an invalid payment request file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+73"/>
<source>Unverified payment requests to custom payment scripts are unsupported.</source>
<translation type="unfinished"/>
</message>
@@ -1548,24 +1613,27 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
+ <location line="+43"/>
<source>Error communicating with %1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+28"/>
+ <location line="+24"/>
+ <source>Payment request can not be parsed or processed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
<source>Bad response from server %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+32"/>
+ <location line="+33"/>
<source>Payment acknowledged</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-55"/>
- <location line="+27"/>
- <location line="+17"/>
+ <location line="-11"/>
<source>Network request error</source>
<translation type="unfinished"/>
</message>
@@ -1573,18 +1641,18 @@ Address: %4
<context>
<name>QObject</name>
<message>
- <location filename="../bitcoin.cpp" line="+119"/>
- <location line="+5"/>
+ <location filename="../bitcoin.cpp" line="+71"/>
+ <location line="+11"/>
<source>Bitcoin</source>
<translation>Bitcoin</translation>
</message>
<message>
- <location line="-4"/>
+ <location line="+1"/>
<source>Error: Specified data directory &quot;%1&quot; does not exist.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="-12"/>
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation type="unfinished"/>
</message>
@@ -1626,15 +1694,16 @@ Address: %4
<location line="+23"/>
<location line="+23"/>
<location line="+36"/>
- <location line="+53"/>
+ <location line="+23"/>
+ <location line="+36"/>
<location line="+23"/>
<location line="+23"/>
- <location filename="../rpcconsole.cpp" line="+360"/>
+ <location filename="../rpcconsole.cpp" line="+359"/>
<source>N/A</source>
<translation>Ð/Д</translation>
</message>
<message>
- <location line="-217"/>
+ <location line="-223"/>
<source>Client version</source>
<translation>ВерÑÑ–Ñ ÐºÐ»Ñ–Ñ”Ð½Ñ‚Ñƒ</translation>
</message>
@@ -1649,7 +1718,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+78"/>
+ <location line="+25"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+53"/>
<source>Using OpenSSL version</source>
<translation>ВикориÑтовуєтьÑÑ OpenSSL верÑÑ–Ñ—</translation>
</message>
@@ -1665,16 +1739,16 @@ Address: %4
</message>
<message>
<location line="+7"/>
- <source>Number of connections</source>
- <translation>КількіÑÑ‚ÑŒ підключень</translation>
+ <source>Name</source>
+ <translation>Ім’Ñ</translation>
</message>
<message>
<location line="+23"/>
- <source>On testnet</source>
- <translation>Ð’ теÑтовій мережі</translation>
+ <source>Number of connections</source>
+ <translation>КількіÑÑ‚ÑŒ підключень</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+29"/>
<source>Block chain</source>
<translation>Ланцюг блоків</translation>
</message>
@@ -1699,16 +1773,6 @@ Address: %4
<translation>Відкрити</translation>
</message>
<message>
- <location line="+16"/>
- <source>Command-line options</source>
- <translation>Параметри командного Ñ€Ñдка</translation>
- </message>
- <message>
- <location line="+10"/>
- <source>&amp;Show</source>
- <translation>Показати</translation>
- </message>
- <message>
<location line="+24"/>
<source>&amp;Console</source>
<translation>КонÑоль</translation>
@@ -1739,17 +1803,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-541"/>
+ <location line="-521"/>
<source>Build date</source>
<translation>Дата збираннÑ</translation>
</message>
<message>
- <location line="-79"/>
- <source>Bitcoin Core</source>
- <translation>Bitcoin Ядро</translation>
- </message>
- <message>
- <location line="+279"/>
+ <location line="+206"/>
<source>Debug log file</source>
<translation>Файл звіту зневадженнÑ</translation>
</message>
@@ -1759,11 +1818,6 @@ Address: %4
<translation>Відкрийте Ð½Ð°Ð»Ð°Ð³Ð¾Ð´Ð¶ÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð» журналу Bitcoin з поточного каталогу даних. Це може зайнÑти кілька Ñекунд Ð´Ð»Ñ Ð²ÐµÐ»Ð¸ÐºÐ¸Ñ… файлів журналів.</translation>
</message>
<message>
- <location line="+26"/>
- <source>Show the Bitcoin-Core help message to get a list with possible Bitcoin command-line options.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location line="+76"/>
<source>Clear console</source>
<translation>ОчиÑтити конÑоль</translation>
@@ -1784,7 +1838,7 @@ Address: %4
<translation>Ðаберіть &lt;b&gt;help&lt;/b&gt; Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ³Ð»Ñду доÑтупних команд.</translation>
</message>
<message>
- <location line="+128"/>
+ <location line="+122"/>
<source>%1 B</source>
<translation type="unfinished"/>
</message>
@@ -1827,12 +1881,7 @@ Address: %4
<translation>&amp;КількіÑÑ‚ÑŒ:</translation>
</message>
<message>
- <location line="+19"/>
- <source>The amount to request</source>
- <translation>Обов’Ñзкова кількіÑÑ‚ÑŒ</translation>
- </message>
- <message>
- <location line="-32"/>
+ <location line="-13"/>
<source>&amp;Label:</source>
<translation>&amp;Мітка:</translation>
</message>
@@ -1842,12 +1891,7 @@ Address: %4
<translation>&amp;ПовідомленнÑ:</translation>
</message>
<message>
- <location line="+20"/>
- <source>The message to attach to payment request</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="-37"/>
+ <location line="-17"/>
<source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
@@ -1858,16 +1902,26 @@ Address: %4
</message>
<message>
<location line="+27"/>
- <source>The label to associate with the new receiving address</source>
+ <source>An optional label to associate with the new receiving address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
- <source>Use this form to request payments. All fields are optional.</source>
- <translation>ВикориÑтовуйте цю форму щоб отримати платежі. Ð’ÑÑ– Ð¿Ð¾Ð»Ñ Ñ” обов’Ñзковими</translation>
+ <location line="+7"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+56"/>
+ <location line="+7"/>
+ <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+39"/>
+ <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+17"/>
<source>Clear all fields of the form.</source>
<translation>ОчиÑтити вÑÑ– Ð¿Ð¾Ð»Ñ Ð² формі</translation>
</message>
@@ -1883,11 +1937,11 @@ Address: %4
</message>
<message>
<location line="+47"/>
- <source>Previously requested payments</source>
+ <source>Requested payments</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+12"/>
+ <location line="+16"/>
<source>Show the selected request (does the same as double clicking an entry)</source>
<translation type="unfinished"/>
</message>
@@ -1978,7 +2032,7 @@ Address: %4
<context>
<name>RecentRequestsTableModel</name>
<message>
- <location filename="../recentrequeststablemodel.cpp" line="+14"/>
+ <location filename="../recentrequeststablemodel.cpp" line="+24"/>
<source>Date</source>
<translation>Дата</translation>
</message>
@@ -1998,7 +2052,7 @@ Address: %4
<translation>КількіÑÑ‚ÑŒ</translation>
</message>
<message>
- <location line="+36"/>
+ <location line="+38"/>
<source>(no label)</source>
<translation>(немає назви)</translation>
</message>
@@ -2013,7 +2067,7 @@ Address: %4
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
<location filename="../sendcoinsdialog.cpp" line="+381"/>
- <location line="+81"/>
+ <location line="+80"/>
<source>Send Coins</source>
<translation>Відправити</translation>
</message>
@@ -2123,7 +2177,7 @@ Address: %4
<translation>&amp;Відправити</translation>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-229"/>
+ <location filename="../sendcoinsdialog.cpp" line="-228"/>
<source>Confirm send coins</source>
<translation>Підтвердіть відправленнÑ</translation>
</message>
@@ -2226,22 +2280,22 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+113"/>
+ <location line="+112"/>
<source>Warning: Invalid Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+21"/>
<source>(no label)</source>
<translation>(немає назви)</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="-11"/>
<source>Warning: Unknown change address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-378"/>
+ <location line="-366"/>
<source>Are you sure you want to send?</source>
<translation>Ви впевнені, що хочете відправити?</translation>
</message>
@@ -2265,13 +2319,13 @@ Address: %4
<name>SendCoinsEntry</name>
<message>
<location filename="../forms/sendcoinsentry.ui" line="+131"/>
- <location line="+501"/>
+ <location line="+521"/>
<location line="+536"/>
<source>A&amp;mount:</source>
<translation>&amp;КількіÑÑ‚ÑŒ:</translation>
</message>
<message>
- <location line="-1132"/>
+ <location line="-1152"/>
<source>Pay &amp;To:</source>
<translation>&amp;Отримувач:</translation>
</message>
@@ -2317,23 +2371,33 @@ Address: %4
</message>
<message>
<location line="+7"/>
- <location line="+504"/>
+ <location line="+524"/>
<location line="+536"/>
<source>Remove this entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-40"/>
+ <location line="-1008"/>
+ <source>Message:</source>
+ <translation>ПовідомленнÑ:</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+958"/>
<source>This is a verified payment request.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-971"/>
+ <location line="-991"/>
<source>Enter a label for this address to add it to the list of used addresses</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+439"/>
+ <location line="+459"/>
<source>This is an unverified payment request.</source>
<translation type="unfinished"/>
</message>
@@ -2356,6 +2420,19 @@ Address: %4
</message>
</context>
<context>
+ <name>ShutdownWindow</name>
+ <message>
+ <location filename="../utilitydialog.cpp" line="+48"/>
+ <source>Bitcoin Core is shutting down...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Do not shut down the computer until this window disappears.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>SignVerifyMessageDialog</name>
<message>
<location filename="../forms/signverifymessagedialog.ui" line="+14"/>
@@ -2363,7 +2440,7 @@ Address: %4
<translation>ПідпиÑи - ÐŸÑ–Ð´Ð¿Ð¸Ñ / Перевірка повідомленнÑ</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+10"/>
<source>&amp;Sign Message</source>
<translation>&amp;ПідпиÑати повідомленнÑ</translation>
</message>
@@ -2551,7 +2628,7 @@ Address: %4
<context>
<name>SplashScreen</name>
<message>
- <location filename="../splashscreen.cpp" line="+26"/>
+ <location filename="../splashscreen.cpp" line="+28"/>
<source>Bitcoin Core</source>
<translation>Bitcoin Ядро</translation>
</message>
@@ -2650,12 +2727,12 @@ Address: %4
<location line="+12"/>
<location line="+45"/>
<location line="+17"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Credit</source>
<translation>Кредит</translation>
</message>
<message numerus="yes">
- <location line="-120"/>
+ <location line="-125"/>
<source>matures in %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -2668,12 +2745,12 @@ Address: %4
<location line="+44"/>
<location line="+8"/>
<location line="+15"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Debit</source>
<translation>Дебет</translation>
</message>
<message>
- <location line="-57"/>
+ <location line="-62"/>
<source>Transaction fee</source>
<translation>КоміÑÑ–Ñ Ð·Ð° транзакцію</translation>
</message>
@@ -2684,11 +2761,12 @@ Address: %4
</message>
<message>
<location line="+6"/>
+ <location line="+9"/>
<source>Message</source>
<translation>ПовідомленнÑ</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="-7"/>
<source>Comment</source>
<translation>Коментар</translation>
</message>
@@ -2698,7 +2776,7 @@ Address: %4
<translation>ID транзакції</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+18"/>
<source>Merchant</source>
<translation type="unfinished"/>
</message>
@@ -2738,7 +2816,7 @@ Address: %4
<translation>false</translation>
</message>
<message>
- <location line="-227"/>
+ <location line="-232"/>
<source>, has not been successfully broadcast yet</source>
<translation>, ще не було уÑпішно розіÑлано</translation>
</message>
@@ -2788,8 +2866,13 @@ Address: %4
<source>Amount</source>
<translation>КількіÑÑ‚ÑŒ</translation>
</message>
+ <message>
+ <location line="+59"/>
+ <source>Immature (%1 confirmations, will be available after %2)</source>
+ <translation type="unfinished"/>
+ </message>
<message numerus="yes">
- <location line="+57"/>
+ <location line="+16"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
@@ -2809,17 +2892,13 @@ Address: %4
<translation>Ðепідтверджено (%1 із %2 підтверджень)</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="-22"/>
+ <location line="+25"/>
<source>Confirmed (%1 confirmations)</source>
<translation>Підтверджено (%1 підтверджень)</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"/>
+ <location line="-22"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation>Цей блок не був отриманий жодними іншими вузлами Ñ–, ймовірно, не буде прийнÑтий!</translation>
</message>
@@ -2829,7 +2908,7 @@ Address: %4
<translation>Згенеровано, але не підтверджено</translation>
</message>
<message>
- <location line="+43"/>
+ <location line="+62"/>
<source>Received with</source>
<translation>Отримано</translation>
</message>
@@ -3125,7 +3204,7 @@ Address: %4
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+217"/>
+ <location filename="../bitcoinstrings.cpp" line="+221"/>
<source>Usage:</source>
<translation>ВикориÑтаннÑ:</translation>
</message>
@@ -3145,7 +3224,7 @@ Address: %4
<translation>Параметри:</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+22"/>
<source>Specify configuration file (default: bitcoin.conf)</source>
<translation>Вкажіть файл конфігурації (типово: bitcoin.conf)</translation>
</message>
@@ -3165,7 +3244,7 @@ Address: %4
<translation>Ð’Ñтановити розмір кешу бази даних в мегабайтах (типово: 25)</translation>
</message>
<message>
- <location line="-27"/>
+ <location line="-26"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
<translation>Чекати на з&apos;Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð½Ð° &lt;port&gt; (типово: 8333 або теÑтова мережа: 18333)</translation>
</message>
@@ -3175,7 +3254,7 @@ Address: %4
<translation>Підтримувати не більше &lt;n&gt; зв&apos;Ñзків з колегами (типово: 125)</translation>
</message>
<message>
- <location line="-50"/>
+ <location line="-51"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation>ПідключитиÑÑŒ до вузла, щоб отримати ÑпиÑок Ð°Ð´Ñ€ÐµÑ Ñ–Ð½ÑˆÐ¸Ñ… учаÑників та від&apos;єднатиÑÑŒ</translation>
</message>
@@ -3185,22 +3264,22 @@ Address: %4
<translation>Вкажіть вашу влаÑну публічну адреÑу</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation>Поріг Ð²Ñ–Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ñ Ð½ÐµÐ¿Ñ€Ð°Ð²Ð¸Ð»ÑŒÐ½Ð¾ під&apos;єднаних пірів (типово: 100)</translation>
</message>
<message>
- <location line="-147"/>
+ <location line="-148"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation>МакÑимальній розмір вхідного буферу на одне з&apos;Ñ”Ð´Ð½Ð°Ð½Ð½Ñ (типово: 86400)</translation>
</message>
<message>
- <location line="-33"/>
+ <location line="-36"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation>ПроÑлуховувати &lt;port&gt; Ð´Ð»Ñ JSON-RPC-з&apos;єднань (типово: 8332 або теÑтова мережа: 18332)</translation>
</message>
@@ -3210,7 +3289,7 @@ Address: %4
<translation>Приймати команди із командного Ñ€Ñдка та команди JSON-RPC</translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>ЗапуÑтити в фоновому режимі (Ñк демон) та приймати команди</translation>
</message>
@@ -3220,12 +3299,12 @@ Address: %4
<translation>ВикориÑтовувати теÑтову мережу</translation>
</message>
<message>
- <location line="-117"/>
+ <location line="-118"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation>Приймати з&apos;Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð·Ð·Ð¾Ð²Ð½Ñ– (за замовчуваннÑм: 1, Ñкщо ні-прокÑÑ– або-з&apos;єднаннÑ)</translation>
</message>
<message>
- <location line="-92"/>
+ <location line="-95"/>
<source>%s, you must set a rpcpassword in the configuration file:
%s
It is recommended you use the following random password:
@@ -3266,6 +3345,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+4"/>
+ <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
<source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
<translation>Помилка: транзакцію було відхилено. Це може ÑтатиÑÑŒ, Ñкщо декілька монет з вашого Ð³Ð°Ð¼Ð°Ð½Ñ†Ñ Ð²Ð¶Ðµ викориÑтані, наприклад, Ñкщо ви викориÑтовуєте одну копію Ð³Ð°Ð¼Ð°Ð½Ñ†Ñ (wallet.dat), а монети були викориÑтані з іншої копії, але не позначені Ñк викориÑтані в цій.</translation>
</message>
@@ -3371,6 +3455,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+1"/>
+ <source>Do not load the wallet and disable wallet RPC calls</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Do you want to rebuild the block database now?</source>
<translation>Ви хочете перебудувати базу даних блоку зараз?</translation>
</message>
@@ -3535,7 +3624,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>ÐадіÑлати команду Ñерверу Біткойну</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+7"/>
<source>Set maximum block size in bytes (default: %d)</source>
<translation type="unfinished"/>
</message>
@@ -3555,7 +3644,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>ЗапуÑтити Ñервер Біткойну</translation>
</message>
<message>
- <location line="+12"/>
+ <location line="+3"/>
+ <source>This is intended for regression testing tools and app development.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Usage (deprecated, use bitcoin-cli):</source>
<translation>ВикориÑÑ‚Ð°Ð½Ð½Ñ (заÑтаріле, викориÑтовуйте bitcoin-cli):</translation>
</message>
@@ -3580,7 +3674,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
+ <location line="+2"/>
+ <source>Wallet options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source>
<translation type="unfinished"/>
</message>
@@ -3590,12 +3689,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-78"/>
+ <location line="-79"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation>Імпорт блоків з зовнішнього файлу blk000??.dat</translation>
</message>
<message>
- <location line="-104"/>
+ <location line="-105"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
@@ -3615,7 +3714,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Ð’Ñтановіть кількіÑÑ‚ÑŒ перевірки Ñкрипт потоків (до 16, 0 = авто, &lt;0 = залишити, що багато Ñердечники безкоштовно, за замовчуваннÑм: 0)</translation>
</message>
<message>
- <location line="+88"/>
+ <location line="+89"/>
<source>Information</source>
<translation>ІнформаціÑ</translation>
</message>
@@ -3665,11 +3764,6 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>ВідÑилати налагоджувальну інформацію на конÑоль, а не у файл debug.log</translation>
</message>
<message>
- <location line="+1"/>
- <source>Send trace/debug info to debugger</source>
- <translation>ВідÑилати налагоджувальну інформацію до налагоджувача</translation>
- </message>
- <message>
<location line="+6"/>
<source>Set minimum block size in bytes (default: 0)</source>
<translation>Ð’Ñтановити мінімальний розмір блоку у байтах (типово: 0)</translation>
@@ -3695,7 +3789,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>СиÑтемна помилка: </translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Transaction amount too small</source>
<translation>Сума угоди занадто малий</translation>
</message>
@@ -3725,7 +3819,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Ім&apos;Ñ ÐºÐ¾Ñ€Ð¸Ñтувача Ð´Ð»Ñ JSON-RPC-з&apos;єднань</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Warning</source>
<translation>ПопередженнÑ</translation>
</message>
@@ -3745,37 +3839,37 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>wallet.dat пошкоджено, Ð²Ñ–Ð´Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð½Ðµ вдалоÑÑ</translation>
</message>
<message>
- <location line="-57"/>
+ <location line="-58"/>
<source>Password for JSON-RPC connections</source>
<translation>Пароль Ð´Ð»Ñ JSON-RPC-з&apos;єднань</translation>
</message>
<message>
- <location line="-69"/>
+ <location line="-70"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation>Дозволити JSON-RPC-з&apos;Ñ”Ð´Ð½Ð°Ð½Ð½Ñ Ð· вказаної IP-адреÑи</translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<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="-131"/>
+ <location line="-132"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation>Виконати команду, коли з&apos;ÑвитьÑÑ Ð½Ð¾Ð²Ð¸Ð¹ блок (%s в команді змінюєтьÑÑ Ð½Ð° хеш блоку)</translation>
</message>
<message>
- <location line="+160"/>
+ <location line="+161"/>
<source>Upgrade wallet to latest format</source>
<translation>Модернізувати гаманець до оÑтаннього формату</translation>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation>Ð’Ñтановити розмір пулу ключів &lt;n&gt; (типово: 100)</translation>
</message>
<message>
- <location line="-12"/>
+ <location line="-11"/>
<source>Rescan the block chain for missing wallet transactions</source>
<translation>ПереÑканувати ланцюжок блоків, в пошуку втрачених транзакцій</translation>
</message>
@@ -3785,7 +3879,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>ВикориÑтовувати OpenSSL (https) Ð´Ð»Ñ JSON-RPC-з&apos;єднань</translation>
</message>
<message>
- <location line="-29"/>
+ <location line="-30"/>
<source>Server certificate file (default: server.cert)</source>
<translation>Файл Ñертифіката Ñервера (типово: server.cert)</translation>
</message>
@@ -3800,17 +3894,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Дана довідка</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Unable to bind to %s on this computer (bind returned error %d, %s)</source>
<translation>Ðеможливо прив&apos;Ñзати до порту %s на цьому комп&apos;ютері (bind returned error %d, %s)</translation>
</message>
<message>
- <location line="-106"/>
+ <location line="-107"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation>Дозволити пошук в DNS Ð´Ð»Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´ -addnode, -seednode та -connect</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+60"/>
<source>Loading addresses...</source>
<translation>Ð—Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð°Ð´Ñ€ÐµÑ...</translation>
</message>
@@ -3850,7 +3944,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Ð’ параметрі -socks запитуєтьÑÑ Ð½ÐµÐ²Ñ–Ð´Ð¾Ð¼Ð° верÑÑ–Ñ: %i</translation>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3860,7 +3954,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+47"/>
+ <location line="+48"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation>Помилка у величині коміÑÑ–Ñ— -paytxfee=&lt;amount&gt;: «%s»</translation>
</message>
@@ -3880,7 +3974,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Ð—Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ñ–Ð½Ð´ÐµÐºÑу блоків...</translation>
</message>
<message>
- <location line="-61"/>
+ <location line="-62"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation>Додати вузол до Ð¿Ñ–Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ñ Ñ– лишити його відкритим</translation>
</message>
@@ -3890,12 +3984,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Ðеможливо прив&apos;Ñзати до порту %s на цьому комп&apos;ютері. Можливо гаманець вже запущено.</translation>
</message>
<message>
- <location line="+94"/>
+ <location line="+95"/>
<source>Loading wallet...</source>
<translation>Ð—Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð³Ð°Ð¼Ð°Ð½Ñ†Ñ...</translation>
</message>
<message>
- <location line="-55"/>
+ <location line="-56"/>
<source>Cannot downgrade wallet</source>
<translation>Ðе вдаєтьÑÑ Ð¿Ð¾Ð½Ð¸Ð·Ð¸Ñ‚Ð¸ верÑÑ–ÑŽ гаманцÑ</translation>
</message>
@@ -3905,7 +3999,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Ðеможливо запиÑати типову адреÑу</translation>
</message>
<message>
- <location line="+66"/>
+ <location line="+67"/>
<source>Rescanning...</source>
<translation>СкануваннÑ...</translation>
</message>
@@ -3925,7 +4019,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation>Помилка</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-35"/>
<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_vi.ts b/src/qt/locale/bitcoin_vi.ts
index 5dfc588eb0..ee0c8caaaf 100644
--- a/src/qt/locale/bitcoin_vi.ts
+++ b/src/qt/locale/bitcoin_vi.ts
@@ -3,13 +3,13 @@
<name>AboutDialog</name>
<message>
<location filename="../forms/aboutdialog.ui" line="+14"/>
- <source>About Bitcoin</source>
- <translation>Thông tin vỠBitcoin</translation>
+ <source>About Bitcoin Core</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+39"/>
- <source>&lt;b&gt;Bitcoin&lt;/b&gt; version</source>
- <translation>&lt;b&gt;Bitcoin&lt;/b&gt; số phiên bản</translation>
+ <source>&lt;b&gt;Bitcoin Core&lt;/b&gt; version</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+57"/>
@@ -22,13 +22,13 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location filename="../aboutdialog.cpp" line="+14"/>
+ <location filename="../utilitydialog.cpp" line="+29"/>
<source>Copyright</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+0"/>
- <source>The Bitcoin developers</source>
+ <source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
</context>
@@ -65,7 +65,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location filename="../addressbookpage.cpp" line="+72"/>
+ <location filename="../addressbookpage.cpp" line="+74"/>
<source>&amp;Copy Address</source>
<translation type="unfinished"/>
</message>
@@ -135,7 +135,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+197"/>
+ <location line="+194"/>
<source>Export Address List</source>
<translation type="unfinished"/>
</message>
@@ -146,19 +146,19 @@ This product includes software developed by the OpenSSL Project for use in the O
</message>
<message>
<location line="+13"/>
- <source>Error exporting</source>
- <translation>Xảy ra lỗi khi xuất dữ liệu</translation>
+ <source>Exporting Failed</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation>Không thể ghi dữ liệu vào tập tin %1.</translation>
+ <location line="+1"/>
+ <source>There was an error trying to save the address list to %1.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<name>AddressTableModel</name>
<message>
- <location filename="../addresstablemodel.cpp" line="+164"/>
+ <location filename="../addresstablemodel.cpp" line="+168"/>
<source>Label</source>
<translation>Nhãn dữ liệu</translation>
</message>
@@ -196,7 +196,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="+34"/>
+ <location filename="../askpassphrasedialog.cpp" line="+40"/>
<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>
@@ -317,22 +317,27 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+250"/>
+ <location filename="../bitcoingui.cpp" line="+295"/>
<source>Sign &amp;message...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+254"/>
+ <location line="+335"/>
<source>Synchronizing with network...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-324"/>
+ <location line="-407"/>
<source>&amp;Overview</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="-137"/>
+ <source>Node</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+138"/>
<source>Show general overview of wallet</source>
<translation type="unfinished"/>
</message>
@@ -347,7 +352,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>E&amp;xit</source>
<translation type="unfinished"/>
</message>
@@ -393,7 +398,22 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+259"/>
+ <location line="+10"/>
+ <source>&amp;Sending addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Receiving addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open &amp;URI...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+325"/>
<source>Importing blocks from disk...</source>
<translation type="unfinished"/>
</message>
@@ -403,12 +423,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="-322"/>
+ <location line="-405"/>
<source>Send coins to a Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+47"/>
+ <location line="+49"/>
<source>Modify configuration options for Bitcoin</source>
<translation type="unfinished"/>
</message>
@@ -438,20 +458,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="-180"/>
- <location line="+6"/>
- <location line="+513"/>
+ <location line="+430"/>
<source>Bitcoin</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-519"/>
- <location line="+6"/>
+ <location line="-643"/>
<source>Wallet</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+109"/>
+ <location line="+146"/>
<source>&amp;Send</source>
<translation type="unfinished"/>
</message>
@@ -461,13 +478,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+28"/>
- <location line="+2"/>
- <source>&amp;About Bitcoin</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+14"/>
+ <location line="+46"/>
<location line="+2"/>
<source>&amp;Show / Hide</source>
<translation type="unfinished"/>
@@ -493,64 +504,80 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+35"/>
+ <location line="+48"/>
<source>&amp;File</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
+ <location line="+14"/>
<source>&amp;Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>&amp;Help</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+9"/>
+ <location line="+15"/>
<source>Tabs toolbar</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-235"/>
- <location line="+294"/>
+ <location line="-284"/>
+ <location line="+376"/>
<source>[testnet]</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-177"/>
+ <location line="-401"/>
+ <source>Bitcoin Core</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+163"/>
<source>Request payments (generates QR codes and bitcoin: URIs)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+63"/>
- <source>&amp;Used sending addresses...</source>
+ <location line="+29"/>
+ <location line="+2"/>
+ <source>&amp;About Bitcoin Core</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="+35"/>
<source>Show the list of used sending addresses and labels</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Used &amp;receiving addresses...</source>
+ <location line="+2"/>
+ <source>Show the list of used receiving addresses and labels</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open a bitcoin: URI or payment request</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Command-line options</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
- <source>Show the list of used receiving addresses and labels</source>
+ <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+106"/>
+ <location line="+159"/>
<location line="+5"/>
<source>Bitcoin client</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+120"/>
+ <location line="+142"/>
<source>%n active connection(s) to Bitcoin network</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
@@ -570,7 +597,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+20"/>
+ <location line="+23"/>
<source>%n hour(s)</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
@@ -590,7 +617,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
+ <location line="+21"/>
<source>Last received block was generated %1 ago.</source>
<translation type="unfinished"/>
</message>
@@ -615,27 +642,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+77"/>
- <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="-152"/>
+ <location line="-85"/>
<source>Up to date</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Catching up...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+124"/>
- <source>Confirm transaction fee</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+130"/>
<source>Sent transaction</source>
<translation type="unfinished"/>
</message>
@@ -654,17 +671,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+34"/>
- <source>URI handling</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+0"/>
- <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="+45"/>
+ <location line="+69"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation type="unfinished"/>
</message>
@@ -674,7 +681,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+110"/>
+ <location filename="../bitcoin.cpp" line="+438"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation type="unfinished"/>
</message>
@@ -682,12 +689,304 @@ Address: %4
<context>
<name>ClientModel</name>
<message>
- <location filename="../clientmodel.cpp" line="+115"/>
+ <location filename="../clientmodel.cpp" line="+119"/>
<source>Network Alert</source>
<translation type="unfinished"/>
</message>
</context>
<context>
+ <name>CoinControlDialog</name>
+ <message>
+ <location filename="../forms/coincontroldialog.ui" line="+14"/>
+ <source>Coin Control Address Selection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>Quantity:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Bytes:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>Amount:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Priority:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Low Output:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>After Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Change:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+63"/>
+ <source>(un)select all</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Tree mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>List mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>Amount</source>
+ <translation>Số lượng</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Address</source>
+ <translation>Äịa chỉ</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Date</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Confirmations</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Confirmed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../coincontroldialog.cpp" line="+42"/>
+ <source>Copy address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy label</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+26"/>
+ <source>Copy amount</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-25"/>
+ <source>Copy transaction ID</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Lock unspent</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Unlock unspent</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+22"/>
+ <source>Copy quantity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Copy fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy after fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy bytes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy low output</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy change</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+323"/>
+ <source>highest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>higher</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>high</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>medium-high</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>medium</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>low-medium</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>low</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>lower</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>lowest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>(%1 locked)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+140"/>
+ <source>Dust</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>yes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>no</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>This label turns red, if the transaction size is greater than 1000 bytes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+5"/>
+ <source>This means a fee of at least %1 per kB is required.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-4"/>
+ <source>Can vary +/- 1 byte per input.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Transactions with higher priority are more likely to get included into a block.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>This label turns red, if the priority is smaller than &quot;medium&quot;.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>This label turns red, if any recipient receives an amount smaller than %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+4"/>
+ <source>This means a fee of at least %1 is required.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-3"/>
+ <source>Amounts below 0.546 times the minimum relay fee are shown as dust.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>This label turns red, if the change is smaller than %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
+ <location line="+66"/>
+ <source>(no label)</source>
+ <translation>(chưa có nhãn)</translation>
+ </message>
+ <message>
+ <location line="-9"/>
+ <source>change from %1 (%2)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>(change)</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>EditAddressDialog</name>
<message>
<location filename="../forms/editaddressdialog.ui" line="+14"/>
@@ -715,7 +1014,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+21"/>
+ <location filename="../editaddressdialog.cpp" line="+28"/>
<source>New receiving address</source>
<translation type="unfinished"/>
</message>
@@ -758,7 +1057,7 @@ Address: %4
<context>
<name>FreespaceChecker</name>
<message>
- <location filename="../intro.cpp" line="+61"/>
+ <location filename="../intro.cpp" line="+65"/>
<source>A new data directory will be created.</source>
<translation type="unfinished"/>
</message>
@@ -784,15 +1083,19 @@ Address: %4
</message>
</context>
<context>
- <name>GUIUtil::HelpMessageBox</name>
+ <name>HelpMessageDialog</name>
<message>
- <location filename="../guiutil.cpp" line="+558"/>
- <location line="+13"/>
- <source>Bitcoin-Qt</source>
+ <location filename="../forms/helpmessagedialog.ui" line="+19"/>
+ <source>Bitcoin Core - Command-line options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-13"/>
+ <location filename="../utilitydialog.cpp" line="+38"/>
+ <source>Bitcoin Core</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
<source>version</source>
<translation type="unfinished"/>
</message>
@@ -841,17 +1144,17 @@ Address: %4
</message>
<message>
<location line="+9"/>
- <source>Welcome to Bitcoin-Qt.</source>
+ <source>Welcome to Bitcoin Core.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+26"/>
- <source>As this is the first time the program is launched, you can choose where Bitcoin-Qt will store its data.</source>
+ <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+10"/>
- <source>Bitcoin-Qt will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
+ <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -865,7 +1168,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../intro.cpp" line="+105"/>
+ <location filename="../intro.cpp" line="+85"/>
+ <source>Bitcoin</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error: Specified data directory &quot;%1&quot; can not be created.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+19"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
@@ -881,6 +1194,34 @@ Address: %4
</message>
</context>
<context>
+ <name>OpenURIDialog</name>
+ <message>
+ <location filename="../forms/openuridialog.ui" line="+14"/>
+ <source>Open URI</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Open payment request from URI or file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>URI:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Select payment request file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../openuridialog.cpp" line="+47"/>
+ <source>Select payment request file to open</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OptionsDialog</name>
<message>
<location filename="../forms/optionsdialog.ui" line="+14"/>
@@ -888,7 +1229,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+13"/>
<source>&amp;Main</source>
<translation type="unfinished"/>
</message>
@@ -913,57 +1254,87 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+35"/>
- <source>Reset all client options to default.</source>
+ <location line="+9"/>
+ <source>Size of &amp;database cache</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>&amp;Reset Options</source>
+ <location line="+13"/>
+ <source>Set database cache size in megabytes (default: 25)</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+13"/>
- <source>&amp;Network</source>
+ <source>MB</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>
+ <location line="+27"/>
+ <source>Number of script &amp;verification threads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Connect to the Bitcoin network through a SOCKS proxy.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
- <source>Map port using &amp;UPnP</source>
+ <source>&amp;Connect through SOCKS proxy (default proxy):</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>
+ <location line="+34"/>
+ <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+224"/>
+ <source>Active command-line options that override above options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
+ <source>Reset all client options to default.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
- <source>&amp;Connect through SOCKS proxy:</source>
+ <source>&amp;Reset Options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+9"/>
- <source>Proxy &amp;IP:</source>
+ <location line="-323"/>
+ <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="+19"/>
- <source>IP address of the proxy (e.g. 127.0.0.1)</source>
+ <source>Proxy &amp;IP:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="+32"/>
<source>&amp;Port:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+19"/>
+ <location line="+25"/>
<source>Port of the proxy (e.g. 9050)</source>
<translation type="unfinished"/>
</message>
@@ -1038,7 +1409,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+71"/>
+ <location line="+7"/>
+ <source>Whether to show coin control features or not.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Display coin &amp;control features (experts only)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+136"/>
<source>&amp;OK</source>
<translation type="unfinished"/>
</message>
@@ -1048,44 +1429,38 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>&amp;Apply</source>
+ <location filename="../optionsdialog.cpp" line="+67"/>
+ <source>default</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+58"/>
- <source>default</source>
+ <location line="+57"/>
+ <source>none</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+130"/>
+ <location line="+75"/>
<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>
+ <location line="+29"/>
+ <source>Client restart required to activate changes.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
- <location line="+9"/>
- <source>Warning</source>
+ <location line="-29"/>
+ <source>Client will be shutdown, do you want to proceed?</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-9"/>
- <location line="+9"/>
- <source>This setting will take effect after restarting Bitcoin.</source>
+ <location line="+33"/>
+ <source>This change would require a client restart.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+29"/>
+ <location line="+34"/>
<source>The supplied proxy address is invalid.</source>
<translation type="unfinished"/>
</message>
@@ -1099,22 +1474,22 @@ Address: %4
</message>
<message>
<location line="+50"/>
- <location line="+202"/>
+ <location line="+231"/>
<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="-131"/>
+ <location line="-155"/>
<source>Unconfirmed:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-78"/>
+ <location line="-83"/>
<source>Wallet</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+49"/>
+ <location line="+51"/>
<source>Confirmed:</source>
<translation type="unfinished"/>
</message>
@@ -1124,12 +1499,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+29"/>
+ <location line="+32"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+16"/>
<source>Immature:</source>
<translation type="unfinished"/>
</message>
@@ -1139,7 +1514,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+16"/>
<source>Total:</source>
<translation type="unfinished"/>
</message>
@@ -1149,12 +1524,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+53"/>
+ <location line="+71"/>
<source>&lt;b&gt;Recent transactions&lt;/b&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../overviewpage.cpp" line="+116"/>
+ <location filename="../overviewpage.cpp" line="+120"/>
<location line="+1"/>
<source>out of sync</source>
<translation type="unfinished"/>
@@ -1163,7 +1538,8 @@ Address: %4
<context>
<name>PaymentServer</name>
<message>
- <location filename="../paymentserver.cpp" line="+392"/>
+ <location filename="../paymentserver.cpp" line="+403"/>
+ <location line="+13"/>
<source>URI handling</source>
<translation type="unfinished"/>
</message>
@@ -1173,45 +1549,82 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+69"/>
+ <location line="+96"/>
<source>Requested payment amount of %1 is too small (considered dust).</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
- <location line="+37"/>
+ <location line="-221"/>
+ <location line="+212"/>
+ <location line="+13"/>
+ <location line="+95"/>
+ <location line="+18"/>
+ <location line="+16"/>
<source>Payment request error</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="-353"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Net manager warning</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+1"/>
- <source>Insecure requests to custom payment scripts unsupported</source>
+ <source>Your active proxy doesn&apos;t support SOCKS5, which is required for payment requests via proxy.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+38"/>
+ <location line="+52"/>
+ <source>Payment request fetch URL is invalid: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Payment request file handling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Payment request file can not be read or processed! This can be caused by an invalid payment request file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+73"/>
+ <source>Unverified payment requests to custom payment scripts are unsupported.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+59"/>
<source>Refund from %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
+ <location line="+43"/>
<source>Error communicating with %1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+24"/>
+ <source>Payment request can not be parsed or processed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
<source>Bad response from server %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+32"/>
+ <location line="+33"/>
<source>Payment acknowledged</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-58"/>
- <location line="+30"/>
- <location line="+17"/>
+ <location line="-11"/>
<source>Network request error</source>
<translation type="unfinished"/>
</message>
@@ -1219,32 +1632,26 @@ Address: %4
<context>
<name>QObject</name>
<message>
- <location filename="../bitcoin.cpp" line="+114"/>
- <location line="+5"/>
- <location filename="../intro.cpp" line="-32"/>
+ <location filename="../bitcoin.cpp" line="+71"/>
+ <location line="+11"/>
<source>Bitcoin</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-4"/>
+ <location line="+1"/>
<source>Error: Specified data directory &quot;%1&quot; does not exist.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="-12"/>
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../intro.cpp" line="+1"/>
- <source>Error: Specified data directory &quot;%1&quot; can not be created.</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>QRImageWidget</name>
<message>
- <location filename="../receiverequestdialog.cpp" line="+32"/>
+ <location filename="../receiverequestdialog.cpp" line="+36"/>
<source>&amp;Save Image...</source>
<translation type="unfinished"/>
</message>
@@ -1260,7 +1667,7 @@ Address: %4
</message>
<message>
<location line="+0"/>
- <source>PNG Images (*.png)</source>
+ <source>PNG Image (*.png)</source>
<translation type="unfinished"/>
</message>
</context>
@@ -1278,15 +1685,16 @@ Address: %4
<location line="+23"/>
<location line="+23"/>
<location line="+36"/>
- <location line="+53"/>
+ <location line="+23"/>
+ <location line="+36"/>
<location line="+23"/>
<location line="+23"/>
- <location filename="../rpcconsole.cpp" line="+352"/>
+ <location filename="../rpcconsole.cpp" line="+359"/>
<source>N/A</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-217"/>
+ <location line="-223"/>
<source>Client version</source>
<translation type="unfinished"/>
</message>
@@ -1296,7 +1704,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+68"/>
+ <location line="-10"/>
+ <source>Debug window</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+25"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+53"/>
<source>Using OpenSSL version</source>
<translation type="unfinished"/>
</message>
@@ -1312,16 +1730,16 @@ Address: %4
</message>
<message>
<location line="+7"/>
- <source>Number of connections</source>
+ <source>Name</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+23"/>
- <source>On testnet</source>
+ <source>Number of connections</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+23"/>
+ <location line="+29"/>
<source>Block chain</source>
<translation type="unfinished"/>
</message>
@@ -1346,21 +1764,6 @@ Address: %4
<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"/>
@@ -1391,22 +1794,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-541"/>
+ <location line="-521"/>
<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"/>
+ <location line="+206"/>
<source>Debug log file</source>
<translation type="unfinished"/>
</message>
@@ -1416,7 +1809,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+102"/>
+ <location line="+76"/>
<source>Clear console</source>
<translation type="unfinished"/>
</message>
@@ -1436,7 +1829,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+128"/>
+ <location line="+122"/>
<source>%1 B</source>
<translation type="unfinished"/>
</message>
@@ -1474,48 +1867,48 @@ Address: %4
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+22"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
<source>&amp;Amount:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
- <source>The amount to request</source>
+ <location line="-13"/>
+ <source>&amp;Label:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>&amp;Label:</source>
+ <location line="-34"/>
+ <source>&amp;Message:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>The label to associate with the receiving address</source>
+ <location line="-17"/>
+ <source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>&amp;Message:</source>
+ <location line="+3"/>
+ <source>R&amp;euse an existing receiving address (not recommended)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>The message to attach to payment request</source>
+ <location line="+27"/>
+ <source>An optional label to associate with the new receiving address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
- <source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
+ <location line="+7"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>R&amp;euse an existing receiving address (not recommended)</source>
+ <location line="+7"/>
+ <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>Use this form to request payments. All fields are optional.</source>
+ <location line="+39"/>
+ <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1533,6 +1926,31 @@ Address: %4
<source>&amp;Request payment</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+47"/>
+ <source>Requested payments</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Show the selected request (does the same as double clicking an entry)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Show</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Remove the selected entries from the list</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Remove</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
@@ -1553,16 +1971,11 @@ Address: %4
</message>
<message>
<location line="+7"/>
- <source>&amp;Copy Image</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+7"/>
<source>&amp;Save Image...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../receiverequestdialog.cpp" line="+58"/>
+ <location filename="../receiverequestdialog.cpp" line="+56"/>
<source>Request payment to %1</source>
<translation type="unfinished"/>
</message>
@@ -1608,16 +2021,119 @@ Address: %4
</message>
</context>
<context>
+ <name>RecentRequestsTableModel</name>
+ <message>
+ <location filename="../recentrequeststablemodel.cpp" line="+24"/>
+ <source>Date</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Label</source>
+ <translation>Nhãn dữ liệu</translation>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Amount</source>
+ <translation>Số lượng</translation>
+ </message>
+ <message>
+ <location line="+38"/>
+ <source>(no label)</source>
+ <translation>(chưa có nhãn)</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>(no message)</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+140"/>
- <location line="+213"/>
+ <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location line="+80"/>
<source>Send Coins</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+50"/>
+ <location line="+76"/>
+ <source>Coin Control Features</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Inputs...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>automatically selected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Insufficient funds!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+89"/>
+ <source>Quantity:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+35"/>
+ <source>Bytes:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Amount:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Priority:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Low Output:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>After Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Change:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+44"/>
+ <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Custom change address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+115"/>
<source>Send to multiple recipients at once</source>
<translation type="unfinished"/>
</message>
@@ -1642,12 +2158,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>123.456 BTC</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+31"/>
+ <location line="+41"/>
<source>Confirm the send action</source>
<translation type="unfinished"/>
</message>
@@ -1657,69 +2168,135 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-154"/>
+ <location filename="../sendcoinsdialog.cpp" line="-228"/>
<source>Confirm send coins</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-90"/>
+ <location line="-74"/>
<location line="+5"/>
<location line="+5"/>
+ <location line="+4"/>
<source>%1 to %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+26"/>
+ <location line="-136"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Copy quantity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy after fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy bytes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy low output</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy change</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+170"/>
+ <source>Total Amount %1 (= %2)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>or</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+202"/>
<source>The recipient address is not valid, please recheck.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The amount to pay must be larger than 0.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The amount exceeds your balance.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The total exceeds your balance when the %1 transaction fee is included.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+3"/>
<source>Duplicate address found, can only send to each address once per send operation.</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="+3"/>
+ <source>Transaction creation failed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+4"/>
- <source>Error: Transaction creation failed!</source>
+ <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+15"/>
- <source>Are you sure you want to send?</source>
+ <location line="+112"/>
+ <source>Warning: Invalid Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+9"/>
- <source>added as transaction fee</source>
+ <location line="+21"/>
+ <source>(no label)</source>
+ <translation>(chưa có nhãn)</translation>
+ </message>
+ <message>
+ <location line="-11"/>
+ <source>Warning: Unknown change address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
- <source>Total Amount %1</source>
+ <location line="-366"/>
+ <source>Are you sure you want to send?</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+20"/>
- <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>
+ <location line="+9"/>
+ <source>added as transaction fee</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+144"/>
+ <location line="+170"/>
<source>Payment request expired</source>
<translation type="unfinished"/>
</message>
@@ -1732,39 +2309,44 @@ Address: %4
<context>
<name>SendCoinsEntry</name>
<message>
- <location filename="../forms/sendcoinsentry.ui" line="+33"/>
- <location line="+585"/>
+ <location filename="../forms/sendcoinsentry.ui" line="+131"/>
+ <location line="+521"/>
+ <location line="+536"/>
<source>A&amp;mount:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-572"/>
- <location line="+585"/>
+ <location line="-1152"/>
<source>Pay &amp;To:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-551"/>
+ <location line="+18"/>
<source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../sendcoinsentry.cpp" line="+28"/>
+ <location filename="../sendcoinsentry.cpp" line="+30"/>
<source>Enter a label for this address to add it to your address book</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../forms/sendcoinsentry.ui" line="-18"/>
+ <location filename="../forms/sendcoinsentry.ui" line="+57"/>
<source>&amp;Label:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+28"/>
+ <location line="-50"/>
<source>Choose previously used address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
+ <location line="-40"/>
+ <source>This is a normal payment.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+50"/>
<source>Alt+A</source>
<translation type="unfinished"/>
</message>
@@ -1780,16 +2362,45 @@ Address: %4
</message>
<message>
<location line="+7"/>
- <source>Remove this recipient</source>
+ <location line="+524"/>
+ <location line="+536"/>
+ <source>Remove this entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="-1008"/>
+ <source>Message:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+958"/>
+ <source>This is a verified payment request.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-991"/>
<source>Enter a label for this address to add it to the list of used addresses</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+465"/>
+ <location line="+459"/>
+ <source>This is an unverified payment request.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+18"/>
+ <location line="+532"/>
+ <source>Pay To:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-498"/>
+ <location line="+536"/>
<source>Memo:</source>
<translation type="unfinished"/>
</message>
@@ -1800,6 +2411,19 @@ Address: %4
</message>
</context>
<context>
+ <name>ShutdownWindow</name>
+ <message>
+ <location filename="../utilitydialog.cpp" line="+48"/>
+ <source>Bitcoin Core is shutting down...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Do not shut down the computer until this window disappears.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>SignVerifyMessageDialog</name>
<message>
<location filename="../forms/signverifymessagedialog.ui" line="+14"/>
@@ -1807,7 +2431,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+10"/>
<source>&amp;Sign Message</source>
<translation type="unfinished"/>
</message>
@@ -1910,7 +2534,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+27"/>
+ <location filename="../signverifymessagedialog.cpp" line="+29"/>
<location line="+3"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation type="unfinished"/>
@@ -1926,7 +2550,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+85"/>
+ <location line="+84"/>
<location line="+81"/>
<source>The entered address is invalid.</source>
<translation type="unfinished"/>
@@ -1995,8 +2619,13 @@ Address: %4
<context>
<name>SplashScreen</name>
<message>
- <location filename="../splashscreen.cpp" line="+23"/>
- <source>The Bitcoin developers</source>
+ <location filename="../splashscreen.cpp" line="+28"/>
+ <source>Bitcoin Core</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
<message>
@@ -2008,7 +2637,7 @@ Address: %4
<context>
<name>TrafficGraphWidget</name>
<message>
- <location filename="../trafficgraphwidget.cpp" line="+75"/>
+ <location filename="../trafficgraphwidget.cpp" line="+79"/>
<source>KB/s</source>
<translation type="unfinished"/>
</message>
@@ -2016,7 +2645,7 @@ Address: %4
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="+22"/>
+ <location filename="../transactiondesc.cpp" line="+28"/>
<source>Open until %1</source>
<translation type="unfinished"/>
</message>
@@ -2089,12 +2718,12 @@ Address: %4
<location line="+12"/>
<location line="+45"/>
<location line="+17"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Credit</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="-120"/>
+ <location line="-125"/>
<source>matures in %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
@@ -2107,12 +2736,12 @@ Address: %4
<location line="+44"/>
<location line="+8"/>
<location line="+15"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Debit</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-57"/>
+ <location line="-62"/>
<source>Transaction fee</source>
<translation type="unfinished"/>
</message>
@@ -2123,11 +2752,12 @@ Address: %4
</message>
<message>
<location line="+6"/>
+ <location line="+9"/>
<source>Message</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="-7"/>
<source>Comment</source>
<translation type="unfinished"/>
</message>
@@ -2137,7 +2767,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+18"/>
<source>Merchant</source>
<translation type="unfinished"/>
</message>
@@ -2177,7 +2807,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-227"/>
+ <location line="-232"/>
<source>, has not been successfully broadcast yet</source>
<translation type="unfinished"/>
</message>
@@ -2208,7 +2838,7 @@ Address: %4
<context>
<name>TransactionTableModel</name>
<message>
- <location filename="../transactiontablemodel.cpp" line="+227"/>
+ <location filename="../transactiontablemodel.cpp" line="+234"/>
<source>Date</source>
<translation type="unfinished"/>
</message>
@@ -2227,8 +2857,13 @@ Address: %4
<source>Amount</source>
<translation>Số lượng</translation>
</message>
+ <message>
+ <location line="+59"/>
+ <source>Immature (%1 confirmations, will be available after %2)</source>
+ <translation type="unfinished"/>
+ </message>
<message numerus="yes">
- <location line="+57"/>
+ <location line="+16"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
@@ -2248,17 +2883,13 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
+ <location line="-22"/>
+ <location line="+25"/>
<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></translation>
- </message>
<message>
- <location line="+5"/>
+ <location line="-22"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation type="unfinished"/>
</message>
@@ -2268,7 +2899,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+43"/>
+ <location line="+62"/>
<source>Received with</source>
<translation type="unfinished"/>
</message>
@@ -2326,7 +2957,7 @@ Address: %4
<context>
<name>TransactionView</name>
<message>
- <location filename="../transactionview.cpp" line="+52"/>
+ <location filename="../transactionview.cpp" line="+57"/>
<location line="+16"/>
<source>All</source>
<translation type="unfinished"/>
@@ -2387,12 +3018,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="+6"/>
<source>Enter address or label to search</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="+6"/>
<source>Min amount</source>
<translation type="unfinished"/>
</message>
@@ -2427,17 +3058,37 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+143"/>
- <source>Export Transaction Data</source>
+ <location line="+142"/>
+ <source>Export Transaction History</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="+19"/>
+ <source>Exporting Failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>There was an error trying to save the transaction history to %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Exporting Successful</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The transaction history was successfully saved to %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-22"/>
<source>Comma separated file (*.csv)</source>
<translation>Tập tin tách biệt bởi dấu phẩy (*.csv)</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+9"/>
<source>Confirmed</source>
<translation type="unfinished"/>
</message>
@@ -2472,17 +3123,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
- <source>Error exporting</source>
- <translation>Xảy ra lỗi khi xuất dữ liệu</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation>Không thể ghi dữ liệu vào tập tin %1.</translation>
- </message>
- <message>
- <location line="+100"/>
+ <location line="+107"/>
<source>Range:</source>
<translation type="unfinished"/>
</message>
@@ -2493,9 +3134,17 @@ Address: %4
</message>
</context>
<context>
+ <name>WalletFrame</name>
+ <message>
+ <location filename="../walletframe.cpp" line="+26"/>
+ <source>No wallet has been loaded.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>WalletModel</name>
<message>
- <location filename="../walletmodel.cpp" line="+218"/>
+ <location filename="../walletmodel.cpp" line="+245"/>
<source>Send Coins</source>
<translation type="unfinished"/>
</message>
@@ -2503,7 +3152,7 @@ Address: %4
<context>
<name>WalletView</name>
<message>
- <location filename="../walletview.cpp" line="+46"/>
+ <location filename="../walletview.cpp" line="+43"/>
<source>&amp;Export</source>
<translation type="unfinished"/>
</message>
@@ -2513,65 +3162,60 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+183"/>
+ <location line="+181"/>
<source>Backup Wallet</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
+ <location line="+1"/>
<source>Wallet Data (*.dat)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
+ <location line="+6"/>
<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>
+ <source>There was an error trying to save the wallet data to %1.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+4"/>
- <source>Backup Successful</source>
+ <source>The wallet data was successfully saved to %1.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+0"/>
- <source>The wallet data was successfully saved to the new location.</source>
+ <source>Backup Successful</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+102"/>
- <source>Bitcoin version</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+107"/>
+ <location filename="../bitcoinstrings.cpp" line="+221"/>
<source>Usage:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-55"/>
+ <location line="-54"/>
<source>List commands</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-13"/>
+ <location line="-14"/>
<source>Get help for a command</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+25"/>
+ <location line="+26"/>
<source>Options:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+24"/>
+ <location line="+22"/>
<source>Specify configuration file (default: bitcoin.conf)</source>
<translation type="unfinished"/>
</message>
@@ -2591,7 +3235,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-28"/>
+ <location line="-26"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
<translation type="unfinished"/>
</message>
@@ -2601,7 +3245,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-49"/>
+ <location line="-51"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation type="unfinished"/>
</message>
@@ -2611,37 +3255,37 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-142"/>
+ <location line="-148"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-33"/>
+ <location line="-36"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+40"/>
+ <location line="+45"/>
<source>Accept command line and JSON-RPC commands</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<source>Run in the background as a daemon and accept commands</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+40"/>
+ <location line="+39"/>
<source>Use the test network</source>
<translation type="unfinished"/>
</message>
@@ -2651,7 +3295,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-87"/>
+ <location line="-95"/>
<source>%s, you must set a rpcpassword in the configuration file:
%s
It is recommended you use the following random password:
@@ -2692,6 +3336,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+4"/>
+ <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</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>
@@ -2706,17 +3355,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+11"/>
- <source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source>
+ <location line="+18"/>
+ <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="+6"/>
- <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
+ <location line="+5"/>
+ <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+3"/>
<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>
@@ -2746,17 +3395,27 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
+ <location line="+9"/>
+ <source>&lt;category&gt; can be:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
<source>Attempt to recover private keys from a corrupt wallet.dat</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
+ <source>Bitcoin Core Daemon</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Bitcoin RPC client version</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
<source>Block creation options:</source>
<translation type="unfinished"/>
</message>
@@ -2766,7 +3425,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
+ <source>Connect through SOCKS proxy</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect to JSON-RPC on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation type="unfinished"/>
</message>
@@ -2782,6 +3446,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+1"/>
+ <source>Do not load the wallet and disable wallet RPC calls</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Do you want to rebuild the block database now?</source>
<translation type="unfinished"/>
</message>
@@ -2876,7 +3545,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
+ <source>Fee per kB to add to transactions you send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Find peers using DNS lookup (default: 1 unless -connect)</source>
<translation type="unfinished"/>
</message>
@@ -2896,6 +3570,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
+ <location line="+1"/>
+ <source>If &lt;category&gt; is not supplied, output all debugging information.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+2"/>
<source>Incorrect or no genesis block found. Wrong datadir for network?</source>
<translation type="unfinished"/>
@@ -2911,17 +3590,37 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+8"/>
+ <location line="+5"/>
+ <source>Prepend debug output with timestamp (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>RPC client options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Rebuild block chain index from current blk000??.dat files</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+5"/>
+ <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Send command to Bitcoin server</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
+ <location line="+7"/>
+ <source>Set maximum block size in bytes (default: %d)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Set the number of threads to service RPC calls (default: 4)</source>
<translation type="unfinished"/>
</message>
@@ -2936,12 +3635,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+12"/>
+ <location line="+3"/>
+ <source>This is intended for regression testing tools and app development.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Usage (deprecated, use bitcoin-cli):</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+8"/>
+ <location line="+7"/>
<source>Verifying blocks...</source>
<translation type="unfinished"/>
</message>
@@ -2952,31 +3656,56 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+1"/>
+ <source>Wait for RPC server to start</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Wallet %s resides outside data directory %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+2"/>
+ <source>Wallet options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>You need to rebuild the database using -reindex to change -txindex</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-78"/>
+ <location line="-79"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-98"/>
+ <location line="-105"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+17"/>
+ <location line="+14"/>
+ <source>Output debugging information (default: 0, supplying &lt;category&gt; is optional)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+83"/>
+ <location line="+89"/>
<source>Information</source>
<translation type="unfinished"/>
</message>
@@ -3016,47 +3745,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<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"/>
+ <location line="+9"/>
<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"/>
+ <location line="+4"/>
<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"/>
+ <location line="+6"/>
<source>Set minimum block size in bytes (default: 0)</source>
<translation type="unfinished"/>
</message>
@@ -3081,7 +3780,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Transaction amount too small</source>
<translation type="unfinished"/>
</message>
@@ -3106,32 +3805,32 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<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="+5"/>
+ <location line="+7"/>
<source>Warning</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Warning: This version is obsolete, upgrade required!</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+2"/>
+ <source>version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>wallet.dat corrupt, salvage failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-54"/>
+ <location line="-58"/>
<source>Password for JSON-RPC connections</source>
<translation type="unfinished"/>
</message>
@@ -3141,27 +3840,27 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-126"/>
+ <location line="-132"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+155"/>
+ <location line="+161"/>
<source>Upgrade wallet to latest format</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-12"/>
+ <location line="-11"/>
<source>Rescan the block chain for missing wallet transactions</source>
<translation type="unfinished"/>
</message>
@@ -3171,7 +3870,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-29"/>
+ <location line="-30"/>
<source>Server certificate file (default: server.cert)</source>
<translation type="unfinished"/>
</message>
@@ -3186,27 +3885,22 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Unable to bind to %s on this computer (bind returned error %d, %s)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-95"/>
- <source>Connect through socks proxy</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="-11"/>
+ <location line="-107"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+58"/>
+ <location line="+60"/>
<source>Loading addresses...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-36"/>
+ <location line="-37"/>
<source>Error loading wallet.dat: Wallet corrupted</source>
<translation type="unfinished"/>
</message>
@@ -3226,12 +3920,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+30"/>
+ <location line="+31"/>
<source>Invalid -proxy address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+57"/>
+ <location line="+56"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3241,7 +3935,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3251,7 +3945,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+46"/>
+ <location line="+48"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3271,27 +3965,22 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-60"/>
+ <location line="-62"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-28"/>
+ <location line="-32"/>
<source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+69"/>
- <source>Fee per KB to add to transactions you send</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+20"/>
+ <location line="+95"/>
<source>Loading wallet...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-54"/>
+ <location line="-56"/>
<source>Cannot downgrade wallet</source>
<translation type="unfinished"/>
</message>
@@ -3301,7 +3990,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+66"/>
+ <location line="+67"/>
<source>Rescanning...</source>
<translation type="unfinished"/>
</message>
@@ -3321,7 +4010,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-33"/>
+ <location line="-35"/>
<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_vi_VN.ts b/src/qt/locale/bitcoin_vi_VN.ts
index 44d92481f2..4a5eb877ea 100644
--- a/src/qt/locale/bitcoin_vi_VN.ts
+++ b/src/qt/locale/bitcoin_vi_VN.ts
@@ -3,12 +3,12 @@
<name>AboutDialog</name>
<message>
<location filename="../forms/aboutdialog.ui" line="+14"/>
- <source>About Bitcoin</source>
+ <source>About Bitcoin Core</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+39"/>
- <source>&lt;b&gt;Bitcoin&lt;/b&gt; version</source>
+ <source>&lt;b&gt;Bitcoin Core&lt;/b&gt; version</source>
<translation type="unfinished"/>
</message>
<message>
@@ -22,13 +22,13 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location filename="../aboutdialog.cpp" line="+14"/>
+ <location filename="../utilitydialog.cpp" line="+29"/>
<source>Copyright</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+0"/>
- <source>The Bitcoin developers</source>
+ <source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
</context>
@@ -42,7 +42,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+27"/>
<source>Create a new address</source>
- <translation type="unfinished"/>
+ <translation>Tạo một địa chỉ mới</translation>
</message>
<message>
<location line="+3"/>
@@ -65,7 +65,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location filename="../addressbookpage.cpp" line="+72"/>
+ <location filename="../addressbookpage.cpp" line="+74"/>
<source>&amp;Copy Address</source>
<translation type="unfinished"/>
</message>
@@ -135,7 +135,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+197"/>
+ <location line="+194"/>
<source>Export Address List</source>
<translation type="unfinished"/>
</message>
@@ -146,19 +146,19 @@ This product includes software developed by the OpenSSL Project for use in the O
</message>
<message>
<location line="+13"/>
- <source>Error exporting</source>
+ <source>Exporting Failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
+ <location line="+1"/>
+ <source>There was an error trying to save the address list to %1.</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>AddressTableModel</name>
<message>
- <location filename="../addresstablemodel.cpp" line="+164"/>
+ <location filename="../addresstablemodel.cpp" line="+168"/>
<source>Label</source>
<translation type="unfinished"/>
</message>
@@ -196,7 +196,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location filename="../askpassphrasedialog.cpp" line="+34"/>
+ <location filename="../askpassphrasedialog.cpp" line="+40"/>
<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>
@@ -317,22 +317,27 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+250"/>
+ <location filename="../bitcoingui.cpp" line="+295"/>
<source>Sign &amp;message...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+254"/>
+ <location line="+335"/>
<source>Synchronizing with network...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-324"/>
+ <location line="-407"/>
<source>&amp;Overview</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="-137"/>
+ <source>Node</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+138"/>
<source>Show general overview of wallet</source>
<translation type="unfinished"/>
</message>
@@ -347,7 +352,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>E&amp;xit</source>
<translation type="unfinished"/>
</message>
@@ -393,7 +398,22 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+259"/>
+ <location line="+10"/>
+ <source>&amp;Sending addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Receiving addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open &amp;URI...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+325"/>
<source>Importing blocks from disk...</source>
<translation type="unfinished"/>
</message>
@@ -403,12 +423,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="-322"/>
+ <location line="-405"/>
<source>Send coins to a Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+47"/>
+ <location line="+49"/>
<source>Modify configuration options for Bitcoin</source>
<translation type="unfinished"/>
</message>
@@ -438,20 +458,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="-180"/>
- <location line="+6"/>
- <location line="+513"/>
+ <location line="+430"/>
<source>Bitcoin</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-519"/>
- <location line="+6"/>
+ <location line="-643"/>
<source>Wallet</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+109"/>
+ <location line="+146"/>
<source>&amp;Send</source>
<translation type="unfinished"/>
</message>
@@ -461,13 +478,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+28"/>
- <location line="+2"/>
- <source>&amp;About Bitcoin</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+14"/>
+ <location line="+46"/>
<location line="+2"/>
<source>&amp;Show / Hide</source>
<translation type="unfinished"/>
@@ -493,64 +504,80 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+35"/>
+ <location line="+48"/>
<source>&amp;File</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
+ <location line="+14"/>
<source>&amp;Settings</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>&amp;Help</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+9"/>
+ <location line="+15"/>
<source>Tabs toolbar</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-235"/>
- <location line="+294"/>
+ <location line="-284"/>
+ <location line="+376"/>
<source>[testnet]</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-177"/>
+ <location line="-401"/>
+ <source>Bitcoin Core</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+163"/>
<source>Request payments (generates QR codes and bitcoin: URIs)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+63"/>
- <source>&amp;Used sending addresses...</source>
+ <location line="+29"/>
+ <location line="+2"/>
+ <source>&amp;About Bitcoin Core</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="+35"/>
<source>Show the list of used sending addresses and labels</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
- <source>Used &amp;receiving addresses...</source>
+ <location line="+2"/>
+ <source>Show the list of used receiving addresses and labels</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open a bitcoin: URI or payment request</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Command-line options</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
- <source>Show the list of used receiving addresses and labels</source>
+ <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+106"/>
+ <location line="+159"/>
<location line="+5"/>
<source>Bitcoin client</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+120"/>
+ <location line="+142"/>
<source>%n active connection(s) to Bitcoin network</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
@@ -570,7 +597,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="+20"/>
+ <location line="+23"/>
<source>%n hour(s)</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
@@ -590,7 +617,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
+ <location line="+21"/>
<source>Last received block was generated %1 ago.</source>
<translation type="unfinished"/>
</message>
@@ -615,27 +642,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation type="unfinished"/>
</message>
<message>
- <location line="+77"/>
- <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="-152"/>
+ <location line="-85"/>
<source>Up to date</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Catching up...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+124"/>
- <source>Confirm transaction fee</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+130"/>
<source>Sent transaction</source>
<translation type="unfinished"/>
</message>
@@ -654,17 +671,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+34"/>
- <source>URI handling</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+0"/>
- <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="+45"/>
+ <location line="+69"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation type="unfinished"/>
</message>
@@ -674,7 +681,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+110"/>
+ <location filename="../bitcoin.cpp" line="+438"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation type="unfinished"/>
</message>
@@ -682,12 +689,304 @@ Address: %4
<context>
<name>ClientModel</name>
<message>
- <location filename="../clientmodel.cpp" line="+115"/>
+ <location filename="../clientmodel.cpp" line="+119"/>
<source>Network Alert</source>
<translation type="unfinished"/>
</message>
</context>
<context>
+ <name>CoinControlDialog</name>
+ <message>
+ <location filename="../forms/coincontroldialog.ui" line="+14"/>
+ <source>Coin Control Address Selection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>Quantity:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Bytes:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>Amount:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+29"/>
+ <source>Priority:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+45"/>
+ <source>Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Low Output:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>After Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Change:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+63"/>
+ <source>(un)select all</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Tree mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>List mode</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>Amount</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Date</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Confirmations</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Confirmed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../coincontroldialog.cpp" line="+42"/>
+ <source>Copy address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy label</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+26"/>
+ <source>Copy amount</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-25"/>
+ <source>Copy transaction ID</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Lock unspent</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Unlock unspent</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+22"/>
+ <source>Copy quantity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Copy fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy after fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy bytes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy low output</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy change</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+323"/>
+ <source>highest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>higher</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>high</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>medium-high</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>medium</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>low-medium</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>low</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>lower</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>lowest</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>(%1 locked)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+31"/>
+ <source>none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+140"/>
+ <source>Dust</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>yes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>no</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>This label turns red, if the transaction size is greater than 1000 bytes.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+5"/>
+ <source>This means a fee of at least %1 per kB is required.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-4"/>
+ <source>Can vary +/- 1 byte per input.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Transactions with higher priority are more likely to get included into a block.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>This label turns red, if the priority is smaller than &quot;medium&quot;.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>This label turns red, if any recipient receives an amount smaller than %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <location line="+4"/>
+ <source>This means a fee of at least %1 is required.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-3"/>
+ <source>Amounts below 0.546 times the minimum relay fee are shown as dust.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>This label turns red, if the change is smaller than %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
+ <location line="+66"/>
+ <source>(no label)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-9"/>
+ <source>change from %1 (%2)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>(change)</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>EditAddressDialog</name>
<message>
<location filename="../forms/editaddressdialog.ui" line="+14"/>
@@ -715,7 +1014,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+21"/>
+ <location filename="../editaddressdialog.cpp" line="+28"/>
<source>New receiving address</source>
<translation type="unfinished"/>
</message>
@@ -758,7 +1057,7 @@ Address: %4
<context>
<name>FreespaceChecker</name>
<message>
- <location filename="../intro.cpp" line="+61"/>
+ <location filename="../intro.cpp" line="+65"/>
<source>A new data directory will be created.</source>
<translation type="unfinished"/>
</message>
@@ -784,15 +1083,19 @@ Address: %4
</message>
</context>
<context>
- <name>GUIUtil::HelpMessageBox</name>
+ <name>HelpMessageDialog</name>
<message>
- <location filename="../guiutil.cpp" line="+558"/>
- <location line="+13"/>
- <source>Bitcoin-Qt</source>
+ <location filename="../forms/helpmessagedialog.ui" line="+19"/>
+ <source>Bitcoin Core - Command-line options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-13"/>
+ <location filename="../utilitydialog.cpp" line="+38"/>
+ <source>Bitcoin Core</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
<source>version</source>
<translation type="unfinished"/>
</message>
@@ -841,17 +1144,17 @@ Address: %4
</message>
<message>
<location line="+9"/>
- <source>Welcome to Bitcoin-Qt.</source>
+ <source>Welcome to Bitcoin Core.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+26"/>
- <source>As this is the first time the program is launched, you can choose where Bitcoin-Qt will store its data.</source>
+ <source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+10"/>
- <source>Bitcoin-Qt will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
+ <source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -865,7 +1168,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../intro.cpp" line="+105"/>
+ <location filename="../intro.cpp" line="+85"/>
+ <source>Bitcoin</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Error: Specified data directory &quot;%1&quot; can not be created.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+19"/>
<source>Error</source>
<translation type="unfinished"/>
</message>
@@ -881,6 +1194,34 @@ Address: %4
</message>
</context>
<context>
+ <name>OpenURIDialog</name>
+ <message>
+ <location filename="../forms/openuridialog.ui" line="+14"/>
+ <source>Open URI</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Open payment request from URI or file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>URI:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Select payment request file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../openuridialog.cpp" line="+47"/>
+ <source>Select payment request file to open</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>OptionsDialog</name>
<message>
<location filename="../forms/optionsdialog.ui" line="+14"/>
@@ -888,7 +1229,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="+13"/>
<source>&amp;Main</source>
<translation type="unfinished"/>
</message>
@@ -913,57 +1254,87 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+35"/>
- <source>Reset all client options to default.</source>
+ <location line="+9"/>
+ <source>Size of &amp;database cache</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>&amp;Reset Options</source>
+ <location line="+13"/>
+ <source>Set database cache size in megabytes (default: 25)</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+13"/>
- <source>&amp;Network</source>
+ <source>MB</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>
+ <location line="+27"/>
+ <source>Number of script &amp;verification threads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Connect to the Bitcoin network through a SOCKS proxy.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
- <source>Map port using &amp;UPnP</source>
+ <source>&amp;Connect through SOCKS proxy (default proxy):</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>
+ <location line="+34"/>
+ <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+224"/>
+ <source>Active command-line options that override above options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
+ <source>Reset all client options to default.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+3"/>
- <source>&amp;Connect through SOCKS proxy:</source>
+ <source>&amp;Reset Options</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+9"/>
- <source>Proxy &amp;IP:</source>
+ <location line="-323"/>
+ <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="+19"/>
- <source>IP address of the proxy (e.g. 127.0.0.1)</source>
+ <source>Proxy &amp;IP:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="+32"/>
<source>&amp;Port:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+19"/>
+ <location line="+25"/>
<source>Port of the proxy (e.g. 9050)</source>
<translation type="unfinished"/>
</message>
@@ -1038,7 +1409,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+71"/>
+ <location line="+7"/>
+ <source>Whether to show coin control features or not.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Display coin &amp;control features (experts only)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+136"/>
<source>&amp;OK</source>
<translation type="unfinished"/>
</message>
@@ -1048,44 +1429,38 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>&amp;Apply</source>
+ <location filename="../optionsdialog.cpp" line="+67"/>
+ <source>default</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../optionsdialog.cpp" line="+58"/>
- <source>default</source>
+ <location line="+57"/>
+ <source>none</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+130"/>
+ <location line="+75"/>
<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>
+ <location line="+29"/>
+ <source>Client restart required to activate changes.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
- <location line="+9"/>
- <source>Warning</source>
+ <location line="-29"/>
+ <source>Client will be shutdown, do you want to proceed?</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-9"/>
- <location line="+9"/>
- <source>This setting will take effect after restarting Bitcoin.</source>
+ <location line="+33"/>
+ <source>This change would require a client restart.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+29"/>
+ <location line="+34"/>
<source>The supplied proxy address is invalid.</source>
<translation type="unfinished"/>
</message>
@@ -1099,22 +1474,22 @@ Address: %4
</message>
<message>
<location line="+50"/>
- <location line="+202"/>
+ <location line="+231"/>
<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="-131"/>
+ <location line="-155"/>
<source>Unconfirmed:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-78"/>
+ <location line="-83"/>
<source>Wallet</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+49"/>
+ <location line="+51"/>
<source>Confirmed:</source>
<translation type="unfinished"/>
</message>
@@ -1124,12 +1499,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+29"/>
+ <location line="+32"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+16"/>
<source>Immature:</source>
<translation type="unfinished"/>
</message>
@@ -1139,7 +1514,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+16"/>
<source>Total:</source>
<translation type="unfinished"/>
</message>
@@ -1149,12 +1524,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+53"/>
+ <location line="+71"/>
<source>&lt;b&gt;Recent transactions&lt;/b&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../overviewpage.cpp" line="+116"/>
+ <location filename="../overviewpage.cpp" line="+120"/>
<location line="+1"/>
<source>out of sync</source>
<translation type="unfinished"/>
@@ -1163,7 +1538,8 @@ Address: %4
<context>
<name>PaymentServer</name>
<message>
- <location filename="../paymentserver.cpp" line="+392"/>
+ <location filename="../paymentserver.cpp" line="+403"/>
+ <location line="+13"/>
<source>URI handling</source>
<translation type="unfinished"/>
</message>
@@ -1173,45 +1549,82 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+69"/>
+ <location line="+96"/>
<source>Requested payment amount of %1 is too small (considered dust).</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
- <location line="+37"/>
+ <location line="-221"/>
+ <location line="+212"/>
+ <location line="+13"/>
+ <location line="+95"/>
+ <location line="+18"/>
+ <location line="+16"/>
<source>Payment request error</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="-353"/>
+ <source>Cannot start bitcoin: click-to-pay handler</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Net manager warning</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+1"/>
- <source>Insecure requests to custom payment scripts unsupported</source>
+ <source>Your active proxy doesn&apos;t support SOCKS5, which is required for payment requests via proxy.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+38"/>
+ <location line="+52"/>
+ <source>Payment request fetch URL is invalid: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Payment request file handling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Payment request file can not be read or processed! This can be caused by an invalid payment request file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+73"/>
+ <source>Unverified payment requests to custom payment scripts are unsupported.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+59"/>
<source>Refund from %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+42"/>
+ <location line="+43"/>
<source>Error communicating with %1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+24"/>
+ <source>Payment request can not be parsed or processed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
<source>Bad response from server %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+32"/>
+ <location line="+33"/>
<source>Payment acknowledged</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-58"/>
- <location line="+30"/>
- <location line="+17"/>
+ <location line="-11"/>
<source>Network request error</source>
<translation type="unfinished"/>
</message>
@@ -1219,32 +1632,26 @@ Address: %4
<context>
<name>QObject</name>
<message>
- <location filename="../bitcoin.cpp" line="+114"/>
- <location line="+5"/>
- <location filename="../intro.cpp" line="-32"/>
+ <location filename="../bitcoin.cpp" line="+71"/>
+ <location line="+11"/>
<source>Bitcoin</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-4"/>
+ <location line="+1"/>
<source>Error: Specified data directory &quot;%1&quot; does not exist.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="-12"/>
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../intro.cpp" line="+1"/>
- <source>Error: Specified data directory &quot;%1&quot; can not be created.</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>QRImageWidget</name>
<message>
- <location filename="../receiverequestdialog.cpp" line="+32"/>
+ <location filename="../receiverequestdialog.cpp" line="+36"/>
<source>&amp;Save Image...</source>
<translation type="unfinished"/>
</message>
@@ -1260,7 +1667,7 @@ Address: %4
</message>
<message>
<location line="+0"/>
- <source>PNG Images (*.png)</source>
+ <source>PNG Image (*.png)</source>
<translation type="unfinished"/>
</message>
</context>
@@ -1278,15 +1685,16 @@ Address: %4
<location line="+23"/>
<location line="+23"/>
<location line="+36"/>
- <location line="+53"/>
+ <location line="+23"/>
+ <location line="+36"/>
<location line="+23"/>
<location line="+23"/>
- <location filename="../rpcconsole.cpp" line="+352"/>
+ <location filename="../rpcconsole.cpp" line="+359"/>
<source>N/A</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-217"/>
+ <location line="-223"/>
<source>Client version</source>
<translation type="unfinished"/>
</message>
@@ -1296,7 +1704,17 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+68"/>
+ <location line="-10"/>
+ <source>Debug window</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+25"/>
+ <source>General</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+53"/>
<source>Using OpenSSL version</source>
<translation type="unfinished"/>
</message>
@@ -1312,16 +1730,16 @@ Address: %4
</message>
<message>
<location line="+7"/>
- <source>Number of connections</source>
+ <source>Name</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+23"/>
- <source>On testnet</source>
+ <source>Number of connections</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+23"/>
+ <location line="+29"/>
<source>Block chain</source>
<translation type="unfinished"/>
</message>
@@ -1346,21 +1764,6 @@ Address: %4
<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"/>
@@ -1391,22 +1794,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-541"/>
+ <location line="-521"/>
<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"/>
+ <location line="+206"/>
<source>Debug log file</source>
<translation type="unfinished"/>
</message>
@@ -1416,7 +1809,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+102"/>
+ <location line="+76"/>
<source>Clear console</source>
<translation type="unfinished"/>
</message>
@@ -1436,7 +1829,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+128"/>
+ <location line="+122"/>
<source>%1 B</source>
<translation type="unfinished"/>
</message>
@@ -1474,48 +1867,48 @@ Address: %4
<context>
<name>ReceiveCoinsDialog</name>
<message>
- <location filename="../forms/receivecoinsdialog.ui" line="+22"/>
+ <location filename="../forms/receivecoinsdialog.ui" line="+83"/>
<source>&amp;Amount:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
- <source>The amount to request</source>
+ <location line="-13"/>
+ <source>&amp;Label:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>&amp;Label:</source>
+ <location line="-34"/>
+ <source>&amp;Message:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>The label to associate with the receiving address</source>
+ <location line="-17"/>
+ <source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>&amp;Message:</source>
+ <location line="+3"/>
+ <source>R&amp;euse an existing receiving address (not recommended)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>The message to attach to payment request</source>
+ <location line="+27"/>
+ <source>An optional label to associate with the new receiving address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
- <source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
+ <location line="+7"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
- <source>R&amp;euse an existing receiving address (not recommended)</source>
+ <location line="+7"/>
+ <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
- <source>Use this form to request payments. All fields are optional.</source>
+ <location line="+39"/>
+ <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1533,6 +1926,31 @@ Address: %4
<source>&amp;Request payment</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+47"/>
+ <source>Requested payments</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>Show the selected request (does the same as double clicking an entry)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Show</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Remove the selected entries from the list</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Remove</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ReceiveRequestDialog</name>
@@ -1553,16 +1971,11 @@ Address: %4
</message>
<message>
<location line="+7"/>
- <source>&amp;Copy Image</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+7"/>
<source>&amp;Save Image...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../receiverequestdialog.cpp" line="+58"/>
+ <location filename="../receiverequestdialog.cpp" line="+56"/>
<source>Request payment to %1</source>
<translation type="unfinished"/>
</message>
@@ -1608,16 +2021,119 @@ Address: %4
</message>
</context>
<context>
+ <name>RecentRequestsTableModel</name>
+ <message>
+ <location filename="../recentrequeststablemodel.cpp" line="+24"/>
+ <source>Date</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Label</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Message</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>Amount</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+38"/>
+ <source>(no label)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>(no message)</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>SendCoinsDialog</name>
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
- <location filename="../sendcoinsdialog.cpp" line="+140"/>
- <location line="+213"/>
+ <location filename="../sendcoinsdialog.cpp" line="+381"/>
+ <location line="+80"/>
<source>Send Coins</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+50"/>
+ <location line="+76"/>
+ <source>Coin Control Features</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+20"/>
+ <source>Inputs...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>automatically selected</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Insufficient funds!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+89"/>
+ <source>Quantity:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+35"/>
+ <source>Bytes:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Amount:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Priority:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Low Output:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+48"/>
+ <source>After Fee:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+32"/>
+ <source>Change:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+44"/>
+ <source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Custom change address</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+115"/>
<source>Send to multiple recipients at once</source>
<translation type="unfinished"/>
</message>
@@ -1642,12 +2158,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
- <source>123.456 BTC</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+31"/>
+ <location line="+41"/>
<source>Confirm the send action</source>
<translation type="unfinished"/>
</message>
@@ -1657,69 +2168,135 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-154"/>
+ <location filename="../sendcoinsdialog.cpp" line="-228"/>
<source>Confirm send coins</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-90"/>
+ <location line="-74"/>
<location line="+5"/>
<location line="+5"/>
+ <location line="+4"/>
<source>%1 to %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+26"/>
+ <location line="-136"/>
+ <source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+15"/>
+ <source>Copy quantity</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy amount</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy after fee</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy bytes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy priority</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy low output</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Copy change</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+170"/>
+ <source>Total Amount %1 (= %2)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>or</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+202"/>
<source>The recipient address is not valid, please recheck.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The amount to pay must be larger than 0.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The amount exceeds your balance.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+3"/>
<source>The total exceeds your balance when the %1 transaction fee is included.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+3"/>
<source>Duplicate address found, can only send to each address once per send operation.</source>
<translation type="unfinished"/>
</message>
<message>
+ <location line="+3"/>
+ <source>Transaction creation failed!</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+4"/>
- <source>Error: Transaction creation failed!</source>
+ <source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+15"/>
- <source>Are you sure you want to send?</source>
+ <location line="+112"/>
+ <source>Warning: Invalid Bitcoin address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+9"/>
- <source>added as transaction fee</source>
+ <location line="+21"/>
+ <source>(no label)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
- <source>Total Amount %1</source>
+ <location line="-11"/>
+ <source>Warning: Unknown change address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+20"/>
- <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>
+ <location line="-366"/>
+ <source>Are you sure you want to send?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>added as transaction fee</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+144"/>
+ <location line="+170"/>
<source>Payment request expired</source>
<translation type="unfinished"/>
</message>
@@ -1732,39 +2309,44 @@ Address: %4
<context>
<name>SendCoinsEntry</name>
<message>
- <location filename="../forms/sendcoinsentry.ui" line="+33"/>
- <location line="+585"/>
+ <location filename="../forms/sendcoinsentry.ui" line="+131"/>
+ <location line="+521"/>
+ <location line="+536"/>
<source>A&amp;mount:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-572"/>
- <location line="+585"/>
+ <location line="-1152"/>
<source>Pay &amp;To:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-551"/>
+ <location line="+18"/>
<source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../sendcoinsentry.cpp" line="+28"/>
+ <location filename="../sendcoinsentry.cpp" line="+30"/>
<source>Enter a label for this address to add it to your address book</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../forms/sendcoinsentry.ui" line="-18"/>
+ <location filename="../forms/sendcoinsentry.ui" line="+57"/>
<source>&amp;Label:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+28"/>
+ <location line="-50"/>
<source>Choose previously used address</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
+ <location line="-40"/>
+ <source>This is a normal payment.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+50"/>
<source>Alt+A</source>
<translation type="unfinished"/>
</message>
@@ -1780,16 +2362,45 @@ Address: %4
</message>
<message>
<location line="+7"/>
- <source>Remove this recipient</source>
+ <location line="+524"/>
+ <location line="+536"/>
+ <source>Remove this entry</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+16"/>
+ <location line="-1008"/>
+ <source>Message:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+958"/>
+ <source>This is a verified payment request.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-991"/>
<source>Enter a label for this address to add it to the list of used addresses</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+465"/>
+ <location line="+459"/>
+ <source>This is an unverified payment request.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+18"/>
+ <location line="+532"/>
+ <source>Pay To:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-498"/>
+ <location line="+536"/>
<source>Memo:</source>
<translation type="unfinished"/>
</message>
@@ -1800,6 +2411,19 @@ Address: %4
</message>
</context>
<context>
+ <name>ShutdownWindow</name>
+ <message>
+ <location filename="../utilitydialog.cpp" line="+48"/>
+ <source>Bitcoin Core is shutting down...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Do not shut down the computer until this window disappears.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>SignVerifyMessageDialog</name>
<message>
<location filename="../forms/signverifymessagedialog.ui" line="+14"/>
@@ -1807,7 +2431,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+10"/>
<source>&amp;Sign Message</source>
<translation type="unfinished"/>
</message>
@@ -1910,7 +2534,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location filename="../signverifymessagedialog.cpp" line="+27"/>
+ <location filename="../signverifymessagedialog.cpp" line="+29"/>
<location line="+3"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
<translation type="unfinished"/>
@@ -1926,7 +2550,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+85"/>
+ <location line="+84"/>
<location line="+81"/>
<source>The entered address is invalid.</source>
<translation type="unfinished"/>
@@ -1995,8 +2619,13 @@ Address: %4
<context>
<name>SplashScreen</name>
<message>
- <location filename="../splashscreen.cpp" line="+23"/>
- <source>The Bitcoin developers</source>
+ <location filename="../splashscreen.cpp" line="+28"/>
+ <source>Bitcoin Core</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>The Bitcoin Core developers</source>
<translation type="unfinished"/>
</message>
<message>
@@ -2008,7 +2637,7 @@ Address: %4
<context>
<name>TrafficGraphWidget</name>
<message>
- <location filename="../trafficgraphwidget.cpp" line="+75"/>
+ <location filename="../trafficgraphwidget.cpp" line="+79"/>
<source>KB/s</source>
<translation type="unfinished"/>
</message>
@@ -2016,7 +2645,7 @@ Address: %4
<context>
<name>TransactionDesc</name>
<message>
- <location filename="../transactiondesc.cpp" line="+22"/>
+ <location filename="../transactiondesc.cpp" line="+28"/>
<source>Open until %1</source>
<translation type="unfinished"/>
</message>
@@ -2089,12 +2718,12 @@ Address: %4
<location line="+12"/>
<location line="+45"/>
<location line="+17"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Credit</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location line="-120"/>
+ <location line="-125"/>
<source>matures in %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
@@ -2107,12 +2736,12 @@ Address: %4
<location line="+44"/>
<location line="+8"/>
<location line="+15"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Debit</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-57"/>
+ <location line="-62"/>
<source>Transaction fee</source>
<translation type="unfinished"/>
</message>
@@ -2123,11 +2752,12 @@ Address: %4
</message>
<message>
<location line="+6"/>
+ <location line="+9"/>
<source>Message</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="-7"/>
<source>Comment</source>
<translation type="unfinished"/>
</message>
@@ -2137,7 +2767,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+13"/>
+ <location line="+18"/>
<source>Merchant</source>
<translation type="unfinished"/>
</message>
@@ -2177,7 +2807,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-227"/>
+ <location line="-232"/>
<source>, has not been successfully broadcast yet</source>
<translation type="unfinished"/>
</message>
@@ -2208,7 +2838,7 @@ Address: %4
<context>
<name>TransactionTableModel</name>
<message>
- <location filename="../transactiontablemodel.cpp" line="+227"/>
+ <location filename="../transactiontablemodel.cpp" line="+234"/>
<source>Date</source>
<translation type="unfinished"/>
</message>
@@ -2227,8 +2857,13 @@ Address: %4
<source>Amount</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location line="+59"/>
+ <source>Immature (%1 confirmations, will be available after %2)</source>
+ <translation type="unfinished"/>
+ </message>
<message numerus="yes">
- <location line="+57"/>
+ <location line="+16"/>
<source>Open for %n more block(s)</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
@@ -2248,17 +2883,13 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
+ <location line="-22"/>
+ <location line="+25"/>
<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></translation>
- </message>
<message>
- <location line="+5"/>
+ <location line="-22"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation type="unfinished"/>
</message>
@@ -2268,7 +2899,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+43"/>
+ <location line="+62"/>
<source>Received with</source>
<translation type="unfinished"/>
</message>
@@ -2326,7 +2957,7 @@ Address: %4
<context>
<name>TransactionView</name>
<message>
- <location filename="../transactionview.cpp" line="+52"/>
+ <location filename="../transactionview.cpp" line="+57"/>
<location line="+16"/>
<source>All</source>
<translation type="unfinished"/>
@@ -2387,12 +3018,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="+6"/>
<source>Enter address or label to search</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+7"/>
+ <location line="+6"/>
<source>Min amount</source>
<translation type="unfinished"/>
</message>
@@ -2427,17 +3058,37 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+143"/>
- <source>Export Transaction Data</source>
+ <location line="+142"/>
+ <source>Export Transaction History</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="+19"/>
+ <source>Exporting Failed</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>There was an error trying to save the transaction history to %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>Exporting Successful</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+0"/>
+ <source>The transaction history was successfully saved to %1.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="-22"/>
<source>Comma separated file (*.csv)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+8"/>
+ <location line="+9"/>
<source>Confirmed</source>
<translation type="unfinished"/>
</message>
@@ -2472,17 +3123,7 @@ Address: %4
<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"/>
+ <location line="+107"/>
<source>Range:</source>
<translation type="unfinished"/>
</message>
@@ -2493,9 +3134,17 @@ Address: %4
</message>
</context>
<context>
+ <name>WalletFrame</name>
+ <message>
+ <location filename="../walletframe.cpp" line="+26"/>
+ <source>No wallet has been loaded.</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>WalletModel</name>
<message>
- <location filename="../walletmodel.cpp" line="+218"/>
+ <location filename="../walletmodel.cpp" line="+245"/>
<source>Send Coins</source>
<translation type="unfinished"/>
</message>
@@ -2503,7 +3152,7 @@ Address: %4
<context>
<name>WalletView</name>
<message>
- <location filename="../walletview.cpp" line="+46"/>
+ <location filename="../walletview.cpp" line="+43"/>
<source>&amp;Export</source>
<translation type="unfinished"/>
</message>
@@ -2513,65 +3162,60 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+183"/>
+ <location line="+181"/>
<source>Backup Wallet</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
+ <location line="+1"/>
<source>Wallet Data (*.dat)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+3"/>
+ <location line="+6"/>
<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>
+ <source>There was an error trying to save the wallet data to %1.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+4"/>
- <source>Backup Successful</source>
+ <source>The wallet data was successfully saved to %1.</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+0"/>
- <source>The wallet data was successfully saved to the new location.</source>
+ <source>Backup Successful</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+102"/>
- <source>Bitcoin version</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+107"/>
+ <location filename="../bitcoinstrings.cpp" line="+221"/>
<source>Usage:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-55"/>
+ <location line="-54"/>
<source>List commands</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-13"/>
+ <location line="-14"/>
<source>Get help for a command</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+25"/>
+ <location line="+26"/>
<source>Options:</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+24"/>
+ <location line="+22"/>
<source>Specify configuration file (default: bitcoin.conf)</source>
<translation type="unfinished"/>
</message>
@@ -2591,7 +3235,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-28"/>
+ <location line="-26"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
<translation type="unfinished"/>
</message>
@@ -2601,7 +3245,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-49"/>
+ <location line="-51"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation type="unfinished"/>
</message>
@@ -2611,37 +3255,37 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-142"/>
+ <location line="-148"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-33"/>
+ <location line="-36"/>
<source>An error occurred while setting up the RPC port %u for listening on IPv4: %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Listen for JSON-RPC connections on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+40"/>
+ <location line="+45"/>
<source>Accept command line and JSON-RPC commands</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<source>Run in the background as a daemon and accept commands</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+40"/>
+ <location line="+39"/>
<source>Use the test network</source>
<translation type="unfinished"/>
</message>
@@ -2651,7 +3295,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="-87"/>
+ <location line="-95"/>
<source>%s, you must set a rpcpassword in the configuration file:
%s
It is recommended you use the following random password:
@@ -2692,6 +3336,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+4"/>
+ <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</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>
@@ -2706,17 +3355,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+11"/>
- <source>Set maximum size of high-priority/low-fee transactions in bytes (default: 27000)</source>
+ <location line="+18"/>
+ <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="+6"/>
- <source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
+ <location line="+5"/>
+ <source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+5"/>
+ <location line="+3"/>
<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>
@@ -2746,17 +3395,27 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
+ <location line="+9"/>
+ <source>&lt;category&gt; can be:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+6"/>
<source>Attempt to recover private keys from a corrupt wallet.dat</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
+ <source>Bitcoin Core Daemon</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Bitcoin RPC client version</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
<source>Block creation options:</source>
<translation type="unfinished"/>
</message>
@@ -2766,7 +3425,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
+ <source>Connect through SOCKS proxy</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Connect to JSON-RPC on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
<translation type="unfinished"/>
</message>
@@ -2782,6 +3446,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+1"/>
+ <source>Do not load the wallet and disable wallet RPC calls</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Do you want to rebuild the block database now?</source>
<translation type="unfinished"/>
</message>
@@ -2876,7 +3545,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+2"/>
+ <location line="+1"/>
+ <source>Fee per kB to add to transactions you send</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Find peers using DNS lookup (default: 1 unless -connect)</source>
<translation type="unfinished"/>
</message>
@@ -2896,6 +3570,11 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
+ <location line="+1"/>
+ <source>If &lt;category&gt; is not supplied, output all debugging information.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location line="+2"/>
<source>Incorrect or no genesis block found. Wrong datadir for network?</source>
<translation type="unfinished"/>
@@ -2911,17 +3590,37 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+8"/>
+ <location line="+5"/>
+ <source>Prepend debug output with timestamp (default: 1)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>RPC client options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Rebuild block chain index from current blk000??.dat files</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+5"/>
+ <source>Select SOCKS version for -proxy (4 or 5, default: 5)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Send command to Bitcoin server</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+10"/>
+ <location line="+7"/>
+ <source>Set maximum block size in bytes (default: %d)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Set the number of threads to service RPC calls (default: 4)</source>
<translation type="unfinished"/>
</message>
@@ -2936,12 +3635,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+12"/>
+ <location line="+3"/>
+ <source>This is intended for regression testing tools and app development.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Usage (deprecated, use bitcoin-cli):</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+8"/>
+ <location line="+7"/>
<source>Verifying blocks...</source>
<translation type="unfinished"/>
</message>
@@ -2952,31 +3656,56 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
</message>
<message>
<location line="+1"/>
+ <source>Wait for RPC server to start</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Wallet %s resides outside data directory %s</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+2"/>
+ <source>Wallet options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>You need to rebuild the database using -reindex to change -txindex</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-78"/>
+ <location line="-79"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-98"/>
+ <location line="-105"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+17"/>
+ <location line="+14"/>
+ <source>Output debugging information (default: 0, supplying &lt;category&gt; is optional)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+83"/>
+ <location line="+89"/>
<source>Information</source>
<translation type="unfinished"/>
</message>
@@ -3016,47 +3745,17 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<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"/>
+ <location line="+9"/>
<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"/>
+ <location line="+4"/>
<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"/>
+ <location line="+6"/>
<source>Set minimum block size in bytes (default: 0)</source>
<translation type="unfinished"/>
</message>
@@ -3081,7 +3780,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Transaction amount too small</source>
<translation type="unfinished"/>
</message>
@@ -3106,32 +3805,32 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<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="+5"/>
+ <location line="+7"/>
<source>Warning</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Warning: This version is obsolete, upgrade required!</source>
<translation type="unfinished"/>
</message>
<message>
<location line="+2"/>
+ <source>version</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
<source>wallet.dat corrupt, salvage failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-54"/>
+ <location line="-58"/>
<source>Password for JSON-RPC connections</source>
<translation type="unfinished"/>
</message>
@@ -3141,27 +3840,27 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<source>Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-126"/>
+ <location line="-132"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+155"/>
+ <location line="+161"/>
<source>Upgrade wallet to latest format</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-12"/>
+ <location line="-11"/>
<source>Rescan the block chain for missing wallet transactions</source>
<translation type="unfinished"/>
</message>
@@ -3171,7 +3870,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-29"/>
+ <location line="-30"/>
<source>Server certificate file (default: server.cert)</source>
<translation type="unfinished"/>
</message>
@@ -3186,27 +3885,22 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Unable to bind to %s on this computer (bind returned error %d, %s)</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-95"/>
- <source>Connect through socks proxy</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="-11"/>
+ <location line="-107"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+58"/>
+ <location line="+60"/>
<source>Loading addresses...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-36"/>
+ <location line="-37"/>
<source>Error loading wallet.dat: Wallet corrupted</source>
<translation type="unfinished"/>
</message>
@@ -3226,12 +3920,12 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+30"/>
+ <location line="+31"/>
<source>Invalid -proxy address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+57"/>
+ <location line="+56"/>
<source>Unknown network specified in -onlynet: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3241,7 +3935,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3251,7 +3945,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+46"/>
+ <location line="+48"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation type="unfinished"/>
</message>
@@ -3271,27 +3965,22 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-60"/>
+ <location line="-62"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-28"/>
+ <location line="-32"/>
<source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+69"/>
- <source>Fee per KB to add to transactions you send</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location line="+20"/>
+ <location line="+95"/>
<source>Loading wallet...</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-54"/>
+ <location line="-56"/>
<source>Cannot downgrade wallet</source>
<translation type="unfinished"/>
</message>
@@ -3301,7 +3990,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="+66"/>
+ <location line="+67"/>
<source>Rescanning...</source>
<translation type="unfinished"/>
</message>
@@ -3321,7 +4010,7 @@ for example: alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.
<translation type="unfinished"/>
</message>
<message>
- <location line="-33"/>
+ <location line="-35"/>
<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_CN.ts b/src/qt/locale/bitcoin_zh_CN.ts
index 34cdf9f0ad..4315045584 100644
--- a/src/qt/locale/bitcoin_zh_CN.ts
+++ b/src/qt/locale/bitcoin_zh_CN.ts
@@ -27,14 +27,14 @@ Distributed under the MIT/X11 software license, see the accompanying file COPYIN
This product includes software developed by the OpenSSL Project for use in the OpenSSL Toolkit (http://www.openssl.org/) and cryptographic software written by Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard.</translation>
</message>
<message>
- <location filename="../aboutdialog.cpp" line="+19"/>
+ <location filename="../utilitydialog.cpp" line="+29"/>
<source>Copyright</source>
<translation>版æƒ</translation>
</message>
<message>
<location line="+0"/>
- <source>The Bitcoin developers</source>
- <translation>Bitcoin-qt 客户端开å‘团队</translation>
+ <source>The Bitcoin Core developers</source>
+ <translation>Bitcoin Core çš„å¼€å‘者</translation>
</message>
</context>
<context>
@@ -151,13 +151,13 @@ This product includes software developed by the OpenSSL Project for use in the O
</message>
<message>
<location line="+13"/>
- <source>Error exporting</source>
- <translation>导出错误</translation>
+ <source>Exporting Failed</source>
+ <translation>导出失败</translation>
</message>
<message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation>无法写入文件 %1。</translation>
+ <location line="+1"/>
+ <source>There was an error trying to save the address list to %1.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -322,22 +322,27 @@ This product includes software developed by the OpenSSL Project for use in the O
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+260"/>
+ <location filename="../bitcoingui.cpp" line="+295"/>
<source>Sign &amp;message...</source>
<translation>消æ¯ç­¾å(&amp;M)...</translation>
</message>
<message>
- <location line="+290"/>
+ <location line="+335"/>
<source>Synchronizing with network...</source>
<translation>正在与网络åŒæ­¥...</translation>
</message>
<message>
- <location line="-360"/>
+ <location line="-407"/>
<source>&amp;Overview</source>
<translation>概况(&amp;O)</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="-137"/>
+ <source>Node</source>
+ <translation>节点</translation>
+ </message>
+ <message>
+ <location line="+138"/>
<source>Show general overview of wallet</source>
<translation>显示钱包概况</translation>
</message>
@@ -352,7 +357,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>查看交易历å²</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>E&amp;xit</source>
<translation>退出(&amp;X)</translation>
</message>
@@ -398,7 +403,22 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>更改密ç (&amp;C)...</translation>
</message>
<message>
- <location line="+295"/>
+ <location line="+10"/>
+ <source>&amp;Sending addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Receiving addresses...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open &amp;URI...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+325"/>
<source>Importing blocks from disk...</source>
<translation>正在从ç£ç›˜å¯¼å…¥æ•°æ®å—...</translation>
</message>
@@ -408,12 +428,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>正在为数æ®å—建立索引...</translation>
</message>
<message>
- <location line="-358"/>
+ <location line="-405"/>
<source>Send coins to a Bitcoin address</source>
<translation>å‘一个比特å¸åœ°å€å‘é€æ¯”特å¸</translation>
</message>
<message>
- <location line="+47"/>
+ <location line="+49"/>
<source>Modify configuration options for Bitcoin</source>
<translation>设置选项</translation>
</message>
@@ -443,18 +463,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>验è¯æ¶ˆæ¯(&amp;V)...</translation>
</message>
<message>
- <location line="+375"/>
+ <location line="+430"/>
<source>Bitcoin</source>
<translation>比特å¸</translation>
</message>
<message>
- <location line="-563"/>
- <location line="+10"/>
+ <location line="-643"/>
<source>Wallet</source>
<translation>钱包</translation>
</message>
<message>
- <location line="+113"/>
+ <location line="+146"/>
<source>&amp;Send</source>
<translation>å‘é€(&amp;S)</translation>
</message>
@@ -464,7 +483,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>接收(&amp;R)</translation>
</message>
<message>
- <location line="+44"/>
+ <location line="+46"/>
<location line="+2"/>
<source>&amp;Show / Hide</source>
<translation>显示 / éšè—(&amp;S)</translation>
@@ -490,86 +509,80 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>校验消æ¯ï¼Œç¡®ä¿è¯¥æ¶ˆæ¯æ˜¯ç”±æŒ‡å®šçš„比特å¸åœ°å€æ‰€æœ‰è€…ç­¾åçš„</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+48"/>
<source>&amp;File</source>
<translation>文件(&amp;F)</translation>
</message>
<message>
- <location line="+11"/>
+ <location line="+14"/>
<source>&amp;Settings</source>
<translation>设置(&amp;S)</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>&amp;Help</source>
<translation>帮助(&amp;H)</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+15"/>
<source>Tabs toolbar</source>
<translation>分页工具æ </translation>
</message>
<message>
- <location line="-244"/>
- <location line="+321"/>
+ <location line="-284"/>
+ <location line="+376"/>
<source>[testnet]</source>
<translation>[测试网络]</translation>
</message>
<message>
- <location line="-331"/>
- <location line="+10"/>
+ <location line="-401"/>
<source>Bitcoin Core</source>
<translation>比特å¸æ ¸å¿ƒ</translation>
</message>
<message>
- <location line="+121"/>
+ <location line="+163"/>
<source>Request payments (generates QR codes and bitcoin: URIs)</source>
<translation>请求支付(生æˆäºŒç»´ç å’Œ bitcoin: URI)</translation>
</message>
<message>
- <location line="+27"/>
+ <location line="+29"/>
<location line="+2"/>
<source>&amp;About Bitcoin Core</source>
<translation>关于比特å¸æ ¸å¿ƒ(&amp;A)</translation>
</message>
<message>
- <location line="+34"/>
- <source>&amp;Used sending addresses...</source>
- <translation>用过的å‘é€åœ°å€(&amp;U)...</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+35"/>
<source>Show the list of used sending addresses and labels</source>
<translation>显示用过的å‘é€åœ°å€å’Œæ ‡ç­¾çš„列表</translation>
</message>
<message>
- <location line="+1"/>
- <source>Used &amp;receiving addresses...</source>
- <translation>用过的接收地å€(&amp;R)...</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+2"/>
<source>Show the list of used receiving addresses and labels</source>
<translation>显示用过的接收地å€å’Œæ ‡ç­¾çš„列表</translation>
</message>
<message>
+ <location line="+3"/>
+ <source>Open a bitcoin: URI or payment request</source>
+ <translation>打开一个比特å¸ï¼šURI 或支付请求</translation>
+ </message>
+ <message>
<location line="+2"/>
- <source>Open URI...</source>
- <translation>打开 URI...</translation>
+ <source>&amp;Command-line options</source>
+ <translation type="unfinished"/>
</message>
<message>
<location line="+1"/>
- <source>Open a bitcoin: URI or payment request</source>
- <translation>打开一个比特å¸ï¼šURI 或支付请求</translation>
+ <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+126"/>
+ <location line="+159"/>
<location line="+5"/>
<source>Bitcoin client</source>
<translation>比特å¸å®¢æˆ·ç«¯</translation>
</message>
<message numerus="yes">
- <location line="+133"/>
+ <location line="+142"/>
<source>%n active connection(s) to Bitcoin network</source>
<translation><numerusform>%næ¡åˆ°æ¯”特å¸ç½‘络的活动连接</numerusform></translation>
</message>
@@ -589,7 +602,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>å·²å¤„ç† %1 个交易历å²æ•°æ®å—。</translation>
</message>
<message numerus="yes">
- <location line="+20"/>
+ <location line="+23"/>
<source>%n hour(s)</source>
<translation><numerusform>%n å°æ—¶å‰</numerusform></translation>
</message>
@@ -609,7 +622,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>è½åŽ %1 </translation>
</message>
<message>
- <location line="+14"/>
+ <location line="+21"/>
<source>Last received block was generated %1 ago.</source>
<translation>最新收到的区å—产生于 %1。</translation>
</message>
@@ -634,27 +647,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>ä¿¡æ¯</translation>
</message>
<message>
- <location line="+77"/>
- <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="-152"/>
+ <location line="-85"/>
<source>Up to date</source>
<translation>已是最新</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Catching up...</source>
<translation>更新中...</translation>
</message>
<message>
- <location line="+124"/>
- <source>Confirm transaction fee</source>
- <translation>确认交易费</translation>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+130"/>
<source>Sent transaction</source>
<translation>å‘出交易</translation>
</message>
@@ -677,7 +680,7 @@ Address: %4
</translation>
</message>
<message>
- <location line="+67"/>
+ <location line="+69"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation>钱包已被&lt;b&gt;加密&lt;/b&gt;,当å‰ä¸º&lt;b&gt;解é”&lt;/b&gt;状æ€</translation>
</message>
@@ -687,7 +690,7 @@ Address: %4
<translation>钱包已被&lt;b&gt;加密&lt;/b&gt;,当å‰ä¸º&lt;b&gt;é”定&lt;/b&gt;状æ€</translation>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+116"/>
+ <location filename="../bitcoin.cpp" line="+438"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
<translation>å‘生严é‡é”™è¯¯ã€‚</translation>
</message>
@@ -909,7 +912,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+171"/>
+ <location line="+31"/>
+ <source>none</source>
+ <translation>æ— </translation>
+ </message>
+ <message>
+ <location line="+140"/>
<source>Dust</source>
<translation type="unfinished"/>
</message>
@@ -946,7 +954,7 @@ Address: %4
</message>
<message>
<location line="+1"/>
- <source>This label turns red, if the priority is smaller than &quot;medium&quot;</source>
+ <source>This label turns red, if the priority is smaller than &quot;medium&quot;.</source>
<translation type="unfinished"/>
</message>
<message>
@@ -1015,7 +1023,7 @@ Address: %4
<translation>地å€(&amp;A)</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+25"/>
+ <location filename="../editaddressdialog.cpp" line="+28"/>
<source>New receiving address</source>
<translation>新建接收地å€</translation>
</message>
@@ -1084,20 +1092,24 @@ Address: %4
</message>
</context>
<context>
- <name>GUIUtil::HelpMessageBox</name>
+ <name>HelpMessageDialog</name>
<message>
- <location filename="../guiutil.cpp" line="+597"/>
- <source>version</source>
- <translation>版本</translation>
+ <location filename="../forms/helpmessagedialog.ui" line="+19"/>
+ <source>Bitcoin Core - Command-line options</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location line="+0"/>
- <location line="+13"/>
+ <location filename="../utilitydialog.cpp" line="+38"/>
<source>Bitcoin Core</source>
<translation>比特å¸æ ¸å¿ƒ</translation>
</message>
<message>
- <location line="-11"/>
+ <location line="+0"/>
+ <source>version</source>
+ <translation>版本</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Usage:</source>
<translation>使用:</translation>
</message>
@@ -1227,7 +1239,7 @@ Address: %4
<translation>选项</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+13"/>
<source>&amp;Main</source>
<translation>主è¦(&amp;M)</translation>
</message>
@@ -1252,7 +1264,52 @@ Address: %4
<translation>系统å¯åŠ¨æ—¶è¿è¡Œ(&amp;S)</translation>
</message>
<message>
- <location line="+35"/>
+ <location line="+9"/>
+ <source>Size of &amp;database cache</source>
+ <translation>æ•°æ®åº“缓存大å°(&amp;D)</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set database cache size in megabytes (default: 25)</source>
+ <translation>设置数æ®åº“ç¼“å†²åŒºå¤§å° (缺çœ: 25MB)</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>MB</source>
+ <translation>MB</translation>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Number of script &amp;verification threads</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
+ <translation>设置脚本验è¯çº¿ç¨‹æ•°é‡ï¼ˆæœ€å¤š16,0 = 自动,&lt;0 = 留下许多空闲核心,默认为 0)</translation>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Connect to the Bitcoin network through a SOCKS proxy.</source>
+ <translation>通过 SOCKS 代ç†è¿žæŽ¥åˆ°æ¯”特å¸ç½‘络。</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Connect through SOCKS proxy (default proxy):</source>
+ <translation>通过 SO&amp;CKS 代ç†è¿žæŽ¥ (默认代ç†):</translation>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
+ <translation>代ç†çš„ IP åœ°å€ (例如 IPv4: 127.0.0.1 / IPv6: ::1)</translation>
+ </message>
+ <message>
+ <location line="+224"/>
+ <source>Active command-line options that override above options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+43"/>
<source>Reset all client options to default.</source>
<translation>æ¢å¤å®¢æˆ·ç«¯çš„缺çœè®¾ç½®</translation>
</message>
@@ -1262,7 +1319,7 @@ Address: %4
<translation>æ¢å¤ç¼ºçœè®¾ç½®(&amp;R)</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="-323"/>
<source>&amp;Network</source>
<translation>网络(&amp;N)</translation>
</message>
@@ -1277,32 +1334,17 @@ Address: %4
<translation>使用 &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>通过代ç†æœåŠ¡å™¨è¿žæŽ¥æ¯”特å¸ç½‘络(例如,通过Tor连接)</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>&amp;Connect through SOCKS proxy:</source>
- <translation>通过 Socks 代ç†è¿žæŽ¥(&amp;C):</translation>
- </message>
- <message>
- <location line="+9"/>
+ <location line="+19"/>
<source>Proxy &amp;IP:</source>
<translation>代ç†æœåŠ¡å™¨ &amp;IP:</translation>
</message>
<message>
- <location line="+19"/>
- <source>IP address of the proxy (e.g. 127.0.0.1)</source>
- <translation>代ç†æœåŠ¡å™¨ IP(如 127.0.0.1)</translation>
- </message>
- <message>
- <location line="+7"/>
+ <location line="+32"/>
<source>&amp;Port:</source>
<translation>端å£(&amp;P):</translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+25"/>
<source>Port of the proxy (e.g. 9050)</source>
<translation>代ç†ç«¯å£ï¼ˆä¾‹å¦‚ 9050)</translation>
</message>
@@ -1387,7 +1429,7 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+71"/>
+ <location line="+136"/>
<source>&amp;OK</source>
<translation>确定(&amp;O)</translation>
</message>
@@ -1397,44 +1439,38 @@ Address: %4
<translation>å–消(&amp;C)</translation>
</message>
<message>
- <location line="+10"/>
- <source>&amp;Apply</source>
- <translation>应用(&amp;A)</translation>
- </message>
- <message>
- <location filename="../optionsdialog.cpp" line="+63"/>
+ <location filename="../optionsdialog.cpp" line="+67"/>
<source>default</source>
<translation>默认</translation>
</message>
<message>
- <location line="+131"/>
+ <location line="+57"/>
+ <source>none</source>
+ <translation>æ— </translation>
+ </message>
+ <message>
+ <location line="+75"/>
<source>Confirm options reset</source>
<translation>确认æ¢å¤ç¼ºçœè®¾ç½®</translation>
</message>
<message>
<location line="+1"/>
- <source>Some settings may require a client restart to take effect.</source>
- <translation>æŸäº›è®¾ç½®é€‰é¡¹éœ€è¦é‡å¯å®¢æˆ·ç«¯æ‰èƒ½ç”Ÿæ•ˆ</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Do you want to proceed?</source>
- <translation>您希望继续å—?</translation>
+ <location line="+29"/>
+ <source>Client restart required to activate changes.</source>
+ <translation>更改生效需è¦é‡å¯å®¢æˆ·ç«¯ã€‚</translation>
</message>
<message>
- <location line="+42"/>
- <location line="+9"/>
- <source>Warning</source>
- <translation>警告</translation>
+ <location line="-29"/>
+ <source>Client will be shutdown, do you want to proceed?</source>
+ <translation>客户端å³å°†å…³é—­ï¼Œç¡®å®šç»§ç»­å—?</translation>
</message>
<message>
- <location line="-9"/>
- <location line="+9"/>
- <source>This setting will take effect after restarting Bitcoin.</source>
- <translation>需è¦é‡å¯æœ¬å®¢æˆ·ç«¯æ‰èƒ½ç”Ÿæ•ˆã€‚</translation>
+ <location line="+33"/>
+ <source>This change would require a client restart.</source>
+ <translation>此更改需è¦é‡å¯å®¢æˆ·ç«¯ã€‚</translation>
</message>
<message>
- <location line="+29"/>
+ <location line="+34"/>
<source>The supplied proxy address is invalid.</source>
<translation>æ供的代ç†æœåŠ¡å™¨åœ°å€æ— æ•ˆã€‚</translation>
</message>
@@ -1448,22 +1484,22 @@ Address: %4
</message>
<message>
<location line="+50"/>
- <location line="+214"/>
+ <location line="+231"/>
<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="-140"/>
+ <location line="-155"/>
<source>Unconfirmed:</source>
<translation>未确认:</translation>
</message>
<message>
- <location line="-81"/>
+ <location line="-83"/>
<source>Wallet</source>
<translation>钱包</translation>
</message>
<message>
- <location line="+49"/>
+ <location line="+51"/>
<source>Confirmed:</source>
<translation>已确认:</translation>
</message>
@@ -1498,7 +1534,7 @@ Address: %4
<translation>您当å‰çš„总余é¢</translation>
</message>
<message>
- <location line="+56"/>
+ <location line="+71"/>
<source>&lt;b&gt;Recent transactions&lt;/b&gt;</source>
<translation>&lt;b&gt;最近交易记录&lt;/b&gt;</translation>
</message>
@@ -1512,7 +1548,8 @@ Address: %4
<context>
<name>PaymentServer</name>
<message>
- <location filename="../paymentserver.cpp" line="+397"/>
+ <location filename="../paymentserver.cpp" line="+403"/>
+ <location line="+13"/>
<source>URI handling</source>
<translation>URI 处ç†</translation>
</message>
@@ -1522,24 +1559,52 @@ Address: %4
<translation>URI无法解æžï¼åŽŸå› å¯èƒ½æ˜¯æ¯”特å¸åœ°å€ä¸æ­£ç¡®ï¼Œæˆ–者URIå‚数错误。</translation>
</message>
<message>
- <location line="+91"/>
+ <location line="+96"/>
<source>Requested payment amount of %1 is too small (considered dust).</source>
<translation>è¯·æ±‚æ”¯ä»˜çš„é‡‘é¢ %1 太å°ï¼ˆå°±åƒå°˜åŸƒï¼‰ã€‚</translation>
</message>
<message>
- <location line="-204"/>
- <location line="+195"/>
+ <location line="-221"/>
+ <location line="+212"/>
<location line="+13"/>
+ <location line="+95"/>
+ <location line="+18"/>
+ <location line="+16"/>
<source>Payment request error</source>
<translation>支付请求出错</translation>
</message>
<message>
- <location line="-207"/>
+ <location line="-353"/>
<source>Cannot start bitcoin: click-to-pay handler</source>
<translation>暂时无法å¯åŠ¨æ¯”特å¸ï¼šç‚¹å‡»æ”¯ä»˜åŠŸèƒ½</translation>
</message>
<message>
- <location line="+195"/>
+ <location line="+58"/>
+ <source>Net manager warning</source>
+ <translation>网络管ç†å™¨è­¦å‘Š</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Your active proxy doesn&apos;t support SOCKS5, which is required for payment requests via proxy.</source>
+ <translation>您的活动代ç†ä¸æ”¯æŒ SOCKS5,而通过代ç†è¿›è¡Œæ”¯ä»˜è¯·æ±‚时这是必须的。</translation>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>Payment request fetch URL is invalid: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Payment request file handling</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Payment request file can not be read or processed! This can be caused by an invalid payment request file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location line="+73"/>
<source>Unverified payment requests to custom payment scripts are unsupported.</source>
<translation type="unfinished"/>
</message>
@@ -1549,24 +1614,27 @@ Address: %4
<translation>退款æ¥è‡ª %1</translation>
</message>
<message>
- <location line="+42"/>
+ <location line="+43"/>
<source>Error communicating with %1: %2</source>
<translation>%1: %2 通讯出错</translation>
</message>
<message>
- <location line="+28"/>
+ <location line="+24"/>
+ <source>Payment request can not be parsed or processed!</source>
+ <translation>支付请求ä¸èƒ½è¢«è§£æžæˆ–处ç†ï¼</translation>
+ </message>
+ <message>
+ <location line="+11"/>
<source>Bad response from server %1</source>
<translation>æ¥è‡ª %1 æœåŠ¡å™¨çš„错误å“应</translation>
</message>
<message>
- <location line="+32"/>
+ <location line="+33"/>
<source>Payment acknowledged</source>
<translation>支付已到账</translation>
</message>
<message>
- <location line="-55"/>
- <location line="+27"/>
- <location line="+17"/>
+ <location line="-11"/>
<source>Network request error</source>
<translation>网络请求出错</translation>
</message>
@@ -1574,18 +1642,18 @@ Address: %4
<context>
<name>QObject</name>
<message>
- <location filename="../bitcoin.cpp" line="+119"/>
- <location line="+5"/>
+ <location filename="../bitcoin.cpp" line="+71"/>
+ <location line="+11"/>
<source>Bitcoin</source>
<translation>比特å¸</translation>
</message>
<message>
- <location line="-4"/>
+ <location line="+1"/>
<source>Error: Specified data directory &quot;%1&quot; does not exist.</source>
<translation>错误:指定的数æ®ç›®å½•â€œ%1â€ä¸å­˜åœ¨ã€‚</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="-12"/>
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation>错误:无效的 -regtest 与 -testnet 结åˆä½“。</translation>
</message>
@@ -1627,15 +1695,16 @@ Address: %4
<location line="+23"/>
<location line="+23"/>
<location line="+36"/>
- <location line="+53"/>
<location line="+23"/>
+ <location line="+36"/>
<location line="+23"/>
- <location filename="../rpcconsole.cpp" line="+360"/>
+ <location line="+23"/>
+ <location filename="../rpcconsole.cpp" line="+359"/>
<source>N/A</source>
<translation>ä¸å¯ç”¨</translation>
</message>
<message>
- <location line="-217"/>
+ <location line="-223"/>
<source>Client version</source>
<translation>客户端版本</translation>
</message>
@@ -1650,7 +1719,12 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+78"/>
+ <location line="+25"/>
+ <source>General</source>
+ <translation>常规</translation>
+ </message>
+ <message>
+ <location line="+53"/>
<source>Using OpenSSL version</source>
<translation>使用 OpenSSL 版本</translation>
</message>
@@ -1666,16 +1740,16 @@ Address: %4
</message>
<message>
<location line="+7"/>
- <source>Number of connections</source>
- <translation>连接数</translation>
+ <source>Name</source>
+ <translation>姓å</translation>
</message>
<message>
<location line="+23"/>
- <source>On testnet</source>
- <translation>当å‰ä¸ºæµ‹è¯•ç½‘络</translation>
+ <source>Number of connections</source>
+ <translation>连接数</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+29"/>
<source>Block chain</source>
<translation>æ•°æ®é“¾</translation>
</message>
@@ -1700,16 +1774,6 @@ Address: %4
<translation>打开(&amp;O)</translation>
</message>
<message>
- <location line="+16"/>
- <source>Command-line options</source>
- <translation>命令行选项</translation>
- </message>
- <message>
- <location line="+10"/>
- <source>&amp;Show</source>
- <translation>显示(&amp;S)</translation>
- </message>
- <message>
<location line="+24"/>
<source>&amp;Console</source>
<translation>控制å°(&amp;C)</translation>
@@ -1740,17 +1804,12 @@ Address: %4
<translation>输出:</translation>
</message>
<message>
- <location line="-541"/>
+ <location line="-521"/>
<source>Build date</source>
<translation>创建时间</translation>
</message>
<message>
- <location line="-79"/>
- <source>Bitcoin Core</source>
- <translation>比特å¸æ ¸å¿ƒ</translation>
- </message>
- <message>
- <location line="+279"/>
+ <location line="+206"/>
<source>Debug log file</source>
<translation>调试日志文件</translation>
</message>
@@ -1760,11 +1819,6 @@ Address: %4
<translation>打开当å‰ç›®å½•ä¸­çš„调试日志文件。日志文件大的è¯å¯èƒ½è¦ç­‰ä¸Šå‡ ç§’钟。</translation>
</message>
<message>
- <location line="+26"/>
- <source>Show the Bitcoin-Core help message to get a list with possible Bitcoin command-line options.</source>
- <translation type="unfinished"/>
- </message>
- <message>
<location line="+76"/>
<source>Clear console</source>
<translation>清空控制å°</translation>
@@ -1785,7 +1839,7 @@ Address: %4
<translation>使用 &lt;b&gt;help&lt;/b&gt; 命令显示帮助信æ¯ã€‚</translation>
</message>
<message>
- <location line="+128"/>
+ <location line="+122"/>
<source>%1 B</source>
<translation>%1 字节</translation>
</message>
@@ -1828,12 +1882,7 @@ Address: %4
<translation>总é¢(&amp;A):</translation>
</message>
<message>
- <location line="+19"/>
- <source>The amount to request</source>
- <translation>è¦æ±‚金é¢</translation>
- </message>
- <message>
- <location line="-32"/>
+ <location line="-13"/>
<source>&amp;Label:</source>
<translation>标签(&amp;L):</translation>
</message>
@@ -1843,12 +1892,7 @@ Address: %4
<translation>消æ¯(&amp;M):</translation>
</message>
<message>
- <location line="+20"/>
- <source>The message to attach to payment request</source>
- <translation>此消æ¯å°†é™„加到支付请求</translation>
- </message>
- <message>
- <location line="-37"/>
+ <location line="-17"/>
<source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
<translation>é‡å¤ä½¿ç”¨ä»¥å‰ç”¨è¿‡çš„接收地å€ã€‚é‡ç”¨åœ°å€æœ‰å®‰å…¨å’Œéšç§æ–¹é¢çš„éšæ‚£ã€‚除éžæ˜¯ä¸ºé‡å¤ç”ŸæˆåŒä¸€é¡¹æ”¯ä»˜è¯·æ±‚,å¦åˆ™è¯·ä¸è¦è¿™æ ·åšã€‚</translation>
</message>
@@ -1859,16 +1903,26 @@ Address: %4
</message>
<message>
<location line="+27"/>
- <source>The label to associate with the new receiving address</source>
+ <source>An optional label to associate with the new receiving address</source>
+ <translation>与新接收地å€ç›¸å…³çš„标签,å¯é€‰</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="+14"/>
- <source>Use this form to request payments. All fields are optional.</source>
- <translation>使用此表å•è¦æ±‚付款。所有字段都是å¯é€‰ã€‚</translation>
+ <location line="+7"/>
+ <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
+ <translation>使用此表å•è¦æ±‚付款。所有字段都是&lt;b&gt;å¯é€‰&lt;/b&gt;。</translation>
</message>
<message>
- <location line="+56"/>
+ <location line="+39"/>
+ <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
+ <translation>å¯é€‰çš„请求金é¢ã€‚留空或填零为ä¸è¦æ±‚具体金é¢ã€‚</translation>
+ </message>
+ <message>
+ <location line="+17"/>
<source>Clear all fields of the form.</source>
<translation>清空此表å•çš„所有字段。</translation>
</message>
@@ -1884,11 +1938,11 @@ Address: %4
</message>
<message>
<location line="+47"/>
- <source>Previously requested payments</source>
- <translation type="unfinished"/>
+ <source>Requested payments</source>
+ <translation>已请求支付</translation>
</message>
<message>
- <location line="+12"/>
+ <location line="+16"/>
<source>Show the selected request (does the same as double clicking an entry)</source>
<translation type="unfinished"/>
</message>
@@ -1905,7 +1959,7 @@ Address: %4
<message>
<location line="+3"/>
<source>Remove</source>
- <translation type="unfinished"/>
+ <translation>移除</translation>
</message>
</context>
<context>
@@ -1979,7 +2033,7 @@ Address: %4
<context>
<name>RecentRequestsTableModel</name>
<message>
- <location filename="../recentrequeststablemodel.cpp" line="+14"/>
+ <location filename="../recentrequeststablemodel.cpp" line="+24"/>
<source>Date</source>
<translation>日期</translation>
</message>
@@ -1999,14 +2053,14 @@ Address: %4
<translation>金é¢</translation>
</message>
<message>
- <location line="+36"/>
+ <location line="+38"/>
<source>(no label)</source>
<translation>(没有标签)</translation>
</message>
<message>
<location line="+9"/>
<source>(no message)</source>
- <translation type="unfinished"/>
+ <translation>(无消æ¯)</translation>
</message>
</context>
<context>
@@ -2014,7 +2068,7 @@ Address: %4
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
<location filename="../sendcoinsdialog.cpp" line="+381"/>
- <location line="+81"/>
+ <location line="+80"/>
<source>Send Coins</source>
<translation>å‘é€è´§å¸</translation>
</message>
@@ -2026,17 +2080,17 @@ Address: %4
<message>
<location line="+20"/>
<source>Inputs...</source>
- <translation type="unfinished"/>
+ <translation>输入...</translation>
</message>
<message>
<location line="+7"/>
<source>automatically selected</source>
- <translation type="unfinished"/>
+ <translation>自动选择</translation>
</message>
<message>
<location line="+19"/>
<source>Insufficient funds!</source>
- <translation type="unfinished"/>
+ <translation>存款ä¸è¶³ï¼</translation>
</message>
<message>
<location line="+89"/>
@@ -2124,7 +2178,7 @@ Address: %4
<translation>å‘é€(&amp;E)</translation>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-229"/>
+ <location filename="../sendcoinsdialog.cpp" line="-228"/>
<source>Confirm send coins</source>
<translation>确认å‘é€è´§å¸</translation>
</message>
@@ -2184,12 +2238,12 @@ Address: %4
<message>
<location line="+170"/>
<source>Total Amount %1 (= %2)</source>
- <translation type="unfinished"/>
+ <translation>æ€»é¢ %1 (= %2)</translation>
</message>
<message>
<location line="+2"/>
<source>or</source>
- <translation type="unfinished"/>
+ <translation>或</translation>
</message>
<message>
<location line="+202"/>
@@ -2219,7 +2273,7 @@ Address: %4
<message>
<location line="+3"/>
<source>Transaction creation failed!</source>
- <translation type="unfinished"/>
+ <translation>交易创建失败ï¼</translation>
</message>
<message>
<location line="+4"/>
@@ -2227,22 +2281,22 @@ Address: %4
<translation type="unfinished"/>
</message>
<message>
- <location line="+113"/>
+ <location line="+112"/>
<source>Warning: Invalid Bitcoin address</source>
- <translation type="unfinished"/>
+ <translation>警告:无效的比特å¸åœ°å€</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+21"/>
<source>(no label)</source>
<translation>(没有标签)</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="-11"/>
<source>Warning: Unknown change address</source>
- <translation type="unfinished"/>
+ <translation>警告:未知的更改地å€</translation>
</message>
<message>
- <location line="-378"/>
+ <location line="-366"/>
<source>Are you sure you want to send?</source>
<translation>您确定è¦å‘出å—?</translation>
</message>
@@ -2266,13 +2320,13 @@ Address: %4
<name>SendCoinsEntry</name>
<message>
<location filename="../forms/sendcoinsentry.ui" line="+131"/>
- <location line="+501"/>
+ <location line="+521"/>
<location line="+536"/>
<source>A&amp;mount:</source>
<translation>金é¢(&amp;M)</translation>
</message>
<message>
- <location line="-1132"/>
+ <location line="-1152"/>
<source>Pay &amp;To:</source>
<translation>付给(&amp;T):</translation>
</message>
@@ -2299,7 +2353,7 @@ Address: %4
<message>
<location line="-40"/>
<source>This is a normal payment.</source>
- <translation type="unfinished"/>
+ <translation>这是笔正常的支付。</translation>
</message>
<message>
<location line="+50"/>
@@ -2318,31 +2372,41 @@ Address: %4
</message>
<message>
<location line="+7"/>
- <location line="+504"/>
+ <location line="+524"/>
<location line="+536"/>
<source>Remove this entry</source>
+ <translation>移除此项</translation>
+ </message>
+ <message>
+ <location line="-1008"/>
+ <source>Message:</source>
+ <translation>消æ¯ï¼š</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
<translation type="unfinished"/>
</message>
<message>
- <location line="-40"/>
+ <location line="+958"/>
<source>This is a verified payment request.</source>
- <translation type="unfinished"/>
+ <translation>这是个有效的支付请求。</translation>
</message>
<message>
- <location line="-971"/>
+ <location line="-991"/>
<source>Enter a label for this address to add it to the list of used addresses</source>
<translation>请为此地å€è¾“入一个标签以将它加入用过的地å€åˆ—表</translation>
</message>
<message>
- <location line="+439"/>
+ <location line="+459"/>
<source>This is an unverified payment request.</source>
- <translation type="unfinished"/>
+ <translation>这是个éžæœ‰æ•ˆçš„支付请求。</translation>
</message>
<message>
<location line="+18"/>
<location line="+532"/>
<source>Pay To:</source>
- <translation type="unfinished"/>
+ <translation>支付给:</translation>
</message>
<message>
<location line="-498"/>
@@ -2357,6 +2421,19 @@ Address: %4
</message>
</context>
<context>
+ <name>ShutdownWindow</name>
+ <message>
+ <location filename="../utilitydialog.cpp" line="+48"/>
+ <source>Bitcoin Core is shutting down...</source>
+ <translation>比特å¸æ ¸å¿ƒæ­£åœ¨å…³æœº...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Do not shut down the computer until this window disappears.</source>
+ <translation>在此窗å£æ¶ˆå¤±å‰ä¸è¦å…³é—­è®¡ç®—机。</translation>
+ </message>
+</context>
+<context>
<name>SignVerifyMessageDialog</name>
<message>
<location filename="../forms/signverifymessagedialog.ui" line="+14"/>
@@ -2364,7 +2441,7 @@ Address: %4
<translation>ç­¾å - 为消æ¯ç­¾å/验è¯ç­¾å消æ¯</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+10"/>
<source>&amp;Sign Message</source>
<translation>ç­¾å消æ¯(&amp;S)</translation>
</message>
@@ -2552,14 +2629,14 @@ Address: %4
<context>
<name>SplashScreen</name>
<message>
- <location filename="../splashscreen.cpp" line="+26"/>
+ <location filename="../splashscreen.cpp" line="+28"/>
<source>Bitcoin Core</source>
<translation>比特å¸æ ¸å¿ƒ</translation>
</message>
<message>
<location line="+2"/>
<source>The Bitcoin Core developers</source>
- <translation type="unfinished"/>
+ <translation>Bitcoin Core çš„å¼€å‘者</translation>
</message>
<message>
<location line="+1"/>
@@ -2651,12 +2728,12 @@ Address: %4
<location line="+12"/>
<location line="+45"/>
<location line="+17"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Credit</source>
<translation>收入</translation>
</message>
<message numerus="yes">
- <location line="-120"/>
+ <location line="-125"/>
<source>matures in %n more block(s)</source>
<translation><numerusform>将在 %n 个数æ®å—åŽæˆç†Ÿ</numerusform></translation>
</message>
@@ -2669,12 +2746,12 @@ Address: %4
<location line="+44"/>
<location line="+8"/>
<location line="+15"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Debit</source>
<translation>支出</translation>
</message>
<message>
- <location line="-57"/>
+ <location line="-62"/>
<source>Transaction fee</source>
<translation>交易费</translation>
</message>
@@ -2685,11 +2762,12 @@ Address: %4
</message>
<message>
<location line="+6"/>
+ <location line="+9"/>
<source>Message</source>
<translation>消æ¯</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="-7"/>
<source>Comment</source>
<translation>备注</translation>
</message>
@@ -2699,7 +2777,7 @@ Address: %4
<translation>交易ID</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+18"/>
<source>Merchant</source>
<translation>商店</translation>
</message>
@@ -2739,7 +2817,7 @@ Address: %4
<translation>错误</translation>
</message>
<message>
- <location line="-227"/>
+ <location line="-232"/>
<source>, has not been successfully broadcast yet</source>
<translation>,未被æˆåŠŸå¹¿æ’­</translation>
</message>
@@ -2789,8 +2867,13 @@ Address: %4
<source>Amount</source>
<translation>æ•°é‡</translation>
</message>
+ <message>
+ <location line="+59"/>
+ <source>Immature (%1 confirmations, will be available after %2)</source>
+ <translation>未æˆç†Ÿ (%1 个确认,将在 %2 个åŽå¯ç”¨)</translation>
+ </message>
<message numerus="yes">
- <location line="+57"/>
+ <location line="+16"/>
<source>Open for %n more block(s)</source>
<translation><numerusform>Open for %n more block</numerusform></translation>
</message>
@@ -2810,17 +2893,13 @@ Address: %4
<translation>未确认 (%1 / %2 æ¡ç¡®è®¤ä¿¡æ¯)</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="-22"/>
+ <location line="+25"/>
<source>Confirmed (%1 confirmations)</source>
<translation>已确认 (%1 æ¡ç¡®è®¤ä¿¡æ¯)</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>挖矿收入余é¢å°†åœ¨ %n 个数æ®å—åŽå¯ç”¨</numerusform></translation>
- </message>
<message>
- <location line="+5"/>
+ <location line="-22"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation>此数æ®å—未被任何其他节点接收,å¯èƒ½ä¸è¢«æŽ¥å—ï¼</translation>
</message>
@@ -2830,7 +2909,7 @@ Address: %4
<translation>已生æˆä½†æœªè¢«æŽ¥å—</translation>
</message>
<message>
- <location line="+43"/>
+ <location line="+62"/>
<source>Received with</source>
<translation>接收于</translation>
</message>
@@ -2991,27 +3070,27 @@ Address: %4
<message>
<location line="+142"/>
<source>Export Transaction History</source>
- <translation type="unfinished"/>
+ <translation>导出交易历å²</translation>
</message>
<message>
<location line="+19"/>
<source>Exporting Failed</source>
- <translation type="unfinished"/>
+ <translation>导出失败</translation>
</message>
<message>
<location line="+0"/>
<source>There was an error trying to save the transaction history to %1.</source>
- <translation type="unfinished"/>
+ <translation>导出交易历å²åˆ° %1 æ—¶å‘生错误。</translation>
</message>
<message>
<location line="+4"/>
<source>Exporting Successful</source>
- <translation type="unfinished"/>
+ <translation>导出æˆåŠŸ</translation>
</message>
<message>
<location line="+0"/>
<source>The transaction history was successfully saved to %1.</source>
- <translation type="unfinished"/>
+ <translation>交易历å²å·²æˆåŠŸä¿å­˜åˆ° %1。</translation>
</message>
<message>
<location line="-22"/>
@@ -3069,7 +3148,7 @@ Address: %4
<message>
<location filename="../walletframe.cpp" line="+26"/>
<source>No wallet has been loaded.</source>
- <translation type="unfinished"/>
+ <translation>没有载入钱包。</translation>
</message>
</context>
<context>
@@ -3126,7 +3205,7 @@ Address: %4
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+217"/>
+ <location filename="../bitcoinstrings.cpp" line="+221"/>
<source>Usage:</source>
<translation>使用:</translation>
</message>
@@ -3149,7 +3228,7 @@ Address: %4
</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+22"/>
<source>Specify configuration file (default: bitcoin.conf)</source>
<translation>指定é…置文件 (默认为 bitcoin.conf)
</translation>
@@ -3172,7 +3251,7 @@ Address: %4
<translation>设置数æ®åº“ç¼“å†²åŒºå¤§å° (缺çœ: 25MB)</translation>
</message>
<message>
- <location line="-27"/>
+ <location line="-26"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
<translation>监å¬ç«¯å£è¿žæŽ¥ &lt;port&gt;(缺çœ: 8333 或测试网络: 18333)</translation>
</message>
@@ -3182,7 +3261,7 @@ Address: %4
<translation>最大连接数 &lt;n&gt; (缺çœ: 125)</translation>
</message>
<message>
- <location line="-50"/>
+ <location line="-51"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
<translation>连接一个节点并获å–对端地å€ï¼Œç„¶åŽæ–­å¼€è¿žæŽ¥</translation>
</message>
@@ -3192,22 +3271,22 @@ Address: %4
<translation>指定您的公共地å€</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
<translation>断开行为ä¸ç«¯å¯¹ç«¯é˜€å€¼ï¼ˆç¼ºçœ: 100)</translation>
</message>
<message>
- <location line="-147"/>
+ <location line="-148"/>
<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="-33"/>
+ <location line="-36"/>
<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="+31"/>
+ <location line="+34"/>
<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>
@@ -3218,7 +3297,7 @@ Address: %4
</translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<source>Run in the background as a daemon and accept commands</source>
<translation>在åŽå°è¿è¡Œå¹¶æŽ¥å—命令
@@ -3231,12 +3310,12 @@ Address: %4
</translation>
</message>
<message>
- <location line="-117"/>
+ <location line="-118"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
<translation>接å—æ¥è‡ªå¤–部的连接 (缺çœ: 如果ä¸å¸¦ -proxy or -connect å‚数设置为1)</translation>
</message>
<message>
- <location line="-92"/>
+ <location line="-95"/>
<source>%s, you must set a rpcpassword in the configuration file:
%s
It is recommended you use the following random password:
@@ -3287,6 +3366,11 @@ rpcpassword=%s
</message>
<message>
<location line="+4"/>
+ <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</source>
+ <translation>进入回归测试模å¼ï¼Œå®ƒé‡‡ç”¨ä¸€ç§ç‰¹æ®Šçš„å¯ç«‹å³è§£å†³çš„区å—链模拟情况。</translation>
+ </message>
+ <message>
+ <location line="+3"/>
<source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
<translation>错误:该交易被拒ç»ï¼å‘生这ç§é”™è¯¯çš„原因å¯èƒ½æ˜¯ï¼šé’±åŒ…中的比特å¸å·²ç»è¢«ç”¨æŽ‰ï¼Œæœ‰å¯èƒ½æ‚¨å¤åˆ¶äº†wallet.dat钱包文件,然åŽç”¨å¤åˆ¶çš„钱包文件支付了比特å¸ï¼Œä½†æ˜¯è¿™ä¸ªé’±åŒ…文件中没有记录。</translation>
</message>
@@ -3392,6 +3476,11 @@ rpcpassword=%s
</message>
<message>
<location line="+1"/>
+ <source>Do not load the wallet and disable wallet RPC calls</source>
+ <translation>ä¸è¦åŠ è½½é’±åŒ…å’Œç¦ç”¨é’±åŒ…çš„ RPC 调用</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Do you want to rebuild the block database now?</source>
<translation>你想现在就é‡å»ºå—æ•°æ®åº“å—?</translation>
</message>
@@ -3556,9 +3645,9 @@ rpcpassword=%s
<translation>å‘é€å‘½ä»¤åˆ°æ¯”特å¸æœåŠ¡å™¨</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+7"/>
<source>Set maximum block size in bytes (default: %d)</source>
- <translation type="unfinished"/>
+ <translation>设置最大区å—å¤§å° (默认: %d,å•ä½å­—节)</translation>
</message>
<message>
<location line="+2"/>
@@ -3576,7 +3665,12 @@ rpcpassword=%s
<translation>å¯åŠ¨æ¯”特å¸æœåŠ¡å™¨</translation>
</message>
<message>
- <location line="+12"/>
+ <location line="+3"/>
+ <source>This is intended for regression testing tools and app development.</source>
+ <translation>这是用于回归测试和应用开å‘目的。</translation>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Usage (deprecated, use bitcoin-cli):</source>
<translation>用法(ä¸æŽ¨è,请使用 bitcoin-cli):</translation>
</message>
@@ -3601,7 +3695,12 @@ rpcpassword=%s
<translation>钱包 %s 在外部的数æ®ç›®å½• %s</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="+2"/>
+ <source>Wallet options:</source>
+ <translation>钱包选项:</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source>
<translation>警告:已废弃的 -debugnet å‚数已忽略,请用 -debug=net</translation>
</message>
@@ -3611,12 +3710,12 @@ rpcpassword=%s
<translation>您需è¦å°† -reindex 改为 -txindex 以é‡å»ºæ•°æ®åº“</translation>
</message>
<message>
- <location line="-78"/>
+ <location line="-79"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation>从blk000??.dat文件导入数æ®å—</translation>
</message>
<message>
- <location line="-104"/>
+ <location line="-105"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
<translation>当收到相关æ醒或者我们看到一个长分å‰æ—¶æ‰§è¡Œå‘½ä»¤ï¼ˆ%s 将替æ¢ä¸ºæ¶ˆæ¯ï¼‰</translation>
</message>
@@ -3636,7 +3735,7 @@ rpcpassword=%s
<translation>设置脚本验è¯çº¿ç¨‹æ•°é‡ï¼ˆæœ€å¤š16,0 = 自动,&lt;0 = 留下许多空闲核心,默认为 0)</translation>
</message>
<message>
- <location line="+88"/>
+ <location line="+89"/>
<source>Information</source>
<translation>ä¿¡æ¯</translation>
</message>
@@ -3686,11 +3785,6 @@ rpcpassword=%s
<translation>跟踪/调试信æ¯è¾“出到控制å°ï¼Œä¸è¾“出到 debug.log 文件</translation>
</message>
<message>
- <location line="+1"/>
- <source>Send trace/debug info to debugger</source>
- <translation>跟踪/调试信æ¯è¾“出到调试器</translation>
- </message>
- <message>
<location line="+6"/>
<source>Set minimum block size in bytes (default: 0)</source>
<translation>设置最å°æ•°æ®å—大å°(缺çœ:0)</translation>
@@ -3716,7 +3810,7 @@ rpcpassword=%s
<translation>系统错误:</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Transaction amount too small</source>
<translation>交易é‡å¤ªå°</translation>
</message>
@@ -3746,7 +3840,7 @@ rpcpassword=%s
<translation>JSON-RPC 连接用户å</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Warning</source>
<translation>警告</translation>
</message>
@@ -3766,39 +3860,39 @@ rpcpassword=%s
<translation>钱包文件wallet.datæŸå,抢救备份失败</translation>
</message>
<message>
- <location line="-57"/>
+ <location line="-58"/>
<source>Password for JSON-RPC connections</source>
<translation>JSON-RPC 连接密ç 
</translation>
</message>
<message>
- <location line="-69"/>
+ <location line="-70"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation>å…许从指定IP接å—到的 JSON-RPC 连接</translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<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="-131"/>
+ <location line="-132"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
<translation>当最佳数æ®å—å˜åŒ–时执行命令 (命令行中的 %s 会被替æ¢æˆæ•°æ®å—哈希值)</translation>
</message>
<message>
- <location line="+160"/>
+ <location line="+161"/>
<source>Upgrade wallet to latest format</source>
<translation>将钱包å‡çº§åˆ°æœ€æ–°çš„æ ¼å¼</translation>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation>设置密钥池大å°ä¸º &lt;n&gt; (缺çœ: 100)
</translation>
</message>
<message>
- <location line="-12"/>
+ <location line="-11"/>
<source>Rescan the block chain for missing wallet transactions</source>
<translation>é‡æ–°æ‰«æ区å—链以查找é—æ¼çš„钱包交易</translation>
</message>
@@ -3808,7 +3902,7 @@ rpcpassword=%s
<translation>为 JSON-RPC 连接使用 OpenSSL (https) 连接</translation>
</message>
<message>
- <location line="-29"/>
+ <location line="-30"/>
<source>Server certificate file (default: server.cert)</source>
<translation>æœåŠ¡å™¨è¯ä¹¦ (默认为 server.cert)
</translation>
@@ -3826,17 +3920,17 @@ rpcpassword=%s
</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Unable to bind to %s on this computer (bind returned error %d, %s)</source>
<translation>æ— æ³•ç»‘å®šæœ¬æœºç«¯å£ %s (è¿”å›žé”™è¯¯æ¶ˆæ¯ %d, %s)</translation>
</message>
<message>
- <location line="-106"/>
+ <location line="-107"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation>使用 -addnode, -seednode å’Œ -connect 选项时å…许查询DNS</translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+60"/>
<source>Loading addresses...</source>
<translation>正在加载地å€ç°¿...</translation>
</message>
@@ -3876,7 +3970,7 @@ rpcpassword=%s
<translation>被指定的是未知socks代ç†ç‰ˆæœ¬: %i</translation>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
<translation>æ— æ³•è§£æž -bind 端å£åœ°å€: &apos;%s&apos;</translation>
</message>
@@ -3886,7 +3980,7 @@ rpcpassword=%s
<translation>æ— æ³•è§£æž -externalip 地å€: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+47"/>
+ <location line="+48"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation>éžæ³•é‡‘é¢ -paytxfee=&lt;amount&gt;: &apos;%s&apos;</translation>
</message>
@@ -3906,7 +4000,7 @@ rpcpassword=%s
<translation>正在加载数æ®å—索引...</translation>
</message>
<message>
- <location line="-61"/>
+ <location line="-62"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
<translation>添加节点并与其ä¿æŒè¿žæŽ¥</translation>
</message>
@@ -3916,12 +4010,12 @@ rpcpassword=%s
<translation>无法在本机绑定 %s 端å£ã€‚比特å¸å®¢æˆ·ç«¯è½¯ä»¶å¯èƒ½å·²ç»åœ¨è¿è¡Œã€‚</translation>
</message>
<message>
- <location line="+94"/>
+ <location line="+95"/>
<source>Loading wallet...</source>
<translation>正在加载钱包...</translation>
</message>
<message>
- <location line="-55"/>
+ <location line="-56"/>
<source>Cannot downgrade wallet</source>
<translation>无法é™çº§é’±åŒ…</translation>
</message>
@@ -3931,7 +4025,7 @@ rpcpassword=%s
<translation>无法写入默认地å€</translation>
</message>
<message>
- <location line="+66"/>
+ <location line="+67"/>
<source>Rescanning...</source>
<translation>正在é‡æ–°æ‰«æ...</translation>
</message>
@@ -3951,7 +4045,7 @@ rpcpassword=%s
<translation>错误</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-35"/>
<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 748d30333c..032c96b1fd 100644
--- a/src/qt/locale/bitcoin_zh_TW.ts
+++ b/src/qt/locale/bitcoin_zh_TW.ts
@@ -24,19 +24,19 @@ This product includes software developed by the OpenSSL Project for use in the O
這是一套實驗性的軟體。
-此軟體是ä¾æ“š MIT/X11 軟體授權æ¢æ¬¾æ•£å¸ƒï¼Œè©³æƒ…請見附帶的 COPYING 檔案,或是以下網站: http://www.opensource.org/licenses/mit-license.php.
+這套軟體是ä¾æ“š MIT/X11 軟體授權æ¢æ¬¾æ•£å¸ƒï¼Œè©³æƒ…請見附帶的 COPYING 檔案,或是以下網站: http://www.opensource.org/licenses/mit-license.php.
此產å“也包å«äº†ç”± OpenSSL Project 所開發的 OpenSSL Toolkit (http://www.openssl.org/) 軟體,和由 Eric Young (eay@cryptsoft.com) 撰寫的加解密軟體,以åŠç”± Thomas Bernard 所撰寫的 UPnP 軟體。</translation>
</message>
<message>
- <location filename="../aboutdialog.cpp" line="+19"/>
+ <location filename="../utilitydialog.cpp" line="+29"/>
<source>Copyright</source>
<translation>版權</translation>
</message>
<message>
<location line="+0"/>
- <source>The Bitcoin developers</source>
- <translation>ä½å…ƒå¹£è»Ÿé«”開發人員</translation>
+ <source>The Bitcoin Core developers</source>
+ <translation>ä½å…ƒå¹£æ ¸å¿ƒé–‹ç™¼äººå“¡</translation>
</message>
</context>
<context>
@@ -44,12 +44,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location filename="../forms/addressbookpage.ui" line="+30"/>
<source>Double-click to edit address or label</source>
- <translation>點兩下來編輯ä½å€æˆ–標記</translation>
+ <translation>按兩下來編輯ä½å€æˆ–標記</translation>
</message>
<message>
<location line="+27"/>
<source>Create a new address</source>
- <translation>產生新ä½å€</translation>
+ <translation>製造新的ä½å€</translation>
</message>
<message>
<location line="+3"/>
@@ -59,7 +59,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+11"/>
<source>Copy the currently selected address to the system clipboard</source>
- <translation>複製目å‰é¸å–çš„ä½å€åˆ°ç³»çµ±å‰ªè²¼ç°¿</translation>
+ <translation>複製目å‰é¸æ“‡çš„ä½å€åˆ°ç³»çµ±å‰ªè²¼ç°¿</translation>
</message>
<message>
<location line="+3"/>
@@ -79,12 +79,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location filename="../forms/addressbookpage.ui" line="-41"/>
<source>Delete the currently selected address from the list</source>
- <translation>從列表中刪除目å‰é¸å–çš„ä½å€</translation>
+ <translation>把目å‰é¸æ“‡çš„ä½å€å¾žåˆ—表中刪掉</translation>
</message>
<message>
<location line="+27"/>
<source>Export the data in the current tab to a file</source>
- <translation>將目å‰åˆ†é çš„資料匯出存æˆæª”案</translation>
+ <translation>把目å‰åˆ†é çš„資料匯出存æˆæª”案</translation>
</message>
<message>
<location line="+3"/>
@@ -94,7 +94,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="-27"/>
<source>&amp;Delete</source>
- <translation>刪除</translation>
+ <translation>刪掉</translation>
</message>
<message>
<location filename="../addressbookpage.cpp" line="-30"/>
@@ -124,7 +124,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+7"/>
<source>These are your Bitcoin addresses for sending payments. Always check the amount and the receiving address before sending coins.</source>
- <translation>這是你用來付款的ä½å…ƒå¹£ä½å€ã€‚在付錢之å‰ï¼Œå‹™å¿…è¦æª¢æŸ¥é‡‘é¡å’Œæ”¶æ¬¾ä½å€æ˜¯å¦æ­£ç¢ºã€‚</translation>
+ <translation>這些是你è¦ä»˜æ¬¾éŽåŽ»çš„ä½å…ƒå¹£ä½å€ã€‚在付錢之å‰ï¼Œå‹™å¿…è¦æª¢æŸ¥é‡‘é¡å’Œæ”¶æ¬¾ä½å€æ˜¯å¦æ­£ç¢ºã€‚</translation>
</message>
<message>
<location line="+4"/>
@@ -149,17 +149,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+1"/>
<source>Comma separated file (*.csv)</source>
- <translation>逗號分隔資料檔 (*.csv)</translation>
+ <translation>逗號分隔資料檔(*.csv)</translation>
</message>
<message>
<location line="+13"/>
- <source>Error exporting</source>
- <translation>匯出錯誤</translation>
+ <source>Exporting Failed</source>
+ <translation>匯出失敗</translation>
</message>
<message>
- <location line="+0"/>
- <source>Could not write to file %1.</source>
- <translation>無法寫入檔案 %1.</translation>
+ <location line="+1"/>
+ <source>There was an error trying to save the address list to %1.</source>
+ <translation>儲存ä½å€åˆ—表到 %1 時發生錯誤。</translation>
</message>
</context>
<context>
@@ -215,7 +215,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"/>
@@ -225,7 +225,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"/>
@@ -235,7 +235,7 @@ 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"/>
@@ -245,17 +245,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+46"/>
<source>Confirm wallet encryption</source>
- <translation>錢包加密確èª</translation>
+ <translation>確èªéŒ¢åŒ…加密</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>警告: 如果將錢包加密後忘記密碼,你從此就&lt;b&gt;失去其中所有的ä½å…ƒå¹£äº†&lt;/b&gt;ï¼</translation>
+ <translation>警告: 如果把錢包加密後åˆå¿˜è¨˜å¯†ç¢¼ï¼Œä½ å°±æœƒå¾žæ­¤&lt;b&gt;失去其中所有的ä½å…ƒå¹£äº†&lt;/b&gt;ï¼</translation>
</message>
<message>
<location line="+0"/>
<source>Are you sure you wish to encrypt your wallet?</source>
- <translation>你確定è¦å°‡éŒ¢åŒ…加密嗎?</translation>
+ <translation>你確定è¦æŠŠéŒ¢åŒ…加密嗎?</translation>
</message>
<message>
<location line="+15"/>
@@ -277,7 +277,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>ä½å…ƒå¹£è»Ÿé«”ç¾åœ¨è¦é—œé–‰ï¼Œå¥½å®ŒæˆåŠ å¯†ç¨‹åºã€‚請注æ„,加密錢包ä¸èƒ½å®Œå…¨é˜²æ­¢å…¥ä¾µä½ çš„電腦的惡æ„程å¼å·å–ä½å…ƒå¹£ã€‚</translation>
</message>
<message>
<location line="+13"/>
@@ -290,13 +290,13 @@ 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"/>
<location line="+48"/>
<source>The supplied passphrases do not match.</source>
- <translation>æ供的密碼ä¸ç¬¦ã€‚</translation>
+ <translation>æ供的密碼ä¸ä¸€æ¨£ã€‚</translation>
</message>
<message>
<location line="-37"/>
@@ -308,7 +308,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"/>
@@ -318,28 +318,33 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+14"/>
<source>Wallet passphrase was successfully changed.</source>
- <translation>錢包密碼更改æˆåŠŸã€‚</translation>
+ <translation>錢包密碼改æˆåŠŸäº†ã€‚</translation>
</message>
</context>
<context>
<name>BitcoinGUI</name>
<message>
- <location filename="../bitcoingui.cpp" line="+260"/>
+ <location filename="../bitcoingui.cpp" line="+295"/>
<source>Sign &amp;message...</source>
- <translation>訊æ¯ç°½ç½²...</translation>
+ <translation>簽署訊æ¯...</translation>
</message>
<message>
- <location line="+290"/>
+ <location line="+335"/>
<source>Synchronizing with network...</source>
<translation>正在跟網路進行åŒæ­¥...</translation>
</message>
<message>
- <location line="-360"/>
+ <location line="-407"/>
<source>&amp;Overview</source>
<translation>總覽</translation>
</message>
<message>
- <location line="+1"/>
+ <location line="-137"/>
+ <source>Node</source>
+ <translation>節點</translation>
+ </message>
+ <message>
+ <location line="+138"/>
<source>Show general overview of wallet</source>
<translation>顯示錢包一般總覽</translation>
</message>
@@ -354,7 +359,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>ç€è¦½äº¤æ˜“紀錄</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+17"/>
<source>E&amp;xit</source>
<translation>çµæŸ</translation>
</message>
@@ -387,22 +392,37 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+9"/>
<source>&amp;Encrypt Wallet...</source>
- <translation>錢包加密...</translation>
+ <translation>加密錢包...</translation>
</message>
<message>
<location line="+3"/>
<source>&amp;Backup Wallet...</source>
- <translation>錢包備份...</translation>
+ <translation>備份錢包...</translation>
</message>
<message>
<location line="+2"/>
<source>&amp;Change Passphrase...</source>
- <translation>密碼更改...</translation>
+ <translation>改變密碼...</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>&amp;Sending addresses...</source>
+ <translation>付款ä½å€...</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>&amp;Receiving addresses...</source>
+ <translation>收款ä½å€...</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Open &amp;URI...</source>
+ <translation>é–‹å•“ URI...</translation>
</message>
<message>
- <location line="+295"/>
+ <location line="+325"/>
<source>Importing blocks from disk...</source>
- <translation>正在從ç£ç¢ŸåŒ¯å…¥å€å¡Š...</translation>
+ <translation>正在從ç£ç¢ŸåŒ¯å…¥å€å¡Šè³‡æ–™...</translation>
</message>
<message>
<location line="+3"/>
@@ -410,12 +430,12 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>正在為ç£ç¢Ÿè£¡çš„å€å¡Šé‡å»ºç´¢å¼•...</translation>
</message>
<message>
- <location line="-358"/>
+ <location line="-405"/>
<source>Send coins to a Bitcoin address</source>
<translation>付錢給一個ä½å…ƒå¹£ä½å€</translation>
</message>
<message>
- <location line="+47"/>
+ <location line="+49"/>
<source>Modify configuration options for Bitcoin</source>
<translation>修改ä½å…ƒå¹£è»Ÿé«”的設定é¸é …</translation>
</message>
@@ -427,7 +447,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>更改錢包加密用的密碼</translation>
+ <translation>改變錢包加密用的密碼</translation>
</message>
<message>
<location line="+6"/>
@@ -437,7 +457,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+1"/>
<source>Open debugging and diagnostic console</source>
- <translation>開啓除錯與診斷主控å°</translation>
+ <translation>開啓除錯和診斷主控å°</translation>
</message>
<message>
<location line="-4"/>
@@ -445,18 +465,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>驗證訊æ¯...</translation>
</message>
<message>
- <location line="+375"/>
+ <location line="+430"/>
<source>Bitcoin</source>
<translation>ä½å…ƒå¹£</translation>
</message>
<message>
- <location line="-563"/>
- <location line="+10"/>
+ <location line="-643"/>
<source>Wallet</source>
<translation>錢包</translation>
</message>
<message>
- <location line="+113"/>
+ <location line="+146"/>
<source>&amp;Send</source>
<translation>付款</translation>
</message>
@@ -466,7 +485,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>收款</translation>
</message>
<message>
- <location line="+44"/>
+ <location line="+46"/>
<location line="+2"/>
<source>&amp;Show / Hide</source>
<translation>顯示或隱è—</translation>
@@ -479,106 +498,100 @@ This product includes software developed by the OpenSSL Project for use in the O
<message>
<location line="+3"/>
<source>Encrypt the private keys that belong to your wallet</source>
- <translation>將錢包中的密鑰加密</translation>
+ <translation>把錢包中的密鑰加密</translation>
</message>
<message>
<location line="+7"/>
<source>Sign messages with your Bitcoin addresses to prove you own them</source>
- <translation>用ä½å…ƒå¹£ä½å€ç°½ç½²è¨Šæ¯ä¾†è­‰æ˜Žé‚£æ˜¯ä½ çš„</translation>
+ <translation>用ä½å…ƒå¹£ä½å€ç°½ç½²è¨Šæ¯ä¾†è­‰æ˜Žä½å€æ˜¯ä½ çš„</translation>
</message>
<message>
<location line="+2"/>
<source>Verify messages to ensure they were signed with specified Bitcoin addresses</source>
- <translation>驗證訊æ¯ä¾†ç¢ºèªæ˜¯ç”¨æŒ‡å®šçš„ä½å…ƒå¹£ä½å€ç°½ç½²çš„</translation>
+ <translation>驗證訊æ¯æ˜¯ç”¨ä¾†ç¢ºå®šè¨Šæ¯æ˜¯ç”¨æŒ‡å®šçš„ä½å…ƒå¹£ä½å€ç°½ç½²çš„</translation>
</message>
<message>
- <location line="+39"/>
+ <location line="+48"/>
<source>&amp;File</source>
<translation>檔案</translation>
</message>
<message>
- <location line="+11"/>
+ <location line="+14"/>
<source>&amp;Settings</source>
<translation>設定</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+9"/>
<source>&amp;Help</source>
<translation>說明</translation>
</message>
<message>
- <location line="+9"/>
+ <location line="+15"/>
<source>Tabs toolbar</source>
<translation>分é å·¥å…·åˆ—</translation>
</message>
<message>
- <location line="-244"/>
- <location line="+321"/>
+ <location line="-284"/>
+ <location line="+376"/>
<source>[testnet]</source>
<translation>[testnet]</translation>
</message>
<message>
- <location line="-331"/>
- <location line="+10"/>
+ <location line="-401"/>
<source>Bitcoin Core</source>
<translation>ä½å…ƒå¹£æ ¸å¿ƒ</translation>
</message>
<message>
- <location line="+121"/>
+ <location line="+163"/>
<source>Request payments (generates QR codes and bitcoin: URIs)</source>
- <translation>付款請求(產生 QR Code 與 bitcoin: 的 URI)</translation>
+ <translation>è¦æ±‚付款(產生 QR Code å’Œä½å…ƒå¹£ä»˜æ¬¾å”è­°çš„ URI)</translation>
</message>
<message>
- <location line="+27"/>
+ <location line="+29"/>
<location line="+2"/>
<source>&amp;About Bitcoin Core</source>
<translation>關於ä½å…ƒå¹£æ ¸å¿ƒ</translation>
</message>
<message>
- <location line="+34"/>
- <source>&amp;Used sending addresses...</source>
- <translation>使用éŽçš„付款ä½å€...</translation>
- </message>
- <message>
- <location line="+1"/>
+ <location line="+35"/>
<source>Show the list of used sending addresses and labels</source>
- <translation>顯示已使用éŽçš„付款ä½å€èˆ‡æ¨™è¨˜çš„清單</translation>
+ <translation>顯示已使用éŽçš„付款ä½å€å’Œæ¨™è¨˜çš„清單</translation>
</message>
<message>
- <location line="+1"/>
- <source>Used &amp;receiving addresses...</source>
- <translation>使用éŽçš„收款ä½å€...</translation>
+ <location line="+2"/>
+ <source>Show the list of used receiving addresses and labels</source>
+ <translation>顯示已使用éŽçš„收款ä½å€å’Œæ¨™è¨˜çš„清單</translation>
</message>
<message>
- <location line="+1"/>
- <source>Show the list of used receiving addresses and labels</source>
- <translation>顯示已使用éŽçš„收款ä½å€èˆ‡æ¨™è¨˜çš„清單</translation>
+ <location line="+3"/>
+ <source>Open a bitcoin: URI or payment request</source>
+ <translation>é–‹å•“ bitcoin å”è­°çš„ URI 或付款è¦æ±‚</translation>
</message>
<message>
<location line="+2"/>
- <source>Open URI...</source>
- <translation>é–‹å•“ URI...</translation>
+ <source>&amp;Command-line options</source>
+ <translation>命令列é¸é …</translation>
</message>
<message>
<location line="+1"/>
- <source>Open a bitcoin: URI or payment request</source>
- <translation>開啓 bitcoin: URI 或付款請求</translation>
+ <source>Show the Bitcoin Core help message to get a list with possible Bitcoin command-line options</source>
+ <translation>顯示ä½å…ƒå¹£æ ¸å¿ƒçš„說明訊æ¯ï¼Œä¾†å–å¾—å¯ç”¨å‘½ä»¤åˆ—é¸é …的列表</translation>
</message>
<message>
- <location line="+126"/>
+ <location line="+159"/>
<location line="+5"/>
<source>Bitcoin client</source>
<translation>ä½å…ƒå¹£å®¢æˆ¶ç«¯è»Ÿé«”</translation>
</message>
<message numerus="yes">
- <location line="+133"/>
+ <location line="+142"/>
<source>%n active connection(s) to Bitcoin network</source>
<translation><numerusform>%n 個é‹ä½œä¸­çš„ä½å…ƒå¹£ç¶²è·¯é€£ç·š</numerusform></translation>
</message>
<message>
<location line="+22"/>
<source>No block source available...</source>
- <translation>ç›®å‰æ²’有å€å¡Šä¾†æº...</translation>
+ <translation>沒有å¯ç”¨çš„å€å¡Šä¾†æº...</translation>
</message>
<message>
<location line="+12"/>
@@ -591,7 +604,7 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>已處ç†äº† %1 個å€å¡Šçš„交易紀錄。</translation>
</message>
<message numerus="yes">
- <location line="+20"/>
+ <location line="+23"/>
<source>%n hour(s)</source>
<translation><numerusform>%n 個å°æ™‚</numerusform></translation>
</message>
@@ -611,9 +624,9 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>è½å¾Œ %1</translation>
</message>
<message>
- <location line="+14"/>
+ <location line="+21"/>
<source>Last received block was generated %1 ago.</source>
- <translation>最近收到的å€å¡Šæ˜¯åœ¨ %1 之å‰ç”Ÿç”¢å‡ºä¾†çš„。</translation>
+ <translation>最近收到的å€å¡Šæ˜¯åœ¨ %1 以å‰ç”Ÿå‡ºä¾†çš„。</translation>
</message>
<message>
<location line="+2"/>
@@ -636,27 +649,17 @@ This product includes software developed by the OpenSSL Project for use in the O
<translation>資訊</translation>
</message>
<message>
- <location line="+77"/>
- <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="-152"/>
+ <location line="-85"/>
<source>Up to date</source>
<translation>最新狀態</translation>
</message>
<message>
- <location line="+31"/>
+ <location line="+34"/>
<source>Catching up...</source>
<translation>正在趕進度...</translation>
</message>
<message>
- <location line="+124"/>
- <source>Confirm transaction fee</source>
- <translation>確èªäº¤æ˜“手續費</translation>
- </message>
- <message>
- <location line="+8"/>
+ <location line="+130"/>
<source>Sent transaction</source>
<translation>付款交易</translation>
</message>
@@ -679,7 +682,7 @@ Address: %4
</translation>
</message>
<message>
- <location line="+67"/>
+ <location line="+69"/>
<source>Wallet is &lt;b&gt;encrypted&lt;/b&gt; and currently &lt;b&gt;unlocked&lt;/b&gt;</source>
<translation>錢包&lt;b&gt;已加密&lt;/b&gt;並且&lt;b&gt;解鎖中&lt;/b&gt;</translation>
</message>
@@ -689,9 +692,9 @@ Address: %4
<translation>錢包&lt;b&gt;已加密&lt;/b&gt;並且&lt;b&gt;上鎖中&lt;/b&gt;</translation>
</message>
<message>
- <location filename="../bitcoin.cpp" line="+116"/>
+ <location filename="../bitcoin.cpp" line="+438"/>
<source>A fatal error occurred. Bitcoin can no longer continue safely and will quit.</source>
- <translation>發生了致命的錯誤。ä½å…ƒå¹£è»Ÿé«”無法å†ç¹¼çºŒå®‰å…¨åŸ·è¡Œï¼Œåªå¥½çµæŸã€‚</translation>
+ <translation>發生了致命的錯誤。ä½å…ƒå¹£è»Ÿé«”沒辦法å†ç¹¼çºŒå®‰å…¨åŸ·è¡Œï¼Œåªå¥½çµæŸã€‚</translation>
</message>
</context>
<context>
@@ -707,12 +710,12 @@ Address: %4
<message>
<location filename="../forms/coincontroldialog.ui" line="+14"/>
<source>Coin Control Address Selection</source>
- <translation>錢幣控制ä½å€é¸æ“‡</translation>
+ <translation>錢幣控制的ä½å€é¸æ“‡</translation>
</message>
<message>
<location line="+34"/>
<source>Quantity:</source>
- <translation>數é‡:</translation>
+ <translation>數目:</translation>
</message>
<message>
<location line="+29"/>
@@ -737,7 +740,7 @@ Address: %4
<message>
<location line="+32"/>
<source>Low Output:</source>
- <translation>å°é‡‘é¡è¼¸å‡º</translation>
+ <translation>低輸出:</translation>
</message>
<message>
<location line="+48"/>
@@ -747,7 +750,7 @@ Address: %4
<message>
<location line="+32"/>
<source>Change:</source>
- <translation>找零:</translation>
+ <translation>找零金é¡:</translation>
</message>
<message>
<location line="+63"/>
@@ -787,7 +790,7 @@ Address: %4
<message>
<location line="+3"/>
<source>Confirmed</source>
- <translation>已確èª</translation>
+ <translation>已確定</translation>
</message>
<message>
<location line="+5"/>
@@ -828,7 +831,7 @@ Address: %4
<message>
<location line="+22"/>
<source>Copy quantity</source>
- <translation>複製數é‡</translation>
+ <translation>複製數目</translation>
</message>
<message>
<location line="+2"/>
@@ -853,12 +856,12 @@ Address: %4
<message>
<location line="+1"/>
<source>Copy low output</source>
- <translation>複製å°é‡‘é¡è¼¸å‡º</translation>
+ <translation>複製低輸出</translation>
</message>
<message>
<location line="+1"/>
<source>Copy change</source>
- <translation>複製找零</translation>
+ <translation>複製找零金é¡</translation>
</message>
<message>
<location line="+323"/>
@@ -911,7 +914,12 @@ Address: %4
<translation>(鎖定 %1 枚)</translation>
</message>
<message>
- <location line="+171"/>
+ <location line="+31"/>
+ <source>none</source>
+ <translation>ç„¡</translation>
+ </message>
+ <message>
+ <location line="+140"/>
<source>Dust</source>
<translation>零散錢</translation>
</message>
@@ -944,11 +952,11 @@ Address: %4
<message>
<location line="+2"/>
<source>Transactions with higher priority are more likely to get included into a block.</source>
- <translation>有較高優先度的交易比較有å¯èƒ½è¢«æŽ¥æ”¶æ”¾é€²å€å¡Šä¸­ã€‚</translation>
+ <translation>優先度較高的交易比較有å¯èƒ½è¢«æŽ¥å—放進å€å¡Šä¸­ã€‚</translation>
</message>
<message>
<location line="+1"/>
- <source>This label turns red, if the priority is smaller than &quot;medium&quot;</source>
+ <source>This label turns red, if the priority is smaller than &quot;medium&quot;.</source>
<translation>當優先度低於&quot;中等&quot;時,文字會變紅色。</translation>
</message>
<message>
@@ -965,12 +973,12 @@ Address: %4
<message>
<location line="-3"/>
<source>Amounts below 0.546 times the minimum relay fee are shown as dust.</source>
- <translation>金é¡ä½Žæ–¼æœ€å°‘轉發手續費乘以 0.546 時,會顯示æˆé›¶æ•£éŒ¢ã€‚</translation>
+ <translation>當金é¡ä½Žæ–¼æœ€å°‘轉發手續費乘以 0.546 時,會顯示æˆé›¶æ•£éŒ¢ã€‚</translation>
</message>
<message>
<location line="+2"/>
<source>This label turns red, if the change is smaller than %1.</source>
- <translation>當找零å°æ–¼ %1 時,文字會變紅色。</translation>
+ <translation>當找零金é¡å°æ–¼ %1 時,文字會變紅色。</translation>
</message>
<message>
<location line="+43"/>
@@ -981,12 +989,12 @@ Address: %4
<message>
<location line="-9"/>
<source>change from %1 (%2)</source>
- <translation>改變å‰æ˜¯ %1 (%2)</translation>
+ <translation>找零å‰æ˜¯ %1 (%2)</translation>
</message>
<message>
<location line="+1"/>
<source>(change)</source>
- <translation>(有變)</translation>
+ <translation>(找零)</translation>
</message>
</context>
<context>
@@ -1004,12 +1012,12 @@ Address: %4
<message>
<location line="+10"/>
<source>The label associated with this address list entry</source>
- <translation>與這個ä½å€ç°¿é …目關è¯çš„標記</translation>
+ <translation>跟這個ä½å€ç°¿é …目關è¯çš„標記</translation>
</message>
<message>
<location line="+17"/>
<source>The address associated with this address list entry. This can only be modified for sending addresses.</source>
- <translation>與這個ä½å€ç°¿é …目關è¯çš„ä½å€ã€‚åªæœ‰ä»˜æ¬¾ä½å€èƒ½è¢«ä¿®æ”¹ã€‚</translation>
+ <translation>跟這個ä½å€ç°¿é …目關è¯çš„ä½å€ã€‚åªæœ‰ä»˜æ¬¾ä½å€èƒ½è¢«ä¿®æ”¹ã€‚</translation>
</message>
<message>
<location line="-10"/>
@@ -1017,14 +1025,14 @@ Address: %4
<translation>ä½å€</translation>
</message>
<message>
- <location filename="../editaddressdialog.cpp" line="+25"/>
+ <location filename="../editaddressdialog.cpp" line="+28"/>
<source>New receiving address</source>
- <translation>新增收款ä½å€</translation>
+ <translation>造新的收款ä½å€</translation>
</message>
<message>
<location line="+4"/>
<source>New sending address</source>
- <translation>新增付款ä½å€</translation>
+ <translation>造新的付款ä½å€</translation>
</message>
<message>
<location line="+3"/>
@@ -1039,22 +1047,22 @@ Address: %4
<message>
<location line="+76"/>
<source>The entered address &quot;%1&quot; is already in the address book.</source>
- <translation>輸入的ä½å€ã€Œ%1ã€å·²å­˜åœ¨æ–¼ä½å€ç°¿ä¸­ã€‚</translation>
+ <translation>輸入的ä½å€ %1 在ä½å€ç°¿ä¸­å·²ç¶“有了。</translation>
</message>
<message>
<location line="-5"/>
<source>The entered address &quot;%1&quot; is not a valid Bitcoin address.</source>
- <translation>輸入的ä½å€ &quot;%1&quot; 並ä¸æ˜¯æœ‰æ•ˆçš„ä½å…ƒå¹£ä½å€ã€‚</translation>
+ <translation>輸入的ä½å€ %1 並ä¸æ˜¯æœ‰æ•ˆçš„ä½å…ƒå¹£ä½å€ã€‚</translation>
</message>
<message>
<location line="+10"/>
<source>Could not unlock wallet.</source>
- <translation>無法將錢包解鎖。</translation>
+ <translation>沒辦法把錢包解鎖。</translation>
</message>
<message>
<location line="+5"/>
<source>New key generation failed.</source>
- <translation>產生新密鑰失敗。</translation>
+ <translation>產生新的密鑰失敗了。</translation>
</message>
</context>
<context>
@@ -1062,7 +1070,7 @@ Address: %4
<message>
<location filename="../intro.cpp" line="+65"/>
<source>A new data directory will be created.</source>
- <translation>將會建立新的資料目錄。</translation>
+ <translation>å°±è¦é€ å‡ºæ–°çš„資料目錄。</translation>
</message>
<message>
<location line="+22"/>
@@ -1072,34 +1080,38 @@ Address: %4
<message>
<location line="+2"/>
<source>Directory already exists. Add %1 if you intend to create a new directory here.</source>
- <translation>目錄已經存在了。如果你è¦åœ¨è£¡é¢å»ºç«‹æ–°ç›®éŒ„的話,請加上 %1.</translation>
+ <translation>已經有這個目錄了。如果你è¦åœ¨è£¡é¢é€ å‡ºæ–°çš„目錄的話,請加上 %1.</translation>
</message>
<message>
<location line="+3"/>
<source>Path already exists, and is not a directory.</source>
- <translation>已經存在該路徑了,並且ä¸æ˜¯ä¸€å€‹ç›®éŒ„。</translation>
+ <translation>已經有指定的路徑了,並且ä¸æ˜¯ä¸€å€‹ç›®éŒ„。</translation>
</message>
<message>
<location line="+7"/>
<source>Cannot create data directory here.</source>
- <translation>無法在這裡新增資料目錄。</translation>
+ <translation>沒辦法在這裡造出資料目錄。</translation>
</message>
</context>
<context>
- <name>GUIUtil::HelpMessageBox</name>
+ <name>HelpMessageDialog</name>
<message>
- <location filename="../guiutil.cpp" line="+597"/>
- <source>version</source>
- <translation>版本</translation>
+ <location filename="../forms/helpmessagedialog.ui" line="+19"/>
+ <source>Bitcoin Core - Command-line options</source>
+ <translation>ä½å…ƒå¹£æ ¸å¿ƒ - 命令列é¸é …</translation>
</message>
<message>
- <location line="+0"/>
- <location line="+13"/>
+ <location filename="../utilitydialog.cpp" line="+38"/>
<source>Bitcoin Core</source>
<translation>ä½å…ƒå¹£æ ¸å¿ƒ</translation>
</message>
<message>
- <location line="-11"/>
+ <location line="+0"/>
+ <source>version</source>
+ <translation>版本</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Usage:</source>
<translation>用法:</translation>
</message>
@@ -1116,7 +1128,7 @@ Address: %4
<message>
<location line="+1"/>
<source>Set language, for example &quot;de_DE&quot; (default: system locale)</source>
- <translation>設定語言,比如說 &quot;de_DE&quot; (é è¨­å€¼: 系統語系)</translation>
+ <translation>設定語言,比如說 de_DE (é è¨­å€¼: 系統語系)</translation>
</message>
<message>
<location line="+1"/>
@@ -1126,12 +1138,12 @@ Address: %4
<message>
<location line="+1"/>
<source>Show splash screen on startup (default: 1)</source>
- <translation>é¡¯ç¤ºå•“å‹•ç•«é¢ (é è¨­å€¼: 1)</translation>
+ <translation>顯示啓動畫é¢(é è¨­å€¼: 1)</translation>
</message>
<message>
<location line="+1"/>
<source>Choose data directory on startup (default: 0)</source>
- <translation>啓動時é¸æ“‡è³‡æ–™ç›®éŒ„ (é è¨­å€¼: 0)</translation>
+ <translation>啓動時é¸æ“‡è³‡æ–™ç›®éŒ„(é è¨­å€¼: 0)</translation>
</message>
</context>
<context>
@@ -1149,12 +1161,12 @@ Address: %4
<message>
<location line="+26"/>
<source>As this is the first time the program is launched, you can choose where Bitcoin Core will store its data.</source>
- <translation>由於這是程å¼ç¬¬ä¸€æ¬¡å•“動,你å¯ä»¥é¸æ“‡ä½å…ƒå¹£æ ¸å¿ƒå„²å­˜è³‡æ–™çš„地方。</translation>
+ <translation>因為這是程å¼ç¬¬ä¸€æ¬¡å•“動,你å¯ä»¥é¸æ“‡ä½å…ƒå¹£æ ¸å¿ƒå„²å­˜è³‡æ–™çš„地方。</translation>
</message>
<message>
<location line="+10"/>
<source>Bitcoin Core will download and store a copy of the Bitcoin block chain. At least %1GB of data will be stored in this directory, and it will grow over time. The wallet will also be stored in this directory.</source>
- <translation>ä½å…ƒå¹£æ ¸å¿ƒæœƒä¸‹è¼‰ä¸¦å„²å­˜ä¸€ä»½ä½å…ƒå¹£å€å¡Šéˆçµçš„æ‹·è²ã€‚至少有 %1GB 的資料會儲存到這個目錄中,並且還會æŒçºŒå¢žé•·ã€‚å¦å¤–錢包資料也會儲存在這個目錄。</translation>
+ <translation>ä½å…ƒå¹£æ ¸å¿ƒæœƒä¸‹è¼‰ä¸¦å„²å­˜ä¸€ä»½ä½å…ƒå¹£å€å¡Šéˆçš„æ‹·è²ã€‚至少有 %1GB 的資料會儲存到這個目錄中,並且還會æŒçºŒå¢žé•·ã€‚å¦å¤–錢包資料也會儲存在這個目錄。</translation>
</message>
<message>
<location line="+10"/>
@@ -1174,7 +1186,7 @@ Address: %4
<message>
<location line="+1"/>
<source>Error: Specified data directory &quot;%1&quot; can not be created.</source>
- <translation>錯誤: 無法新增指定的資料目錄 &quot;%1&quot;.</translation>
+ <translation>錯誤: 沒辦法造出指定的資料目錄 &quot;%1&quot;.</translation>
</message>
<message>
<location line="+19"/>
@@ -1202,7 +1214,7 @@ Address: %4
<message>
<location line="+6"/>
<source>Open payment request from URI or file</source>
- <translation>從 URI 或檔案開啟付款請求</translation>
+ <translation>從 URI 或檔案開啟付款è¦æ±‚</translation>
</message>
<message>
<location line="+9"/>
@@ -1212,12 +1224,12 @@ Address: %4
<message>
<location line="+11"/>
<source>Select payment request file</source>
- <translation>é¸æ“‡ä»˜æ¬¾è«‹æ±‚資料檔</translation>
+ <translation>é¸æ“‡ä»˜æ¬¾è¦æ±‚資料檔</translation>
</message>
<message>
<location filename="../openuridialog.cpp" line="+47"/>
<source>Select payment request file to open</source>
- <translation>é¸æ“‡è¦é–‹å•Ÿçš„付款請求資料檔</translation>
+ <translation>é¸æ“‡è¦é–‹å•Ÿçš„付款è¦æ±‚資料檔</translation>
</message>
</context>
<context>
@@ -1228,14 +1240,14 @@ Address: %4
<translation>é¸é …</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+13"/>
<source>&amp;Main</source>
<translation>主è¦</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.</source>
- <translation>éžå¿…è¦çš„交易手續費,計費單ä½æ˜¯æ¯ä¸€åƒä½å…ƒçµ„(kB),且有助於縮短你的交易處ç†æ™‚間。大部份交易資料的大å°æ˜¯ 1 kB.</translation>
+ <translation>æ¯ä¸€åƒä½å…ƒçµ„(kB)è¦ä»˜çš„交易手續費,如果有付å¯ä»¥åŠ é€Ÿç¶²è·¯è™•ç†ä½ çš„交易。大部份交易資料的大å°æ˜¯ 1 kB.</translation>
</message>
<message>
<location line="+15"/>
@@ -1253,7 +1265,52 @@ Address: %4
<translation>系統登入時啟動ä½å…ƒå¹£</translation>
</message>
<message>
- <location line="+35"/>
+ <location line="+9"/>
+ <source>Size of &amp;database cache</source>
+ <translation>資料庫快å–大å°</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set database cache size in megabytes (default: 25)</source>
+ <translation>設定資料庫快å–的大å°æ˜¯å¤šå°‘百è¬ä½å…ƒçµ„(é è¨­å€¼: 25)</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>MB</source>
+ <translation>MB (百è¬ä½å…ƒçµ„)</translation>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Number of script &amp;verification threads</source>
+ <translation>指令碼驗證執行緒數目</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
+ <translation>設定驗證指令碼的執行緒數目(最多 16 個, 若是 0 表示程å¼è‡ªå‹•æ±ºå®šï¼Œå°æ–¼ 0 是ä¿ç•™ä¸ç”¨çš„處ç†å™¨æ ¸å¿ƒæ•¸ç›®ï¼Œé è¨­å€¼: 0)</translation>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Connect to the Bitcoin network through a SOCKS proxy.</source>
+ <translation>é€éŽ SOCKS 代ç†ä¼ºæœå™¨ä¾†é€£ç·šåˆ°ä½å…ƒå¹£ç¶²è·¯ã€‚</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>&amp;Connect through SOCKS proxy (default proxy):</source>
+ <translation>é€éŽ SOCKS 代ç†ä¼ºæœå™¨é€£ç·š(é è¨­ä»£ç†ä¼ºæœå™¨):</translation>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>IP address of the proxy (e.g. IPv4: 127.0.0.1 / IPv6: ::1)</source>
+ <translation>代ç†ä¼ºæœå™¨çš„網際網路ä½å€(åƒæ˜¯ IPv4 çš„ 127.0.0.1 或 IPv6 çš„ ::1)</translation>
+ </message>
+ <message>
+ <location line="+224"/>
+ <source>Active command-line options that override above options:</source>
+ <translation>從命令列å–代掉以上設定的é¸é …有:</translation>
+ </message>
+ <message>
+ <location line="+43"/>
<source>Reset all client options to default.</source>
<translation>回復所有客戶端軟體é¸é …æˆé è¨­å€¼ã€‚</translation>
</message>
@@ -1263,14 +1320,14 @@ Address: %4
<translation>é¸é …回復</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="-323"/>
<source>&amp;Network</source>
<translation>網路</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>自動在路由器上開放ä½å…ƒå¹£çš„客戶端通訊埠。åªæœ‰åœ¨ä½ çš„路由器支æ´ä¸”é–‹å•“ UPnP 時æ‰æœ‰ä½œç”¨ã€‚</translation>
+ <translation>自動在路由器上開放ä½å…ƒå¹£çš„客戶端通訊埠。åªæœ‰åœ¨ä½ çš„路由器支æ´ä¸”開啓通用å³æ’å³ç”¨(UPnP)å”定時æ‰æœ‰ä½œç”¨ã€‚</translation>
</message>
<message>
<location line="+3"/>
@@ -1278,44 +1335,29 @@ Address: %4
<translation>用 &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>é€éŽ SOCKS 代ç†ä¼ºæœå™¨é€£ç·šåˆ°ä½å…ƒå¹£ç¶²è·¯ (比如說è¦é€éŽ Tor 連線)。</translation>
- </message>
- <message>
- <location line="+3"/>
- <source>&amp;Connect through SOCKS proxy:</source>
- <translation>é€éŽ SOCKS 代ç†ä¼ºæœå™¨é€£ç·š:</translation>
- </message>
- <message>
- <location line="+9"/>
+ <location line="+19"/>
<source>Proxy &amp;IP:</source>
<translation>代ç†ä½å€:</translation>
</message>
<message>
- <location line="+19"/>
- <source>IP address of the proxy (e.g. 127.0.0.1)</source>
- <translation>代ç†ä¼ºæœå™¨çš„網際網路ä½å€ (åƒæ˜¯ 127.0.0.1)</translation>
- </message>
- <message>
- <location line="+7"/>
+ <location line="+32"/>
<source>&amp;Port:</source>
- <translation>通訊埠:</translation>
+ <translation>埠號:</translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+25"/>
<source>Port of the proxy (e.g. 9050)</source>
- <translation>代ç†ä¼ºæœå™¨çš„通訊埠 (åƒæ˜¯ 9050)</translation>
+ <translation>代ç†ä¼ºæœå™¨çš„通訊埠(åƒæ˜¯ 9050)</translation>
</message>
<message>
<location line="+7"/>
<source>SOCKS &amp;Version:</source>
- <translation>SOCKS å”定版本:</translation>
+ <translation>SOCKS 版本:</translation>
</message>
<message>
<location line="+13"/>
<source>SOCKS version of the proxy (e.g. 5)</source>
- <translation>代ç†ä¼ºæœå™¨çš„ SOCKS å”定版本 (åƒæ˜¯ 5)</translation>
+ <translation>代ç†ä¼ºæœå™¨çš„ SOCKS å”定版本(åƒæ˜¯ 5)</translation>
</message>
<message>
<location line="+36"/>
@@ -1330,17 +1372,17 @@ Address: %4
<message>
<location line="+3"/>
<source>&amp;Minimize to the tray instead of the taskbar</source>
- <translation>縮到最å°æ–¼é€šçŸ¥å€åŸŸè€Œä¸æ˜¯å·¥ä½œåˆ—</translation>
+ <translation>縮到最å°åˆ°é€šçŸ¥å€åŸŸè€Œä¸æ˜¯å·¥ä½œåˆ—</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>當視窗關閉時將它縮到最å°ï¼Œè€ŒéžçµæŸæ‡‰ç”¨ç¨‹å¼ã€‚當勾é¸é€™å€‹é¸é …時,應用程å¼åªèƒ½ç”¨é¸å–®ä¸­çš„çµæŸä¾†åœæ­¢åŸ·è¡Œã€‚</translation>
+ <translation>當視窗關閉時,把應用程å¼ç¸®åˆ°æœ€å°ï¼Œè€Œä¸æ˜¯çµæŸã€‚當勾é¸é€™å€‹é¸é …時,åªèƒ½å¤ ç”¨é¸å–®ä¸­çš„çµæŸä¾†é—œæŽ‰æ‡‰ç”¨ç¨‹å¼ã€‚</translation>
</message>
<message>
<location line="+3"/>
<source>M&amp;inimize on close</source>
- <translation>關閉時最å°åŒ–</translation>
+ <translation>關閉時縮到最å°</translation>
</message>
<message>
<location line="+21"/>
@@ -1350,7 +1392,7 @@ Address: %4
<message>
<location line="+8"/>
<source>User Interface &amp;language:</source>
- <translation>使用界é¢èªžè¨€</translation>
+ <translation>使用界é¢çš„語言:</translation>
</message>
<message>
<location line="+13"/>
@@ -1365,7 +1407,7 @@ Address: %4
<message>
<location line="+13"/>
<source>Choose the default subdivision unit to show in the interface and when sending coins.</source>
- <translation>é¸æ“‡æ“作界é¢èˆ‡ä»˜æ¬¾æ™‚é è¨­é¡¯ç¤ºçš„細分單ä½ã€‚</translation>
+ <translation>é¸æ“‡æ“作界é¢å’Œä»˜æ¬¾æ™‚,é è¨­é¡¯ç¤ºé‡‘é¡çš„細分單ä½ã€‚</translation>
</message>
<message>
<location line="+9"/>
@@ -1388,7 +1430,7 @@ Address: %4
<translation>顯示錢幣控制功能(專家用)</translation>
</message>
<message>
- <location line="+71"/>
+ <location line="+136"/>
<source>&amp;OK</source>
<translation>好</translation>
</message>
@@ -1398,44 +1440,38 @@ Address: %4
<translation>å–消</translation>
</message>
<message>
- <location line="+10"/>
- <source>&amp;Apply</source>
- <translation>套用</translation>
- </message>
- <message>
- <location filename="../optionsdialog.cpp" line="+63"/>
+ <location filename="../optionsdialog.cpp" line="+67"/>
<source>default</source>
<translation>é è¨­å€¼</translation>
</message>
<message>
- <location line="+131"/>
+ <location line="+57"/>
+ <source>none</source>
+ <translation>ç„¡</translation>
+ </message>
+ <message>
+ <location line="+75"/>
<source>Confirm options reset</source>
<translation>確èªå›žå¾©é¸é …</translation>
</message>
<message>
<location line="+1"/>
- <source>Some settings may require a client restart to take effect.</source>
- <translation>有些設定å¯èƒ½éœ€è¦é‡å•“客戶端軟體æ‰æœƒç”Ÿæ•ˆã€‚</translation>
- </message>
- <message>
- <location line="+0"/>
- <source>Do you want to proceed?</source>
- <translation>你想è¦å°±åšä¸‹åŽ»å—Ž?</translation>
+ <location line="+29"/>
+ <source>Client restart required to activate changes.</source>
+ <translation>需è¦é‡æ–°å•Ÿå‹•å®¢æˆ¶ç«¯è»Ÿé«”來讓改變生效。</translation>
</message>
<message>
- <location line="+42"/>
- <location line="+9"/>
- <source>Warning</source>
- <translation>警告</translation>
+ <location line="-29"/>
+ <source>Client will be shutdown, do you want to proceed?</source>
+ <translation>客戶端軟體就è¦é—œæŽ‰äº†ï¼Œç¹¼çºŒåšä¸‹åŽ»å—Ž?</translation>
</message>
<message>
- <location line="-9"/>
- <location line="+9"/>
- <source>This setting will take effect after restarting Bitcoin.</source>
- <translation>這個設定在é‡å•“ä½å…ƒå¹£è»Ÿé«”後æ‰æœƒç”Ÿæ•ˆã€‚</translation>
+ <location line="+33"/>
+ <source>This change would require a client restart.</source>
+ <translation>這項改變需è¦é‡æ–°å•Ÿå‹•å®¢æˆ¶ç«¯è»Ÿé«”。</translation>
</message>
<message>
- <location line="+29"/>
+ <location line="+34"/>
<source>The supplied proxy address is invalid.</source>
<translation>æ供的代ç†ä¼ºæœå™¨ä½å€ç„¡æ•ˆã€‚</translation>
</message>
@@ -1449,24 +1485,24 @@ Address: %4
</message>
<message>
<location line="+50"/>
- <location line="+214"/>
+ <location line="+231"/>
<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>
+ <translation>顯示的資訊å¯èƒ½æ˜¯éŽæœŸçš„。跟ä½å…ƒå¹£ç¶²è·¯çš„連線建立後,你的錢包會自動和網路åŒæ­¥ï¼Œä½†æ˜¯é€™å€‹æ­¥é©Ÿé‚„沒完æˆã€‚</translation>
</message>
<message>
- <location line="-140"/>
+ <location line="-155"/>
<source>Unconfirmed:</source>
- <translation>未確èªé‡‘é¡:</translation>
+ <translation>未確定金é¡:</translation>
</message>
<message>
- <location line="-81"/>
+ <location line="-83"/>
<source>Wallet</source>
<translation>錢包</translation>
</message>
<message>
- <location line="+49"/>
+ <location line="+51"/>
<source>Confirmed:</source>
- <translation>已確èªé‡‘é¡:</translation>
+ <translation>已確定金é¡:</translation>
</message>
<message>
<location line="+16"/>
@@ -1476,17 +1512,17 @@ Address: %4
<message>
<location line="+32"/>
<source>Total of transactions that have yet to be confirmed, and do not yet count toward the spendable balance</source>
- <translation>還沒確èªçš„交易的總金é¡ï¼Œå¯ç”¨é¤˜é¡ä¸åŒ…å«æ­¤é‡‘é¡</translation>
+ <translation>還沒確定的交易的總金é¡ï¼Œå¯ç”¨é¤˜é¡ä¸åŒ…å«é€™äº›é‡‘é¡</translation>
</message>
<message>
<location line="+16"/>
<source>Immature:</source>
- <translation>未熟æˆé‡‘é¡:</translation>
+ <translation>未æˆç†Ÿé‡‘é¡:</translation>
</message>
<message>
<location line="+13"/>
<source>Mined balance that has not yet matured</source>
- <translation>還沒熟æˆçš„開採金é¡</translation>
+ <translation>é‚„æ²’æˆç†Ÿçš„開採金é¡</translation>
</message>
<message>
<location line="+16"/>
@@ -1499,7 +1535,7 @@ Address: %4
<translation>ç›®å‰å…¨éƒ¨é¤˜é¡</translation>
</message>
<message>
- <location line="+56"/>
+ <location line="+71"/>
<source>&lt;b&gt;Recent transactions&lt;/b&gt;</source>
<translation>&lt;b&gt;最近交易&lt;/b&gt;</translation>
</message>
@@ -1507,42 +1543,71 @@ Address: %4
<location filename="../overviewpage.cpp" line="+120"/>
<location line="+1"/>
<source>out of sync</source>
- <translation>æ²’åŒæ­¥</translation>
+ <translation>é‚„æ²’åŒæ­¥</translation>
</message>
</context>
<context>
<name>PaymentServer</name>
<message>
- <location filename="../paymentserver.cpp" line="+397"/>
+ <location filename="../paymentserver.cpp" line="+403"/>
+ <location line="+13"/>
<source>URI handling</source>
<translation>URI 處ç†</translation>
</message>
<message>
<location line="+1"/>
<source>URI can not be parsed! This can be caused by an invalid Bitcoin address or malformed URI parameters.</source>
- <translation>ç„¡æ³•è§£æž URI ï¼é€™å¯èƒ½ä»£è¡¨ä½å…ƒå¹£ä½å€ç„¡æ•ˆæˆ– URI åƒæ•¸ç•°å¸¸ã€‚</translation>
+ <translation>æ²’è¾¦æ³•è§£æž URI ä½å€ï¼å¯èƒ½æ˜¯å› ç‚ºä½å…ƒå¹£ä½å€ç„¡æ•ˆï¼Œæˆ–是 URI åƒæ•¸æ ¼å¼éŒ¯èª¤ã€‚</translation>
</message>
<message>
- <location line="+91"/>
+ <location line="+96"/>
<source>Requested payment amount of %1 is too small (considered dust).</source>
- <translation>è«‹æ±‚ä»˜æ¬¾çš„é‡‘é¡ %1 太少 (會被網路èªç‚ºæ˜¯æ²’å¿…è¦çš„零散錢)。</translation>
+ <translation>è¦æ±‚ä»˜æ¬¾çš„é‡‘é¡ %1 太少(會被網路èªç‚ºæ˜¯æ²’å¿…è¦çš„零散錢)。</translation>
</message>
<message>
- <location line="-204"/>
- <location line="+195"/>
+ <location line="-221"/>
+ <location line="+212"/>
<location line="+13"/>
+ <location line="+95"/>
+ <location line="+18"/>
+ <location line="+16"/>
<source>Payment request error</source>
- <translation>發出付款請求時發生錯誤</translation>
+ <translation>è¦æ±‚付款時發生錯誤</translation>
</message>
<message>
- <location line="-207"/>
+ <location line="-353"/>
<source>Cannot start bitcoin: click-to-pay handler</source>
- <translation>無法啟動 bitcoin 隨按隨付處ç†å™¨</translation>
+ <translation>沒辦法啟動 bitcoin å”議的按就付處ç†å™¨</translation>
+ </message>
+ <message>
+ <location line="+58"/>
+ <source>Net manager warning</source>
+ <translation>網路管ç†å“¡è­¦å‘Š</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Your active proxy doesn&apos;t support SOCKS5, which is required for payment requests via proxy.</source>
+ <translation>ç›®å‰ä½¿ç”¨ä¸­çš„代ç†ä¼ºæœå™¨ä¸æ”¯æ´ SOCKS5 通訊å”定,因此ä¸èƒ½é€éŽå®ƒä¾†è¦æ±‚付款。</translation>
+ </message>
+ <message>
+ <location line="+52"/>
+ <source>Payment request fetch URL is invalid: %1</source>
+ <translation>å–得付款è¦æ±‚çš„ URL 無效: %1</translation>
+ </message>
+ <message>
+ <location line="+27"/>
+ <source>Payment request file handling</source>
+ <translation>處ç†ä»˜æ¬¾è¦æ±‚檔案</translation>
</message>
<message>
- <location line="+195"/>
+ <location line="+1"/>
+ <source>Payment request file can not be read or processed! This can be caused by an invalid payment request file.</source>
+ <translation>沒辦法讀或處ç†ä»˜æ¬¾è¦æ±‚檔案ï¼å¯èƒ½æ˜¯ç„¡æ•ˆçš„檔案造æˆçš„。</translation>
+ </message>
+ <message>
+ <location line="+73"/>
<source>Unverified payment requests to custom payment scripts are unsupported.</source>
- <translation>ä¸æ”¯æ´å«æœ‰è‡ªè¨‚付款指令碼的未驗證付款請求。</translation>
+ <translation>ä¸æ”¯æ´å«æœ‰è‡ªè¨‚付款指令碼,且沒驗證éŽçš„付款è¦æ±‚。</translation>
</message>
<message>
<location line="+59"/>
@@ -1550,43 +1615,46 @@ Address: %4
<translation>來自 %1 的退款</translation>
</message>
<message>
- <location line="+42"/>
+ <location line="+43"/>
<source>Error communicating with %1: %2</source>
- <translation>與 %1 交談時發生錯誤: %2</translation>
+ <translation>跟 %1 通訊時發生錯誤: %2</translation>
</message>
<message>
- <location line="+28"/>
+ <location line="+24"/>
+ <source>Payment request can not be parsed or processed!</source>
+ <translation>沒辦法解æžæˆ–處ç†ä»˜æ¬¾è¦æ±‚ï¼</translation>
+ </message>
+ <message>
+ <location line="+11"/>
<source>Bad response from server %1</source>
<translation>伺æœå™¨ %1 的回應有誤</translation>
</message>
<message>
- <location line="+32"/>
+ <location line="+33"/>
<source>Payment acknowledged</source>
<translation>已確èªä»˜æ¬¾</translation>
</message>
<message>
- <location line="-55"/>
- <location line="+27"/>
- <location line="+17"/>
+ <location line="-11"/>
<source>Network request error</source>
- <translation>發出請求時發生網路錯誤</translation>
+ <translation>發出è¦æ±‚時發生網路錯誤</translation>
</message>
</context>
<context>
<name>QObject</name>
<message>
- <location filename="../bitcoin.cpp" line="+119"/>
- <location line="+5"/>
+ <location filename="../bitcoin.cpp" line="+71"/>
+ <location line="+11"/>
<source>Bitcoin</source>
<translation>ä½å…ƒå¹£</translation>
</message>
<message>
- <location line="-4"/>
+ <location line="+1"/>
<source>Error: Specified data directory &quot;%1&quot; does not exist.</source>
- <translation>錯誤: ä¸å­˜åœ¨æŒ‡å®šçš„資料目錄 &quot;%1&quot;.</translation>
+ <translation>錯誤: 沒有指定的資料目錄 &quot;%1&quot;.</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="-12"/>
<source>Error: Invalid combination of -regtest and -testnet.</source>
<translation>錯誤: -regtest å’Œ -testnet 的使用組åˆç„¡æ•ˆã€‚</translation>
</message>
@@ -1611,7 +1679,7 @@ Address: %4
<message>
<location line="+0"/>
<source>PNG Image (*.png)</source>
- <translation>PNG 圖檔 (*.png)</translation>
+ <translation>PNG 圖檔(*.png)</translation>
</message>
</context>
<context>
@@ -1628,15 +1696,16 @@ Address: %4
<location line="+23"/>
<location line="+23"/>
<location line="+36"/>
- <location line="+53"/>
+ <location line="+23"/>
+ <location line="+36"/>
<location line="+23"/>
<location line="+23"/>
- <location filename="../rpcconsole.cpp" line="+360"/>
+ <location filename="../rpcconsole.cpp" line="+359"/>
<source>N/A</source>
- <translation>ç„¡</translation>
+ <translation>未知</translation>
</message>
<message>
- <location line="-217"/>
+ <location line="-223"/>
<source>Client version</source>
<translation>客戶端軟體版本</translation>
</message>
@@ -1651,7 +1720,12 @@ Address: %4
<translation>除錯視窗</translation>
</message>
<message>
- <location line="+78"/>
+ <location line="+25"/>
+ <source>General</source>
+ <translation>普通</translation>
+ </message>
+ <message>
+ <location line="+53"/>
<source>Using OpenSSL version</source>
<translation>使用的 OpenSSL 版本</translation>
</message>
@@ -1667,16 +1741,16 @@ Address: %4
</message>
<message>
<location line="+7"/>
- <source>Number of connections</source>
- <translation>連線數</translation>
+ <source>Name</source>
+ <translation>å稱</translation>
</message>
<message>
<location line="+23"/>
- <source>On testnet</source>
- <translation>ä½æ–¼æ¸¬è©¦ç¶²è·¯</translation>
+ <source>Number of connections</source>
+ <translation>連線數</translation>
</message>
<message>
- <location line="+23"/>
+ <location line="+29"/>
<source>Block chain</source>
<translation>å€å¡Šéˆ</translation>
</message>
@@ -1701,16 +1775,6 @@ Address: %4
<translation>é–‹å•“</translation>
</message>
<message>
- <location line="+16"/>
- <source>Command-line options</source>
- <translation>命令列é¸é …</translation>
- </message>
- <message>
- <location line="+10"/>
- <source>&amp;Show</source>
- <translation>顯示</translation>
- </message>
- <message>
<location line="+24"/>
<source>&amp;Console</source>
<translation>主控å°</translation>
@@ -1741,29 +1805,19 @@ Address: %4
<translation>輸出:</translation>
</message>
<message>
- <location line="-541"/>
+ <location line="-521"/>
<source>Build date</source>
<translation>建置日期</translation>
</message>
<message>
- <location line="-79"/>
- <source>Bitcoin Core</source>
- <translation>ä½å…ƒå¹£æ ¸å¿ƒ</translation>
- </message>
- <message>
- <location line="+279"/>
+ <location line="+206"/>
<source>Debug log file</source>
<translation>除錯紀錄檔</translation>
</message>
<message>
<location line="+7"/>
<source>Open the Bitcoin debug log file from the current data directory. This can take a few seconds for large log files.</source>
- <translation>從目å‰çš„資料目錄下開啓ä½å…ƒå¹£è»Ÿé«”的除錯紀錄檔。當紀錄檔很大時å¯èƒ½è¦èŠ±å¥½å¹¾ç§’的時間。</translation>
- </message>
- <message>
- <location line="+26"/>
- <source>Show the Bitcoin-Core help message to get a list with possible Bitcoin command-line options.</source>
- <translation>顯示ä½å…ƒå¹£æ ¸å¿ƒçš„求助訊æ¯ï¼Œä¾†å–å¾—å¯ç”¨çš„命令列é¸é …列表。</translation>
+ <translation>從目å‰çš„資料目錄下開啓ä½å…ƒå¹£è»Ÿé«”的除錯紀錄檔。當紀錄檔很大時,å¯èƒ½æœƒèŠ±å¥½å¹¾ç§’的時間。</translation>
</message>
<message>
<location line="+76"/>
@@ -1786,7 +1840,7 @@ Address: %4
<translation>請打 &lt;b&gt;help&lt;/b&gt; 來看å¯ç”¨æŒ‡ä»¤çš„簡介。</translation>
</message>
<message>
- <location line="+128"/>
+ <location line="+122"/>
<source>%1 B</source>
<translation>%1 B (ä½å…ƒçµ„)</translation>
</message>
@@ -1829,12 +1883,7 @@ Address: %4
<translation>金é¡:</translation>
</message>
<message>
- <location line="+19"/>
- <source>The amount to request</source>
- <translation>請求金é¡</translation>
- </message>
- <message>
- <location line="-32"/>
+ <location line="-13"/>
<source>&amp;Label:</source>
<translation>標記:</translation>
</message>
@@ -1844,14 +1893,9 @@ Address: %4
<translation>訊æ¯:</translation>
</message>
<message>
- <location line="+20"/>
- <source>The message to attach to payment request</source>
- <translation>è¦é™„加到付款請求中的訊æ¯</translation>
- </message>
- <message>
- <location line="-37"/>
+ <location line="-17"/>
<source>Reuse one of the previously used receiving addresses. Reusing addresses has security and privacy issues. Do not use this unless re-generating a payment request made before.</source>
- <translation>é‡è¤‡ä½¿ç”¨å…ˆå‰ä½¿ç”¨éŽçš„收款ä½å€ã€‚é‡è¤‡ä½¿ç”¨ä½å€å°‡æœƒæœ‰å®‰å…¨èˆ‡éš±ç§æ–¹é¢çš„疑慮。除éžæ˜¯è¦é‡æ–°ç”¢ç”Ÿå…ˆå‰çš„付款請求,å¦å‰‡è«‹ä¸è¦ä½¿ç”¨ã€‚</translation>
+ <translation>é‡è¤‡ä½¿ç”¨å…ˆå‰ä½¿ç”¨éŽçš„收款ä½å€ã€‚é‡è¤‡ä½¿ç”¨ä½å€æœƒæœ‰å®‰å…¨å’Œéš±ç§æ–¹é¢çš„å•é¡Œã€‚除éžæ˜¯è¦é‡æ–°ç”¢ç”Ÿå…ˆå‰çš„付款è¦æ±‚,ä¸ç„¶è«‹ä¸è¦ä½¿ç”¨ã€‚</translation>
</message>
<message>
<location line="+3"/>
@@ -1860,16 +1904,26 @@ Address: %4
</message>
<message>
<location line="+27"/>
- <source>The label to associate with the new receiving address</source>
- <translation>跟新收款ä½å€é—œè¯çš„標記</translation>
+ <source>An optional label to associate with the new receiving address</source>
+ <translation>跟新收款ä½å€é—œè¯çš„標記,å¯ä»¥ä¸å¡«</translation>
</message>
<message>
- <location line="+14"/>
- <source>Use this form to request payments. All fields are optional.</source>
- <translation>請使用這份表單來發出付款請求。所有的欄ä½éƒ½ä¸æ˜¯å¿…填。</translation>
+ <location line="+7"/>
+ <source>An optional message to attach to the payment request, which will be displayed when the request is opened. Note: The message will not be sent with the payment over the Bitcoin network.</source>
+ <translation>附加在付款è¦æ±‚中的訊æ¯ï¼Œå¯ä»¥ä¸å¡«ï¼Œæ‰“é–‹è¦æ±‚內容時會顯示。注æ„: 這個訊æ¯ä¸æœƒéš¨è‘—付款é€åˆ°ä½å…ƒå¹£ç¶²è·¯ä¸Šã€‚</translation>
</message>
<message>
- <location line="+56"/>
+ <location line="+7"/>
+ <source>Use this form to request payments. All fields are &lt;b&gt;optional&lt;/b&gt;.</source>
+ <translation>請用這份表單來è¦æ±‚付款。所有欄ä½éƒ½&lt;b&gt;å¯ä»¥ä¸å¡«&lt;/b&gt;。</translation>
+ </message>
+ <message>
+ <location line="+39"/>
+ <source>An optional amount to request. Leave this empty or zero to not request a specific amount.</source>
+ <translation>è¦æ±‚付款的金é¡ï¼Œå¯ä»¥ä¸å¡«ã€‚ä¸ç¢ºå®šé‡‘é¡æ™‚å¯ä»¥ç•™ç™½æˆ–是填零。</translation>
+ </message>
+ <message>
+ <location line="+17"/>
<source>Clear all fields of the form.</source>
<translation>清除表單中的所有欄ä½ã€‚</translation>
</message>
@@ -1881,17 +1935,17 @@ Address: %4
<message>
<location line="+36"/>
<source>&amp;Request payment</source>
- <translation>付款請求</translation>
+ <translation>è¦æ±‚付款</translation>
</message>
<message>
<location line="+47"/>
- <source>Previously requested payments</source>
- <translation>之å‰å·²è«‹æ±‚éŽçš„付款</translation>
+ <source>Requested payments</source>
+ <translation>å…ˆå‰è¦æ±‚的付款</translation>
</message>
<message>
- <location line="+12"/>
+ <location line="+16"/>
<source>Show the selected request (does the same as double clicking an entry)</source>
- <translation>顯示é¸æ“‡çš„請求內容(效果跟按它兩下一樣)</translation>
+ <translation>顯示é¸æ“‡çš„è¦æ±‚內容(效果跟按它兩下一樣)</translation>
</message>
<message>
<location line="+3"/>
@@ -1901,7 +1955,7 @@ Address: %4
<message>
<location line="+11"/>
<source>Remove the selected entries from the list</source>
- <translation>從列表中刪掉所é¸æ“‡çš„é …ç›®</translation>
+ <translation>從列表中刪掉é¸æ“‡çš„é …ç›®</translation>
</message>
<message>
<location line="+3"/>
@@ -1934,7 +1988,7 @@ Address: %4
<message>
<location filename="../receiverequestdialog.cpp" line="+56"/>
<source>Request payment to %1</source>
- <translation>è¦ %1 付款的請求</translation>
+ <translation>付款給 %1 çš„è¦æ±‚</translation>
</message>
<message>
<location line="+6"/>
@@ -1974,13 +2028,13 @@ Address: %4
<message>
<location line="+5"/>
<source>Error encoding URI into QR Code.</source>
- <translation>å°‡ URI ç·¨ç¢¼æˆ QR Code 錯誤。</translation>
+ <translation>把 URI ç·¨ç¢¼æˆ QR Code 時發生錯誤。</translation>
</message>
</context>
<context>
<name>RecentRequestsTableModel</name>
<message>
- <location filename="../recentrequeststablemodel.cpp" line="+14"/>
+ <location filename="../recentrequeststablemodel.cpp" line="+24"/>
<source>Date</source>
<translation>日期</translation>
</message>
@@ -2000,7 +2054,7 @@ Address: %4
<translation>金é¡</translation>
</message>
<message>
- <location line="+36"/>
+ <location line="+38"/>
<source>(no label)</source>
<translation>(無標記)</translation>
</message>
@@ -2015,7 +2069,7 @@ Address: %4
<message>
<location filename="../forms/sendcoinsdialog.ui" line="+14"/>
<location filename="../sendcoinsdialog.cpp" line="+381"/>
- <location line="+81"/>
+ <location line="+80"/>
<source>Send Coins</source>
<translation>付款</translation>
</message>
@@ -2042,7 +2096,7 @@ Address: %4
<message>
<location line="+89"/>
<source>Quantity:</source>
- <translation>數é‡:</translation>
+ <translation>數目:</translation>
</message>
<message>
<location line="+35"/>
@@ -2067,7 +2121,7 @@ Address: %4
<message>
<location line="+32"/>
<source>Low Output:</source>
- <translation>å°é‡‘é¡è¼¸å‡º:</translation>
+ <translation>低輸出:</translation>
</message>
<message>
<location line="+48"/>
@@ -2077,12 +2131,12 @@ Address: %4
<message>
<location line="+32"/>
<source>Change:</source>
- <translation>找零:</translation>
+ <translation>找零金é¡:</translation>
</message>
<message>
<location line="+44"/>
<source>If this is activated, but the change address is empty or invalid, change will be sent to a newly generated address.</source>
- <translation>如果這項有打開,但是找零ä½å€æ˜¯ç©ºçš„或無效,則找零的錢會é€åˆ°ä¸€å€‹æ–°ç”¢ç”Ÿçš„ä½å€åŽ»ã€‚</translation>
+ <translation>如果這項有打開,但是找零ä½å€æ˜¯ç©ºçš„或無效,那麼找零的錢會é€åˆ°ä¸€å€‹æ–°ç”¢ç”Ÿçš„ä½å€åŽ»ã€‚</translation>
</message>
<message>
<location line="+3"/>
@@ -2097,7 +2151,7 @@ Address: %4
<message>
<location line="+3"/>
<source>Add &amp;Recipient</source>
- <translation>加收款人</translation>
+ <translation>增加收款人</translation>
</message>
<message>
<location line="+20"/>
@@ -2125,7 +2179,7 @@ Address: %4
<translation>付款</translation>
</message>
<message>
- <location filename="../sendcoinsdialog.cpp" line="-229"/>
+ <location filename="../sendcoinsdialog.cpp" line="-228"/>
<source>Confirm send coins</source>
<translation>確èªä»˜æ¬¾é‡‘é¡</translation>
</message>
@@ -2135,17 +2189,17 @@ Address: %4
<location line="+5"/>
<location line="+4"/>
<source>%1 to %2</source>
- <translation>%1 到 %2</translation>
+ <translation>%1 給 %2</translation>
</message>
<message>
<location line="-136"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>請輸入ä½å…ƒå¹£ä½å€ (åƒæ˜¯: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ <translation>請輸入ä½å…ƒå¹£ä½å€(åƒæ˜¯ 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
<location line="+15"/>
<source>Copy quantity</source>
- <translation>複製數é‡</translation>
+ <translation>複製數目</translation>
</message>
<message>
<location line="+1"/>
@@ -2175,12 +2229,12 @@ Address: %4
<message>
<location line="+1"/>
<source>Copy low output</source>
- <translation>複製å°é‡‘é¡è¼¸å‡º</translation>
+ <translation>複製低輸出</translation>
</message>
<message>
<location line="+1"/>
<source>Copy change</source>
- <translation>複製找零</translation>
+ <translation>複製找零金é¡</translation>
</message>
<message>
<location line="+170"/>
@@ -2200,7 +2254,7 @@ Address: %4
<message>
<location line="+3"/>
<source>The amount to pay must be larger than 0.</source>
- <translation>付款金é¡éœ€å¤§æ–¼é›¶ã€‚</translation>
+ <translation>付款金é¡å¿…須大於零。</translation>
</message>
<message>
<location line="+3"/>
@@ -2220,30 +2274,30 @@ Address: %4
<message>
<location line="+3"/>
<source>Transaction creation failed!</source>
- <translation>交易產生失敗ï¼</translation>
+ <translation>製造交易失敗了ï¼</translation>
</message>
<message>
<location line="+4"/>
<source>The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
- <translation>交易被拒絕了ï¼æœ‰æ™‚候會發生這種錯誤,是因為你錢包中的一些錢已經被花掉了。比如說你複製了錢包檔 wallet.dat, 然後用複製的錢包花掉了錢,你ç¾åœ¨æ‰€ç”¨çš„原來的錢包中,å»æ²’有該筆錢已經沒有了的紀錄。</translation>
+ <translation>交易被拒絕了ï¼æœ‰æ™‚候會發生這種錯誤,是因為你錢包中的一些錢已經被花掉了。比如說你複製了錢包檔 wallet.dat, 然後用複製的錢包花掉了錢,你ç¾åœ¨æ‰€ç”¨çš„原來的錢包中,å»æ²’有那筆錢已經花掉的紀錄。</translation>
</message>
<message>
- <location line="+113"/>
+ <location line="+112"/>
<source>Warning: Invalid Bitcoin address</source>
<translation>警告: ä½å…ƒå¹£ä½å€ç„¡æ•ˆ</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+21"/>
<source>(no label)</source>
<translation>(無標記)</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="-11"/>
<source>Warning: Unknown change address</source>
<translation>警告: ä¸æ˜Žçš„找零ä½å€</translation>
</message>
<message>
- <location line="-378"/>
+ <location line="-366"/>
<source>Are you sure you want to send?</source>
<translation>你確定è¦ä»˜éŒ¢å‡ºåŽ»å—Žï¼Ÿ</translation>
</message>
@@ -2255,7 +2309,7 @@ Address: %4
<message>
<location line="+170"/>
<source>Payment request expired</source>
- <translation>付款的請求已經éŽæœŸ</translation>
+ <translation>付款的è¦æ±‚已經éŽæœŸ</translation>
</message>
<message>
<location line="+8"/>
@@ -2267,25 +2321,25 @@ Address: %4
<name>SendCoinsEntry</name>
<message>
<location filename="../forms/sendcoinsentry.ui" line="+131"/>
- <location line="+501"/>
+ <location line="+521"/>
<location line="+536"/>
<source>A&amp;mount:</source>
<translation>金é¡:</translation>
</message>
<message>
- <location line="-1132"/>
+ <location line="-1152"/>
<source>Pay &amp;To:</source>
<translation>付給:</translation>
</message>
<message>
<location line="+18"/>
<source>The address to send the payment to (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>付款的目標ä½å€ (åƒæ˜¯: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ <translation>付款的目標ä½å€(åƒæ˜¯ 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
<location filename="../sendcoinsentry.cpp" line="+30"/>
<source>Enter a label for this address to add it to your address book</source>
- <translation>請輸入該ä½å€çš„標記來把它加入到ä½å€ç°¿ä¸­</translation>
+ <translation>請輸入這個ä½å€çš„標記來把它加進ä½å€ç°¿ä¸­</translation>
</message>
<message>
<location filename="../forms/sendcoinsentry.ui" line="+57"/>
@@ -2319,25 +2373,35 @@ Address: %4
</message>
<message>
<location line="+7"/>
- <location line="+504"/>
+ <location line="+524"/>
<location line="+536"/>
<source>Remove this entry</source>
<translation>刪掉這個項目</translation>
</message>
<message>
- <location line="-40"/>
+ <location line="-1008"/>
+ <source>Message:</source>
+ <translation>訊æ¯:</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>A message that was attached to the Bitcoin URI which will be stored with the transaction for your reference. Note: This message will not be sent over the Bitcoin network.</source>
+ <translation>附加在ä½å…ƒå¹£ä»˜æ¬¾å”è­° URI 中的訊æ¯ï¼Œæœƒå’Œäº¤æ˜“內容一起存起來,給你自己åšåƒè€ƒï¼Œæ³¨æ„: 這個訊æ¯ä¸æœƒé€åˆ°ä½å…ƒå¹£ç¶²è·¯ä¸Šã€‚</translation>
+ </message>
+ <message>
+ <location line="+958"/>
<source>This is a verified payment request.</source>
- <translation>這是已驗證的付款請求</translation>
+ <translation>這是個已驗證的付款è¦æ±‚。</translation>
</message>
<message>
- <location line="-971"/>
+ <location line="-991"/>
<source>Enter a label for this address to add it to the list of used addresses</source>
- <translation>請輸入該ä½å€çš„標記,來把它加進去已使用éŽä½å€çš„清單。</translation>
+ <translation>請輸入這個ä½å€çš„標記,來把它加進去已使用éŽä½å€çš„清單。</translation>
</message>
<message>
- <location line="+439"/>
+ <location line="+459"/>
<source>This is an unverified payment request.</source>
- <translation>這是個還沒驗證的付款請求。</translation>
+ <translation>這是個沒驗證éŽçš„付款è¦æ±‚。</translation>
</message>
<message>
<location line="+18"/>
@@ -2354,7 +2418,20 @@ Address: %4
<message>
<location filename="../sendcoinsentry.cpp" line="+1"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>請輸入ä½å…ƒå¹£ä½å€ (åƒæ˜¯: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ <translation>請輸入ä½å…ƒå¹£ä½å€(åƒæ˜¯ 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ </message>
+</context>
+<context>
+ <name>ShutdownWindow</name>
+ <message>
+ <location filename="../utilitydialog.cpp" line="+48"/>
+ <source>Bitcoin Core is shutting down...</source>
+ <translation>ä½å…ƒå¹£æ ¸å¿ƒæ­£åœ¨é—œé–‰ä¸­...</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Do not shut down the computer until this window disappears.</source>
+ <translation> 在這個視窗ä¸è¦‹ä»¥å‰ï¼Œè«‹ä¸è¦é—œæŽ‰é›»è…¦ã€‚</translation>
</message>
</context>
<context>
@@ -2365,19 +2442,19 @@ Address: %4
<translation>簽章 - 簽署或驗證訊æ¯</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+10"/>
<source>&amp;Sign Message</source>
- <translation>訊æ¯ç°½ç½²</translation>
+ <translation>簽署訊æ¯</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>ä½ å¯ä»¥ç”¨è‡ªå·±çš„ä½å€ä¾†å°è¨Šæ¯åšç°½ç½²ï¼Œä»¥è­‰æ˜Žä½ å°ä½å€çš„所有權。但是請å°å¿ƒï¼Œä¸è¦ç°½ç½²èªžæ„å«ç³Šä¸æ¸…的內容,因為釣魚å¼è©é¨™å¯èƒ½æœƒç”¨é¨™ä½ ç°½ç½²çš„手法來冒充是你。åªæœ‰åœ¨èªžå¥ä¸­çš„細節你都åŒæ„時æ‰ç°½ç½²ã€‚</translation>
+ <translation>ä½ å¯ä»¥ç”¨è‡ªå·±çš„ä½å€ç°½ç½²è¨Šæ¯ï¼Œä¾†è­‰æ˜Žä½ å°ä½å€çš„所有權。但是請å°å¿ƒï¼Œä¸è¦ç°½ç½²èªžæ„å«ç³Šä¸æ¸…的內容,因為釣魚å¼è©é¨™å¯èƒ½æœƒç”¨é¨™ä½ ç°½ç½²çš„手法來冒充是你。åªæœ‰åœ¨èªžå¥ä¸­çš„細節你都åŒæ„時æ‰ç°½ç½²ã€‚</translation>
</message>
<message>
<location line="+18"/>
<source>The address to sign the message with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>用來簽署訊æ¯çš„ä½å€ (åƒæ˜¯: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ <translation>用來簽署訊æ¯çš„ä½å€(åƒæ˜¯ 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
<location line="+10"/>
@@ -2419,12 +2496,12 @@ Address: %4
<message>
<location line="+21"/>
<source>Sign the message to prove you own this Bitcoin address</source>
- <translation>簽署訊æ¯æ˜¯ç”¨ä¾†è­‰æ˜Žé€™å€‹ä½å…ƒå¹£ä½å€æ˜¯ä½ çš„</translation>
+ <translation>簽署這個訊æ¯ä¾†è­‰æ˜Žé€™å€‹ä½å…ƒå¹£ä½å€æ˜¯ä½ çš„</translation>
</message>
<message>
<location line="+3"/>
<source>Sign &amp;Message</source>
- <translation>訊æ¯ç°½ç½²</translation>
+ <translation>簽署訊æ¯</translation>
</message>
<message>
<location line="+14"/>
@@ -2440,27 +2517,27 @@ Address: %4
<message>
<location line="-87"/>
<source>&amp;Verify Message</source>
- <translation>訊æ¯é©—è­‰</translation>
+ <translation>驗證訊æ¯</translation>
</message>
<message>
<location line="+6"/>
<source>Enter the signing address, message (ensure you copy line breaks, spaces, tabs, etc. exactly) and signature below to verify the message. Be careful not to read more into the signature than what is in the signed message itself, to avoid being tricked by a man-in-the-middle attack.</source>
- <translation>請在下é¢è¼¸å…¥ç°½ç½²çš„ä½å€ï¼Œè¨Šæ¯(請確èªå®Œæ•´è¤‡è£½äº†æ‰€åŒ…å«çš„æ›è¡Œï¼Œç©ºæ ¼ï¼Œè·³ä½ç¬¦è™Ÿç­‰ç­‰),以åŠç°½ç« ï¼Œä¾†é©—證該訊æ¯ã€‚è«‹å°å¿ƒï¼Œé™¤äº†è¨Šæ¯å…§å®¹å¤–,ä¸è¦å°ç°½ç« æœ¬èº«éŽåº¦è§£è®€ï¼Œä»¥é¿å…被用&quot;中間人攻擊法&quot;è©é¨™ã€‚</translation>
+ <translation>請在下é¢è¼¸å…¥ç°½ç½²çš„ä½å€ï¼Œè¨Šæ¯(請確定完整複製了所包å«çš„æ›è¡Œï¼Œç©ºæ ¼ï¼Œè·³ä½ç¬¦è™Ÿç­‰ç­‰),以åŠç°½ç« ï¼Œä¾†é©—證這個訊æ¯ã€‚è«‹å°å¿ƒï¼Œé™¤äº†è¨Šæ¯å…§å®¹ä»¥å¤–,ä¸è¦å°ç°½ç« æœ¬èº«éŽåº¦è§£è®€ï¼Œä»¥é¿å…被用&quot;中間人攻擊法&quot;è©é¨™ã€‚</translation>
</message>
<message>
<location line="+21"/>
<source>The address the message was signed with (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>簽署該訊æ¯çš„ä½å€ (åƒæ˜¯: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ <translation>簽署這個訊æ¯çš„ä½å€(åƒæ˜¯ 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<message>
<location line="+40"/>
<source>Verify the message to ensure it was signed with the specified Bitcoin address</source>
- <translation>驗證訊æ¯æ˜¯ç”¨ä¾†ç¢ºèªè¨Šæ¯æ˜¯ç”¨æŒ‡å®šçš„ä½å…ƒå¹£ä½å€ç°½ç½²çš„</translation>
+ <translation>驗證這個訊æ¯ä¾†ç¢ºå®šæ˜¯ç”¨æŒ‡å®šçš„ä½å…ƒå¹£ä½å€ç°½ç½²çš„</translation>
</message>
<message>
<location line="+3"/>
<source>Verify &amp;Message</source>
- <translation>訊æ¯é©—è­‰</translation>
+ <translation>驗證訊æ¯</translation>
</message>
<message>
<location line="+14"/>
@@ -2471,12 +2548,12 @@ Address: %4
<location filename="../signverifymessagedialog.cpp" line="+29"/>
<location line="+3"/>
<source>Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</source>
- <translation>請輸入ä½å…ƒå¹£ä½å€ (åƒæ˜¯: 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
+ <translation>請輸入ä½å…ƒå¹£ä½å€(åƒæ˜¯ 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)</translation>
</message>
<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"/>
@@ -2511,7 +2588,7 @@ Address: %4
<message>
<location line="+8"/>
<source>Private key for the entered address is not available.</source>
- <translation>沒有所輸入ä½å€çš„密鑰。</translation>
+ <translation>沒有å°æ‡‰è¼¸å…¥ä½å€çš„密鑰。</translation>
</message>
<message>
<location line="+12"/>
@@ -2521,12 +2598,12 @@ Address: %4
<message>
<location line="+5"/>
<source>Message signed.</source>
- <translation>訊æ¯å·²ç°½ç½²ã€‚</translation>
+ <translation>訊æ¯ç°½ç½²å¥½äº†ã€‚</translation>
</message>
<message>
<location line="+59"/>
<source>The signature could not be decoded.</source>
- <translation>無法將這個簽章解碼。</translation>
+ <translation>沒辦法把這個簽章解碼。</translation>
</message>
<message>
<location line="+0"/>
@@ -2537,7 +2614,7 @@ Address: %4
<message>
<location line="+0"/>
<source>The signature did not match the message digest.</source>
- <translation>這個簽章與訊æ¯çš„數ä½æ‘˜è¦ä¸ç¬¦ã€‚</translation>
+ <translation>這個簽章跟訊æ¯çš„數ä½æ‘˜è¦ä¸ç¬¦ã€‚</translation>
</message>
<message>
<location line="+7"/>
@@ -2547,13 +2624,13 @@ Address: %4
<message>
<location line="+5"/>
<source>Message verified.</source>
- <translation>訊æ¯é©—證無誤。</translation>
+ <translation>訊æ¯é©—證沒錯。</translation>
</message>
</context>
<context>
<name>SplashScreen</name>
<message>
- <location filename="../splashscreen.cpp" line="+26"/>
+ <location filename="../splashscreen.cpp" line="+28"/>
<source>Bitcoin Core</source>
<translation>ä½å…ƒå¹£æ ¸å¿ƒ</translation>
</message>
@@ -2581,7 +2658,7 @@ Address: %4
<message>
<location filename="../transactiondesc.cpp" line="+28"/>
<source>Open until %1</source>
- <translation>在 %1 å‰æœªå®š</translation>
+ <translation>è¦åˆ° %1 æ‰ç¢ºå®š</translation>
</message>
<message>
<location line="+6"/>
@@ -2591,7 +2668,7 @@ Address: %4
<message>
<location line="+2"/>
<source>%1/unconfirmed</source>
- <translation>%1/未確èª</translation>
+ <translation>%1/未確定</translation>
</message>
<message>
<location line="+2"/>
@@ -2621,7 +2698,7 @@ Address: %4
<message>
<location line="+0"/>
<source>Generated</source>
- <translation>生產出</translation>
+ <translation>生產出來</translation>
</message>
<message>
<location line="+5"/>
@@ -2652,14 +2729,14 @@ Address: %4
<location line="+12"/>
<location line="+45"/>
<location line="+17"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Credit</source>
<translation>入帳</translation>
</message>
<message numerus="yes">
- <location line="-120"/>
+ <location line="-125"/>
<source>matures in %n more block(s)</source>
- <translation><numerusform>將在 %n 個å€å¡Šç”¢å‡ºå¾Œç†Ÿæˆ</numerusform></translation>
+ <translation><numerusform>å†ç­‰ %n 個å€å¡Šç”Ÿå‡ºä¾†å¾Œæˆç†Ÿ</numerusform></translation>
</message>
<message>
<location line="+2"/>
@@ -2670,12 +2747,12 @@ Address: %4
<location line="+44"/>
<location line="+8"/>
<location line="+15"/>
- <location line="+48"/>
+ <location line="+53"/>
<source>Debit</source>
<translation>出帳</translation>
</message>
<message>
- <location line="-57"/>
+ <location line="-62"/>
<source>Transaction fee</source>
<translation>交易手續費</translation>
</message>
@@ -2686,11 +2763,12 @@ Address: %4
</message>
<message>
<location line="+6"/>
+ <location line="+9"/>
<source>Message</source>
<translation>訊æ¯</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="-7"/>
<source>Comment</source>
<translation>附註</translation>
</message>
@@ -2700,14 +2778,14 @@ Address: %4
<translation>交易識別碼</translation>
</message>
<message>
- <location line="+13"/>
+ <location line="+18"/>
<source>Merchant</source>
<translation>商家</translation>
</message>
<message>
<location line="+7"/>
<source>Generated coins must mature %1 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>生產出來的錢è¦å†ç­‰ %1 個å€å¡Šç”¢å‡ºå¾Œæ‰ç†Ÿæˆï¼Œæ‰å¯ä»¥èŠ±ç”¨ã€‚當你產出å€å¡Šæ™‚,它會被公告到網路上,以被串連到å€å¡Šéˆã€‚如果串連失敗了,它的狀態就會變æˆ&quot;ä¸è¢«æŽ¥å—&quot;,且ä¸èƒ½å¤ èŠ±ç”¨ã€‚當你產出å€å¡Šçš„幾秒é˜å…§ï¼Œä¹Ÿæœ‰å…¶ä»–節點產出å€å¡Šçš„話,有時候就會發生這種情形。</translation>
+ <translation>生產出來的錢è¦å†ç­‰ %1 個å€å¡Šç”Ÿå‡ºä¾†å¾Œæ‰æˆç†Ÿå¯ä»¥ç”¨ã€‚當你生產出å€å¡Šæ™‚會公告到網路上,來被串連到å€å¡Šéˆã€‚如果串連失敗了,狀態就會變æˆ&quot;ä¸è¢«æŽ¥å—&quot;,而且ä¸èƒ½å¤ èŠ±ã€‚如果在你生產出å€å¡Šçš„幾秒é˜å…§ï¼Œä¹Ÿæœ‰å…¶ä»–節點生產出來的話,有時候就會發生這種情形。</translation>
</message>
<message>
<location line="+8"/>
@@ -2740,14 +2818,14 @@ Address: %4
<translation>å¦</translation>
</message>
<message>
- <location line="-227"/>
+ <location line="-232"/>
<source>, has not been successfully broadcast yet</source>
<translation>,還沒æˆåŠŸå…¬å‘Šå‡ºåŽ»</translation>
</message>
<message numerus="yes">
<location line="-35"/>
<source>Open for %n more block(s)</source>
- <translation><numerusform>在接下來 %n 個å€å¡Šç”¢å‡ºå‰æœªå®š</numerusform></translation>
+ <translation><numerusform>å†ç­‰ %n 個å€å¡Šç”Ÿå‡ºä¾†å¾Œæ‰ç¢ºå®š</numerusform></translation>
</message>
<message>
<location line="+70"/>
@@ -2765,7 +2843,7 @@ Address: %4
<message>
<location line="+6"/>
<source>This pane shows a detailed description of the transaction</source>
- <translation>此版é¢é¡¯ç¤ºè©²æ¬¡äº¤æ˜“的詳細說明</translation>
+ <translation>這個版é¢é¡¯ç¤ºé€™æ¬¡äº¤æ˜“的詳細說明</translation>
</message>
</context>
<context>
@@ -2790,50 +2868,51 @@ Address: %4
<source>Amount</source>
<translation>金é¡</translation>
</message>
+ <message>
+ <location line="+59"/>
+ <source>Immature (%1 confirmations, will be available after %2)</source>
+ <translation>未æˆç†Ÿ(%1 次確èªï¼Œæœƒåœ¨ %2 次確èªå¾Œå¯ç”¨)</translation>
+ </message>
<message numerus="yes">
- <location line="+57"/>
+ <location line="+16"/>
<source>Open for %n more block(s)</source>
- <translation><numerusform>在接下來 %n 個å€å¡Šç”¢å‡ºå‰æœªå®š</numerusform></translation>
+ <translation><numerusform>å†ç­‰ %n 個å€å¡Šç”Ÿå‡ºä¾†å¾Œæ‰ç¢ºå®š</numerusform></translation>
</message>
<message>
<location line="+3"/>
<source>Open until %1</source>
- <translation>在 %1 å‰æœªå®š</translation>
+ <translation>è¦åˆ° %1 æ‰ç¢ºå®š</translation>
</message>
<message>
<location line="+3"/>
<source>Offline (%1 confirmations)</source>
- <translation>離線中 (%1 次確èª)</translation>
+ <translation>離線中(%1 次確èª)</translation>
</message>
<message>
<location line="+3"/>
<source>Unconfirmed (%1 of %2 confirmations)</source>
- <translation>æœªç¢ºèª (%1 次確èªï¼Œæ‡‰ %2 次)</translation>
+ <translation>未確定(%1 次確èªï¼Œæ‡‰ %2 次)</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="-22"/>
+ <location line="+25"/>
<source>Confirmed (%1 confirmations)</source>
- <translation>å·²ç¢ºèª (%1 次確èª)</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>開採金é¡å°‡åœ¨ %n 個å€å¡Šç”¢å‡ºå¾Œç†Ÿæˆè€Œå¯ä½¿ç”¨</numerusform></translation>
+ <translation>已確定(%1 次確èª)</translation>
</message>
<message>
- <location line="+5"/>
+ <location line="-22"/>
<source>This block was not received by any other nodes and will probably not be accepted!</source>
<translation>沒有其他節點收到這個å€å¡Šï¼Œä¹Ÿè¨±å®ƒä¸æœƒè¢«æŽ¥å—ï¼</translation>
</message>
<message>
<location line="+3"/>
<source>Generated but not accepted</source>
- <translation>已生產出但ä¸è¢«æŽ¥å—</translation>
+ <translation>生產出來但是ä¸è¢«æŽ¥å—</translation>
</message>
<message>
- <location line="+43"/>
+ <location line="+62"/>
<source>Received with</source>
- <translation>收款於</translation>
+ <translation>收款在</translation>
</message>
<message>
<location line="+2"/>
@@ -2863,12 +2942,12 @@ 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"/>
@@ -2878,7 +2957,7 @@ Address: %4
<message>
<location line="+2"/>
<source>Destination address of transaction.</source>
- <translation>交易的目標ä½å€.</translation>
+ <translation>交易的目的地ä½å€ã€‚</translation>
</message>
<message>
<location line="+2"/>
@@ -3017,12 +3096,12 @@ Address: %4
<message>
<location line="-22"/>
<source>Comma separated file (*.csv)</source>
- <translation>逗點分隔資料檔 (*.csv)</translation>
+ <translation>逗點分隔資料檔(*.csv)</translation>
</message>
<message>
<location line="+9"/>
<source>Confirmed</source>
- <translation>已確èª</translation>
+ <translation>已確定</translation>
</message>
<message>
<location line="+1"/>
@@ -3091,17 +3170,17 @@ Address: %4
<message>
<location line="+1"/>
<source>Export the data in the current tab to a file</source>
- <translation>將目å‰åˆ†é çš„資料匯出存æˆæª”案</translation>
+ <translation>把目å‰åˆ†é çš„資料匯出存æˆæª”案</translation>
</message>
<message>
<location line="+181"/>
<source>Backup Wallet</source>
- <translation>錢包備份</translation>
+ <translation>備份錢包</translation>
</message>
<message>
<location line="+1"/>
<source>Wallet Data (*.dat)</source>
- <translation>錢包資料檔 (*.dat)</translation>
+ <translation>錢包資料檔(*.dat)</translation>
</message>
<message>
<location line="+6"/>
@@ -3127,7 +3206,7 @@ Address: %4
<context>
<name>bitcoin-core</name>
<message>
- <location filename="../bitcoinstrings.cpp" line="+217"/>
+ <location filename="../bitcoinstrings.cpp" line="+221"/>
<source>Usage:</source>
<translation>用法:</translation>
</message>
@@ -3147,14 +3226,14 @@ Address: %4
<translation>é¸é …:</translation>
</message>
<message>
- <location line="+23"/>
+ <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="-1"/>
@@ -3164,22 +3243,22 @@ Address: %4
<message>
<location line="-9"/>
<source>Set database cache size in megabytes (default: 25)</source>
- <translation>設定資料庫快å–大å°æˆå¤šå°‘百è¬ä½å…ƒçµ„ (MBï¼›é è¨­å€¼: 25)</translation>
+ <translation>設定資料庫快å–大å°æˆå¤šå°‘百è¬ä½å…ƒçµ„(MBï¼›é è¨­å€¼: 25)</translation>
</message>
<message>
- <location line="-27"/>
+ <location line="-26"/>
<source>Listen for connections on &lt;port&gt; (default: 8333 or testnet: 18333)</source>
- <translation>在通訊埠 &lt;port&gt; è½å€™é€£ç·š (é è¨­å€¼: 8333, 或若是測試網路: 18333)</translation>
+ <translation>在通訊埠 &lt;port&gt; è½å€™é€£ç·š(é è¨­å€¼: 8333, 或若是測試網路: 18333)</translation>
</message>
<message>
<location line="+5"/>
<source>Maintain at most &lt;n&gt; connections to peers (default: 125)</source>
- <translation>維æŒé€£ç·šç¯€é»žæ•¸çš„上é™ç‚º &lt;n&gt; 個 (é è¨­å€¼: 125)</translation>
+ <translation>維æŒé€£ç·šç¯€é»žæ•¸çš„上é™ç‚º &lt;n&gt; 個(é è¨­å€¼: 125)</translation>
</message>
<message>
- <location line="-50"/>
+ <location line="-51"/>
<source>Connect to a node to retrieve peer addresses, and disconnect</source>
- <translation>連線到æŸå€‹ç¯€é»žä»¥å–得其它節點的ä½å€ï¼Œç„¶å¾Œæ–·ç·š</translation>
+ <translation>連線到æŸå€‹ç¯€é»žä¾†å–得其它節點的ä½å€ï¼Œç„¶å¾Œæ–·ç·š</translation>
</message>
<message>
<location line="+84"/>
@@ -3187,35 +3266,35 @@ Address: %4
<translation>指定自己的公開ä½å€</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Threshold for disconnecting misbehaving peers (default: 100)</source>
- <translation>將異常節點斷線的臨界值 (é è¨­å€¼: 100)</translation>
+ <translation>把異常節點斷線的臨界值(é è¨­å€¼: 100)</translation>
</message>
<message>
- <location line="-147"/>
+ <location line="-148"/>
<source>Number of seconds to keep misbehaving peers from reconnecting (default: 86400)</source>
- <translation>拒絕跟異常節點連線的秒數 (é è¨­å€¼: 86400)</translation>
+ <translation>拒絕跟異常節點連線的秒數(é è¨­å€¼: 86400)</translation>
</message>
<message>
- <location line="-33"/>
+ <location line="-36"/>
<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="+31"/>
+ <location line="+34"/>
<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>
+ <translation>在通訊埠 &lt;port&gt; è½å€™ JSON-RPC 連線(é è¨­å€¼: 8332, 或若是測試網路: 18332)</translation>
</message>
<message>
<location line="+45"/>
<source>Accept command line and JSON-RPC commands</source>
- <translation>接å—指令列與 JSON-RPC 指令
+ <translation>接å—指令列和 JSON-RPC 指令
</translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<source>Run in the background as a daemon and accept commands</source>
- <translation>以護éˆæ¨¡å¼åœ¨èƒŒå¾ŒåŸ·è¡Œä¸¦æŽ¥å—指令</translation>
+ <translation>用護éˆæ¨¡å¼åœ¨èƒŒå¾ŒåŸ·è¡Œä¸¦æŽ¥å—指令</translation>
</message>
<message>
<location line="+39"/>
@@ -3223,12 +3302,12 @@ Address: %4
<translation>使用測試網路</translation>
</message>
<message>
- <location line="-117"/>
+ <location line="-118"/>
<source>Accept connections from outside (default: 1 if no -proxy or -connect)</source>
- <translation>是å¦æŽ¥å—外來連線 (é è¨­å€¼: 當沒有 -proxy 或 -connect 時為 1)</translation>
+ <translation>是å¦æŽ¥å—外來連線(é è¨­å€¼: 當沒有 -proxy 或 -connect 時為 1)</translation>
</message>
<message>
- <location line="-92"/>
+ <location line="-95"/>
<source>%s, you must set a rpcpassword in the configuration file:
%s
It is recommended you use the following random password:
@@ -3247,7 +3326,7 @@ rpcuser=bitcoinrpc
rpcpassword=%s
(ä½ ä¸ç”¨è¨˜ä½é€™å€‹å¯†ç¢¼)
使用者å稱(rpcuser)和密碼(rpcpassword)ä¸å¯ä»¥ç›¸åŒï¼
-如果設定檔還ä¸å­˜åœ¨ï¼Œè«‹åœ¨æ–°å¢žæ™‚,設定檔案權é™æˆåªæœ‰ä¸»äººæ‰èƒ½è®€å–。
+如果還沒有這個設定檔,請在造出來的時候,設定檔案權é™æˆåªæœ‰ä¸»äººæ‰èƒ½è®€å–。
也建議你設定警示通知,發生å•é¡Œæ™‚ä½ æ‰æœƒè¢«é€šçŸ¥åˆ°ï¼›
比如說設定æˆ:
alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com</translation>
@@ -3265,12 +3344,12 @@ alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com</translat
<message>
<location line="+3"/>
<source>Bind to given address and always listen on it. Use [host]:port notation for IPv6</source>
- <translation>和指定的ä½å€ç¹«çµï¼Œä¸¦ç¸½æ˜¯åœ¨è©²ä½å€è½å€™é€£ç·š. IPv6 請用 &quot;[主機]:通訊埠&quot; 這種格å¼</translation>
+ <translation>和指定的ä½å€ç¹«çµï¼Œä¸¦ç¸½æ˜¯åœ¨æŒ‡å®šä½å€è½å€™é€£ç·šã€‚IPv6 請用 &quot;[主機]:通訊埠&quot; 這種格å¼</translation>
</message>
<message>
<location line="+3"/>
<source>Cannot obtain a lock on data directory %s. Bitcoin is probably already running.</source>
- <translation>無法鎖定 %s 這個資料目錄。也許ä½å…ƒå¹£è»Ÿé«”已經在執行了。</translation>
+ <translation>沒辦法鎖定 %s 這個資料目錄。也許ä½å…ƒå¹£è»Ÿé«”已經在執行了。</translation>
</message>
<message>
<location line="+3"/>
@@ -3279,8 +3358,13 @@ alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com</translat
</message>
<message>
<location line="+4"/>
+ <source>Enter regression test mode, which uses a special chain in which blocks can be solved instantly.</source>
+ <translation>進入回歸測試模å¼ï¼Œä½¿ç”¨å¯ä»¥ç«‹å³è§£å‡ºå€å¡Šçš„特殊å€å¡Šéˆã€‚</translation>
+ </message>
+ <message>
+ <location line="+3"/>
<source>Error: The transaction was rejected! This might happen if some of the coins in your wallet were already spent, such as if you used a copy of wallet.dat and coins were spent in the copy but not marked as spent here.</source>
- <translation>錯誤: 交易被拒絕了ï¼æœ‰æ™‚候會發生這種錯誤,是因為你錢包中的一些錢已經被花掉了。比如說你複製了錢包檔 wallet.dat, 然後用複製的錢包花掉了錢,你ç¾åœ¨æ‰€ç”¨çš„原來的錢包中å»æ²’有該筆交易紀錄。</translation>
+ <translation>錯誤: 交易被拒絕了ï¼æœ‰æ™‚候會發生這種錯誤,是因為你錢包中的一些錢已經被花掉了。比如說你複製了錢包檔 wallet.dat, 然後用複製的錢包花掉了錢,你ç¾åœ¨æ‰€ç”¨çš„原來的錢包中,å»æ²’有那筆錢已經花掉的紀錄。</translation>
</message>
<message>
<location line="+4"/>
@@ -3290,17 +3374,17 @@ alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com</translat
<message>
<location line="+6"/>
<source>Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)</source>
- <translation>當錢包有交易改變時è¦åŸ·è¡Œçš„指令 (指令中的 %s 會被å–代æˆäº¤æ˜“識別碼)</translation>
+ <translation>當錢包有交易改變時è¦åŸ·è¡Œçš„指令(指令中的 %s 會被å–代æˆäº¤æ˜“識別碼)</translation>
</message>
<message>
<location line="+18"/>
<source>This is a pre-release test build - use at your own risk - do not use for mining or merchant applications</source>
- <translation>這是個還沒發表的測試版本 - 使用請自負風險 - è«‹ä¸è¦ç”¨æ–¼é–‹æŽ¡æˆ–商業應用</translation>
+ <translation>這是個還沒發表的測試版本 - 使用請自負風險 - è«‹ä¸è¦ç”¨ä¾†é–‹æŽ¡æˆ–商業應用</translation>
</message>
<message>
<location line="+5"/>
<source>Use separate SOCKS5 proxy to reach peers via Tor hidden services (default: -proxy)</source>
- <translation>使用å¦å¤–çš„ SOCK5 代ç†ä¼ºæœå™¨ä¾†é€éŽ Tor éš±è—æœå‹™èˆ‡ç¯€é»žè¯ç¹« (é è¨­: åŒ -proxy)</translation>
+ <translation>使用å¦å¤–çš„ SOCK5 代ç†ä¼ºæœå™¨ï¼Œä¾†é€éŽ Tor éš±è—æœå‹™è·Ÿç¯€é»žè¯ç¹«(é è¨­å€¼: åŒ -proxy)</translation>
</message>
<message>
<location line="+3"/>
@@ -3310,7 +3394,7 @@ alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com</translat
<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>警告: 請檢查電腦時間與日期是å¦æ­£ç¢ºï¼ä½å…ƒå¹£è»Ÿé«”無法在時é˜ä¸æº–的情æ³ä¸‹æ­£å¸¸é‹ä½œã€‚</translation>
+ <translation>警告: 請檢查電腦日期和時間是å¦æ­£ç¢ºï¼ä½å…ƒå¹£è»Ÿé«”沒辦法在時é˜ä¸æº–的情æ³ä¸‹æ­£å¸¸é‹ä½œã€‚</translation>
</message>
<message>
<location line="+3"/>
@@ -3355,7 +3439,7 @@ alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com</translat
<message>
<location line="+1"/>
<source>Block creation options:</source>
- <translation>å€å¡Šç”¢ç”Ÿé¸é …:</translation>
+ <translation>å€å¡Šè£½é€ é¸é …:</translation>
</message>
<message>
<location line="+5"/>
@@ -3365,12 +3449,12 @@ alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com</translat
<message>
<location line="+1"/>
<source>Connect through SOCKS proxy</source>
- <translation>é€éŽ SOCKS 代ç†ä¼ºæœå™¨é€£ç·š</translation>
+ <translation>é€éŽ SOCKS 代ç†ä¼ºæœå™¨ä¾†é€£ç·š</translation>
</message>
<message>
<location line="+1"/>
<source>Connect to JSON-RPC on &lt;port&gt; (default: 8332 or testnet: 18332)</source>
- <translation>連線到埠號 &lt;port&gt; 上的 JSON-RPC 伺æœå™¨ (é è¨­å€¼: 8332,或若是測試網路: 18332)</translation>
+ <translation>連線到埠號 &lt;port&gt; 上的 JSON-RPC 伺æœå™¨(é è¨­å€¼: 8332,或若是測試網路: 18332)</translation>
</message>
<message>
<location line="+2"/>
@@ -3380,7 +3464,12 @@ alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com</translat
<message>
<location line="+1"/>
<source>Discover own IP address (default: 1 when listening and no -externalip)</source>
- <translation>找出自己的網際網路ä½å€ (é è¨­å€¼: 當有è½å€™é€£ç·šä¸”沒有 -externalip 時為 1)</translation>
+ <translation>找出自己的網際網路ä½å€(é è¨­å€¼: 當有è½å€™é€£ç·šä¸”沒有 -externalip 時為 1)</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Do not load the wallet and disable wallet RPC calls</source>
+ <translation>ä¸è¦è¼‰å…¥éŒ¢åŒ…,並且拿掉錢包相關的 RPC 功能呼å«ã€‚</translation>
</message>
<message>
<location line="+1"/>
@@ -3390,22 +3479,22 @@ alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com</translat
<message>
<location line="+2"/>
<source>Error initializing block database</source>
- <translation>åˆå§‹åŒ–å€å¡Šè³‡æ–™åº«å¤±æ•—</translation>
+ <translation>åˆå§‹åŒ–å€å¡Šè³‡æ–™åº«æ™‚發生錯誤</translation>
</message>
<message>
<location line="+1"/>
<source>Error initializing wallet database environment %s!</source>
- <translation>錢包資料庫環境 %s åˆå§‹åŒ–錯誤ï¼</translation>
+ <translation>åˆå§‹åŒ–錢包資料庫環境 %s 時發生錯誤ï¼</translation>
</message>
<message>
<location line="+1"/>
<source>Error loading block database</source>
- <translation>載入å€å¡Šè³‡æ–™åº«å¤±æ•—</translation>
+ <translation>載入å€å¡Šè³‡æ–™åº«æ™‚發生錯誤</translation>
</message>
<message>
<location line="+4"/>
<source>Error opening block database</source>
- <translation>打開å€å¡Šè³‡æ–™åº«æª”案失敗</translation>
+ <translation>打開å€å¡Šè³‡æ–™åº«æ™‚發生錯誤</translation>
</message>
<message>
<location line="+2"/>
@@ -3415,7 +3504,7 @@ alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com</translat
<message>
<location line="+1"/>
<source>Error: Wallet locked, unable to create transaction!</source>
- <translation>錯誤: 錢包被上鎖了,無法產生新的交易ï¼</translation>
+ <translation>錯誤: 錢包被上鎖了,沒辦法製造新的交易ï¼</translation>
</message>
<message>
<location line="+1"/>
@@ -3425,7 +3514,7 @@ alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com</translat
<message>
<location line="+1"/>
<source>Failed to listen on any port. Use -listen=0 if you want this.</source>
- <translation>在任æ„的通訊埠è½å€™å¤±æ•—。如果你想的話å¯ä»¥æ”¹ç”¨ -listen=0.</translation>
+ <translation>在任æ„的通訊埠è½å€™å¤±æ•—。如果你希望這樣的話,å¯ä»¥è¨­å®š -listen=0.</translation>
</message>
<message>
<location line="+1"/>
@@ -3445,37 +3534,37 @@ alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com</translat
<message>
<location line="+1"/>
<source>Failed to write block index</source>
- <translation>寫入å€å¡Šç´¢å¼•å¤±æ•—</translation>
+ <translation>把å€å¡Šç´¢å¼•å¯«é€²åŽ»å¤±æ•—了</translation>
</message>
<message>
<location line="+1"/>
<source>Failed to write block info</source>
- <translation>寫入å€å¡Šè³‡è¨Šå¤±æ•—</translation>
+ <translation>把å€å¡Šè³‡è¨Šå¯«é€²åŽ»å¤±æ•—了</translation>
</message>
<message>
<location line="+1"/>
<source>Failed to write block</source>
- <translation>寫入å€å¡Šå¤±æ•—</translation>
+ <translation>把å€å¡Šè³‡æ–™å¯«é€²åŽ»å¤±æ•—了</translation>
</message>
<message>
<location line="+1"/>
<source>Failed to write file info</source>
- <translation>寫入檔案資訊失敗</translation>
+ <translation>把檔案資訊寫進去失敗了</translation>
</message>
<message>
<location line="+1"/>
<source>Failed to write to coin database</source>
- <translation>寫入ä½å…ƒå¹£è³‡æ–™åº«å¤±æ•—</translation>
+ <translation>寫進錢幣資料庫失敗了</translation>
</message>
<message>
<location line="+1"/>
<source>Failed to write transaction index</source>
- <translation>寫入交易索引失敗</translation>
+ <translation>把交易索引寫進去失敗了</translation>
</message>
<message>
<location line="+1"/>
<source>Failed to write undo data</source>
- <translation>寫入回復資料失敗</translation>
+ <translation>把回復資料寫進去失敗了</translation>
</message>
<message>
<location line="+1"/>
@@ -3485,27 +3574,27 @@ alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com</translat
<message>
<location line="+1"/>
<source>Find peers using DNS lookup (default: 1 unless -connect)</source>
- <translation>是å¦å…許在找節點時使用域å查詢 (é è¨­å€¼: 當沒用 -connect 時為 1)</translation>
+ <translation>是å¦å…許在找節點時使用域å查詢(é è¨­å€¼: 當沒用 -connect 時為 1)</translation>
</message>
<message>
<location line="+1"/>
<source>Generate coins (default: 0)</source>
- <translation>生產ä½å…ƒå¹£ (é è¨­å€¼: 0)</translation>
+ <translation>生產ä½å…ƒå¹£(é è¨­å€¼: 0)</translation>
</message>
<message>
<location line="+2"/>
<source>How many blocks to check at startup (default: 288, 0 = all)</source>
- <translation>啓動時檢查的å€å¡Šæ•¸ (é è¨­å€¼: 288, 指定 0 表示全部)</translation>
+ <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>
+ <translation>å€å¡Šæª¢æŸ¥çš„仔細程度(0 到 4, é è¨­å€¼: 3)</translation>
</message>
<message>
<location line="+1"/>
<source>If &lt;category&gt; is not supplied, output all debugging information.</source>
- <translation>如果沒有æä¾› &lt;category&gt; 就輸出所有的除錯資訊。</translation>
+ <translation>如果沒有æä¾› &lt;category&gt; 就會輸出所有的除錯資訊。</translation>
</message>
<message>
<location line="+2"/>
@@ -3525,7 +3614,7 @@ alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com</translat
<message>
<location line="+5"/>
<source>Prepend debug output with timestamp (default: 1)</source>
- <translation>在除錯輸出內容å‰é™„加時間 (é è¨­å€¼: 1)</translation>
+ <translation>在除錯輸出內容å‰é™„加時間(é è¨­å€¼: 1)</translation>
</message>
<message>
<location line="+1"/>
@@ -3540,7 +3629,7 @@ alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com</translat
<message>
<location line="+5"/>
<source>Select SOCKS version for -proxy (4 or 5, default: 5)</source>
- <translation>é¸æ“‡ -proxy 指定代ç†ä¼ºæœå™¨çš„ SOCKS å”定版本 (4 或 5, é è¨­å€¼: 5)</translation>
+ <translation>é¸æ“‡ -proxy 指定代ç†ä¼ºæœå™¨çš„ SOCKS å”定版本(4 或 5, é è¨­å€¼: 5)</translation>
</message>
<message>
<location line="+1"/>
@@ -3548,14 +3637,14 @@ alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com</translat
<translation>傳é€æŒ‡ä»¤çµ¦ä½å…ƒå¹£ä¼ºæœå™¨</translation>
</message>
<message>
- <location line="+8"/>
+ <location line="+7"/>
<source>Set maximum block size in bytes (default: %d)</source>
- <translation>設定å€å¡Šå¤§å°ä¸Šé™æˆå¤šå°‘ä½å…ƒçµ„ (é è¨­å€¼: %d)</translation>
+ <translation>設定å€å¡Šå¤§å°ä¸Šé™æˆå¤šå°‘ä½å…ƒçµ„(é è¨­å€¼: %d)</translation>
</message>
<message>
<location line="+2"/>
<source>Set the number of threads to service RPC calls (default: 4)</source>
- <translation>è¨­å®šè™•ç† RPC æœå‹™è«‹æ±‚的執行緒數目 (é è¨­å€¼: 4)</translation>
+ <translation>è¨­å®šè™•ç† RPC æœå‹™è«‹æ±‚的執行緒數目(é è¨­å€¼: 4)</translation>
</message>
<message>
<location line="+7"/>
@@ -3568,9 +3657,14 @@ alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com</translat
<translation>å•Ÿå‹•ä½å…ƒå¹£ä¼ºæœå™¨</translation>
</message>
<message>
- <location line="+12"/>
+ <location line="+3"/>
+ <source>This is intended for regression testing tools and app development.</source>
+ <translation>這是設計用來給回歸測試工具和應用程å¼é–‹ç™¼ç”¨çš„。</translation>
+ </message>
+ <message>
+ <location line="+10"/>
<source>Usage (deprecated, use bitcoin-cli):</source>
- <translation>用法 (å·²éŽæ™‚,請改用 bitcoin-cli):</translation>
+ <translation>用法(å·²éŽæ™‚,請改用 bitcoin-cli):</translation>
</message>
<message>
<location line="+7"/>
@@ -3593,9 +3687,14 @@ alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com</translat
<translation>錢包檔 %s 沒有在資料目錄 %s 裡é¢</translation>
</message>
<message>
- <location line="+3"/>
+ <location line="+2"/>
+ <source>Wallet options:</source>
+ <translation>錢包é¸é …:</translation>
+ </message>
+ <message>
+ <location line="+2"/>
<source>Warning: Deprecated argument -debugnet ignored, use -debug=net</source>
- <translation>警告: åƒæ•¸ -debugnet 因為已經棄用了而被忽略,請改用 -debug=net</translation>
+ <translation>警告: åƒæ•¸ -debugnet 因為已經淘汰掉了而被忽略,請改用 -debug=net</translation>
</message>
<message>
<location line="+2"/>
@@ -3603,32 +3702,32 @@ alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com</translat
<translation>改變 -txindex åƒæ•¸å¾Œï¼Œå¿…é ˆè¦ç”¨ -reindex åƒæ•¸ä¾†é‡å»ºè³‡æ–™åº«</translation>
</message>
<message>
- <location line="-78"/>
+ <location line="-79"/>
<source>Imports blocks from external blk000??.dat file</source>
<translation>從其它來æºçš„ blk000??.dat 檔匯入å€å¡Š</translation>
</message>
<message>
- <location line="-104"/>
+ <location line="-105"/>
<source>Execute command when a relevant alert is received or we see a really long fork (%s in cmd is replaced by message)</source>
- <translation>當收到相關警示,或發ç¾ç›¸ç•¶é•·çš„分支時,所è¦åŸ·è¡Œçš„指令 (指令中的 %s 會被å–代æˆè­¦ç¤ºè¨Šæ¯)</translation>
+ <translation>當收到相關警示,或發ç¾ç›¸ç•¶é•·çš„分支時,所è¦åŸ·è¡Œçš„指令(指令中的 %s 會被å–代æˆè­¦ç¤ºè¨Šæ¯)</translation>
</message>
<message>
<location line="+14"/>
<source>Output debugging information (default: 0, supplying &lt;category&gt; is optional)</source>
- <translation>輸出除錯資訊 (é è¨­å€¼: 0, ä¸ä¸€å®šè¦æŒ‡å®š &lt;category&gt;)</translation>
+ <translation>輸出除錯資訊(é è¨­å€¼: 0, å¯ä»¥ä¸æŒ‡å®š &lt;category&gt;)</translation>
</message>
<message>
<location line="+2"/>
<source>Set maximum size of high-priority/low-fee transactions in bytes (default: %d)</source>
- <translation>設定高優先度或低手續費的交易資料大å°ä¸Šé™æˆå¤šå°‘ä½å…ƒçµ„ (é è¨­å€¼: %d)</translation>
+ <translation>設定高優先度或低手續費的交易資料大å°ä¸Šé™æˆå¤šå°‘ä½å…ƒçµ„(é è¨­å€¼: %d)</translation>
</message>
<message>
<location line="+2"/>
<source>Set the number of script verification threads (up to 16, 0 = auto, &lt;0 = leave that many cores free, default: 0)</source>
- <translation>設定指令碼驗證的執行緒數目 (最多為 16, 若為 0 表示程å¼è‡ªå‹•æ±ºå®šï¼Œå°æ–¼ 0 表示ä¿ç•™ä¸ç”¨çš„處ç†å™¨æ ¸å¿ƒæ•¸ç›®ï¼Œé è¨­å€¼: 0)</translation>
+ <translation>設定指令碼驗證的執行緒數目(最多為 16, 若為 0 表示程å¼è‡ªå‹•æ±ºå®šï¼Œå°æ–¼ 0 表示ä¿ç•™ä¸ç”¨çš„處ç†å™¨æ ¸å¿ƒæ•¸ç›®ï¼Œé è¨­å€¼: 0)</translation>
</message>
<message>
- <location line="+88"/>
+ <location line="+89"/>
<source>Information</source>
<translation>資訊</translation>
</message>
@@ -3645,27 +3744,27 @@ alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com</translat
<message>
<location line="+8"/>
<source>Maintain a full transaction index (default: 0)</source>
- <translation>維護全部交易的索引 (é è¨­å€¼: 0)</translation>
+ <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>
+ <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>æ¯å€‹é€£ç·šçš„傳é€ç·©è¡å€å¤§å°ä¸Šé™ç‚º &lt;n&gt;*1000 ä½å…ƒçµ„ (é è¨­å€¼: 1000)</translation>
+ <translation>æ¯å€‹é€£ç·šçš„傳é€ç·©è¡å€å¤§å°ä¸Šé™ç‚º &lt;n&gt;*1000 ä½å…ƒçµ„(é è¨­å€¼: 1000)</translation>
</message>
<message>
<location line="+2"/>
<source>Only accept block chain matching built-in checkpoints (default: 1)</source>
- <translation>åªæŽ¥å—與內建的檢查段點å»åˆçš„å€å¡Šéˆ (é è¨­å€¼: 1)</translation>
+ <translation>åªæŽ¥å—跟內建的檢查段點å»åˆçš„å€å¡Šéˆ(é è¨­å€¼: 1)</translation>
</message>
<message>
<location line="+1"/>
<source>Only connect to nodes in network &lt;net&gt; (IPv4, IPv6 or Tor)</source>
- <translation>åªå’Œ &lt;net&gt; 網路上的節點連線 (IPv4, IPv6, 或 Tor)</translation>
+ <translation>åªå’Œ &lt;net&gt; 網路上的節點連線(IPv4, IPv6, 或 Tor)</translation>
</message>
<message>
<location line="+9"/>
@@ -3678,19 +3777,14 @@ alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com</translat
<translation>在終端機顯示追蹤或除錯資訊,而ä¸æ˜¯å¯«åˆ°æª”案 debug.log 中</translation>
</message>
<message>
- <location line="+1"/>
- <source>Send trace/debug info to debugger</source>
- <translation>輸出追蹤或除錯資訊給除錯器</translation>
- </message>
- <message>
<location line="+6"/>
<source>Set minimum block size in bytes (default: 0)</source>
- <translation>設定å€å¡Šå¤§å°ä¸‹é™æˆå¤šå°‘ä½å…ƒçµ„ (é è¨­å€¼: 0)</translation>
+ <translation>設定å€å¡Šå¤§å°ä¸‹é™æˆå¤šå°‘ä½å…ƒçµ„(é è¨­å€¼: 0)</translation>
</message>
<message>
<location line="+2"/>
<source>Shrink debug.log file on client startup (default: 1 when no -debug)</source>
- <translation>客戶端軟體啓動時將 debug.log æª”ç¸®å° (é è¨­å€¼: 當沒有 -debug 時為 1)</translation>
+ <translation>客戶端軟體啓動時把 debug.log 檔縮å°(é è¨­å€¼: 當沒有 -debug 時為 1)</translation>
</message>
<message>
<location line="+1"/>
@@ -3700,7 +3794,7 @@ alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com</translat
<message>
<location line="+2"/>
<source>Specify connection timeout in milliseconds (default: 5000)</source>
- <translation>指定連線在幾毫秒後逾時 (é è¨­å€¼: 5000)</translation>
+ <translation>指定連線在幾毫秒後逾時(é è¨­å€¼: 5000)</translation>
</message>
<message>
<location line="+6"/>
@@ -3708,7 +3802,7 @@ alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com</translat
<translation>系統錯誤:</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Transaction amount too small</source>
<translation>交易金é¡å¤ªå°</translation>
</message>
@@ -3725,12 +3819,12 @@ alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com</translat
<message>
<location line="+8"/>
<source>Use UPnP to map the listening port (default: 0)</source>
- <translation>是å¦ä½¿ç”¨é€šç”¨å³æ’å³ç”¨(UPnP)å”定來設定è½å€™é€£ç·šçš„通訊埠的å°æ‡‰ (é è¨­å€¼: 0)</translation>
+ <translation>是å¦è¦ä½¿ç”¨é€šç”¨å³æ’å³ç”¨(UPnP)å”定,來設定è½å€™é€£ç·šçš„通訊埠的å°æ‡‰(é è¨­å€¼: 0)</translation>
</message>
<message>
<location line="+1"/>
<source>Use UPnP to map the listening port (default: 1 when listening)</source>
- <translation>是å¦ä½¿ç”¨é€šç”¨å³æ’å³ç”¨(UPnP)å”定來設定è½å€™é€£ç·šçš„通訊埠的å°æ‡‰ (é è¨­å€¼: 當有è½å€™é€£ç·šæ™‚為 1)</translation>
+ <translation>是å¦è¦ä½¿ç”¨é€šç”¨å³æ’å³ç”¨(UPnP)å”定,來設定è½å€™é€£ç·šçš„通訊埠的å°æ‡‰(é è¨­å€¼: 當有è½å€™é€£ç·šæ™‚為 1)</translation>
</message>
<message>
<location line="+2"/>
@@ -3738,7 +3832,7 @@ alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com</translat
<translation>JSON-RPC 連線使用者å稱</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Warning</source>
<translation>警告</translation>
</message>
@@ -3758,39 +3852,39 @@ alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com</translat
<translation>錢包檔 weallet.dat 壞掉了,拯救失敗</translation>
</message>
<message>
- <location line="-57"/>
+ <location line="-58"/>
<source>Password for JSON-RPC connections</source>
<translation>JSON-RPC 連線密碼</translation>
</message>
<message>
- <location line="-69"/>
+ <location line="-70"/>
<source>Allow JSON-RPC connections from specified IP address</source>
<translation>å…è¨±æŒ‡å®šçš„ä¾†æº IP ä½å€é€²è¡Œ JSON-RPC 連線</translation>
</message>
<message>
- <location line="+79"/>
+ <location line="+80"/>
<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="-131"/>
+ <location line="-132"/>
<source>Execute command when the best block changes (%s in cmd is replaced by block hash)</source>
- <translation>當最新å€å¡Šæ”¹è®Šæ™‚è¦åŸ·è¡Œçš„指令 (指令中的 %s 會被å–代æˆå€å¡Šé›œæ¹Šå€¼)</translation>
+ <translation>當最新å€å¡Šæ”¹è®Šæ™‚è¦åŸ·è¡Œçš„指令(指令中的 %s 會被å–代æˆå€å¡Šé›œæ¹Šå€¼)</translation>
</message>
<message>
- <location line="+160"/>
+ <location line="+161"/>
<source>Upgrade wallet to latest format</source>
- <translation>將錢包檔案å‡ç´šæˆæœ€æ–°æ ¼å¼</translation>
+ <translation>把錢包檔案å‡ç´šæˆæœ€æ–°çš„æ ¼å¼</translation>
</message>
<message>
- <location line="-23"/>
+ <location line="-24"/>
<source>Set key pool size to &lt;n&gt; (default: 100)</source>
<translation>設定密鑰池大å°æˆ &lt;n&gt; (é è¨­å€¼: 100)</translation>
</message>
<message>
- <location line="-12"/>
+ <location line="-11"/>
<source>Rescan the block chain for missing wallet transactions</source>
- <translation>é‡æ–°æŽƒæå€å¡Šéˆï¼Œä¾†å°‹æ‰¾éŒ¢åŒ…å¯èƒ½éºæ¼çš„交易。</translation>
+ <translation>é‡æ–°æŽƒæå€å¡Šéˆï¼Œä¾†å°‹æ‰¾éŒ¢åŒ…å¯èƒ½æ¼æŽ‰çš„交易。</translation>
</message>
<message>
<location line="+38"/>
@@ -3798,44 +3892,44 @@ alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com</translat
<translation>在 JSON-RPC 連線使用 OpenSSL (https)</translation>
</message>
<message>
- <location line="-29"/>
+ <location line="-30"/>
<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="+16"/>
<source>This help message</source>
- <translation>此說明訊æ¯</translation>
+ <translation>這些說明訊æ¯</translation>
</message>
<message>
- <location line="+6"/>
+ <location line="+7"/>
<source>Unable to bind to %s on this computer (bind returned error %d, %s)</source>
- <translation>無法和這å°é›»è…¦ä¸Šçš„ %s ç¹«çµ (繫çµå›žå‚³éŒ¯èª¤ %d, %s)</translation>
+ <translation>沒辦法和這å°é›»è…¦ä¸Šçš„ %s 繫çµ(回傳錯誤 %d, %s)</translation>
</message>
<message>
- <location line="-106"/>
+ <location line="-107"/>
<source>Allow DNS lookups for -addnode, -seednode and -connect</source>
<translation>å…è¨±å° -addnode, -seednode, -connect çš„åƒæ•¸ä½¿ç”¨åŸŸå查詢 </translation>
</message>
<message>
- <location line="+59"/>
+ <location line="+60"/>
<source>Loading addresses...</source>
<translation>正在載入ä½å€è³‡æ–™...</translation>
</message>
<message>
<location line="-37"/>
<source>Error loading wallet.dat: Wallet corrupted</source>
- <translation>載入檔案 wallet.dat 錯誤: 錢包æ毀了</translation>
+ <translation>載入檔案 wallet.dat 時發生錯誤: 錢包æ毀了</translation>
</message>
<message>
<location line="+1"/>
<source>Error loading wallet.dat: Wallet requires newer version of Bitcoin</source>
- <translation>載入 wallet.dat 檔案錯誤: 這個錢包需è¦æ–°ç‰ˆçš„ä½å…ƒå¹£è»Ÿé«”</translation>
+ <translation>載入 wallet.dat 檔案時發生錯誤: 這個錢包需è¦æ–°ç‰ˆçš„ä½å…ƒå¹£è»Ÿé«”</translation>
</message>
<message>
<location line="+98"/>
@@ -3845,7 +3939,7 @@ alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com</translat
<message>
<location line="-100"/>
<source>Error loading wallet.dat</source>
- <translation>載入錢包檔 wallet.dat 錯誤</translation>
+ <translation>載入錢包檔 wallet.dat 時發生錯誤</translation>
</message>
<message>
<location line="+31"/>
@@ -3863,17 +3957,17 @@ alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com</translat
<translation>在 -socks 指定了ä¸æ˜Žçš„代ç†å”定版本: %i</translation>
</message>
<message>
- <location line="-100"/>
+ <location line="-101"/>
<source>Cannot resolve -bind address: &apos;%s&apos;</source>
- <translation>ç„¡æ³•è§£æž -bind ä½å€: &apos;%s&apos;</translation>
+ <translation>æ²’è¾¦æ³•è§£æž -bind ä½å€: &apos;%s&apos;</translation>
</message>
<message>
<location line="+1"/>
<source>Cannot resolve -externalip address: &apos;%s&apos;</source>
- <translation>ç„¡æ³•è§£æž -externalip ä½å€: &apos;%s&apos;</translation>
+ <translation>æ²’è¾¦æ³•è§£æž -externalip ä½å€: &apos;%s&apos;</translation>
</message>
<message>
- <location line="+47"/>
+ <location line="+48"/>
<source>Invalid amount for -paytxfee=&lt;amount&gt;: &apos;%s&apos;</source>
<translation>設定 -paytxfee=&lt;金é¡&gt; 的金é¡ç„¡æ•ˆ: &apos;%s&apos;</translation>
</message>
@@ -3893,32 +3987,32 @@ alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com</translat
<translation>正在載入å€å¡Šç´¢å¼•...</translation>
</message>
<message>
- <location line="-61"/>
+ <location line="-62"/>
<source>Add a node to connect to and attempt to keep the connection open</source>
- <translation>加入一個è¦é€£ç·šçš„節線,並試著ä¿æŒå°å®ƒçš„連線暢通</translation>
+ <translation>增加一個è¦é€£ç·šçš„節線,並試著ä¿æŒå°å®ƒçš„連線暢通</translation>
</message>
<message>
<location line="-32"/>
<source>Unable to bind to %s on this computer. Bitcoin is probably already running.</source>
- <translation>無法和這å°é›»è…¦ä¸Šçš„ %s 繫çµã€‚也許ä½å…ƒå¹£è»Ÿé«”已經在執行了。</translation>
+ <translation>沒辦法和這å°é›»è…¦ä¸Šçš„ %s 繫çµã€‚也許ä½å…ƒå¹£è»Ÿé«”已經在執行了。</translation>
</message>
<message>
- <location line="+94"/>
+ <location line="+95"/>
<source>Loading wallet...</source>
<translation>正在載入錢包資料...</translation>
</message>
<message>
- <location line="-55"/>
+ <location line="-56"/>
<source>Cannot downgrade wallet</source>
- <translation>無法將錢包格å¼é™ç´š</translation>
+ <translation>沒辦法把錢包格å¼é™ç´š</translation>
</message>
<message>
<location line="+3"/>
<source>Cannot write default address</source>
- <translation>無法寫入é è¨­ä½å€</translation>
+ <translation>沒辦法把é è¨­ä½å€å¯«é€²åŽ»</translation>
</message>
<message>
- <location line="+66"/>
+ <location line="+67"/>
<source>Rescanning...</source>
<translation>正在é‡æ–°æŽƒæ...</translation>
</message>
@@ -3938,13 +4032,13 @@ alertnotify=echo %%s | mail -s &quot;Bitcoin Alert&quot; admin@foo.com</translat
<translation>錯誤</translation>
</message>
<message>
- <location line="-34"/>
+ <location line="-35"/>
<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>你必須在下列設定檔中設定 RPC 密碼 (rpcpassword=&lt;password&gt;):
+ <translation>你必須在以下設定檔中設定 RPC 密碼(rpcpassword=&lt;password&gt;):
%s
-如果這個檔案還ä¸å­˜åœ¨ï¼Œè«‹åœ¨æ–°å¢žæ™‚,設定檔案權é™æˆåªæœ‰ä¸»äººæ‰èƒ½è®€å–。</translation>
+如果還沒有這個檔案,請在造出來的時候,設定檔案權é™æˆåªæœ‰ä¸»äººæ‰èƒ½è®€å–。</translation>
</message>
</context>
</TS> \ No newline at end of file
diff --git a/src/qt/optionsdialog.cpp b/src/qt/optionsdialog.cpp
index d024e3b7aa..e31542961c 100644
--- a/src/qt/optionsdialog.cpp
+++ b/src/qt/optionsdialog.cpp
@@ -14,7 +14,9 @@
#include "monitoreddatamapper.h"
#include "optionsmodel.h"
+#include "main.h" // for CTransaction::nMinTxFee
#include "netbase.h"
+#include "txdb.h" // for -dbcache defaults
#include <QDir>
#include <QIntValidator>
@@ -33,7 +35,8 @@ OptionsDialog::OptionsDialog(QWidget *parent) :
GUIUtil::restoreWindowGeometry("nOptionsDialogWindow", this->size(), this);
/* Main elements init */
- ui->databaseCache->setMaximum(sizeof(void*) > 4 ? 4096 : 1024);
+ ui->databaseCache->setMinimum(nMinDbCache);
+ ui->databaseCache->setMaximum(nMaxDbCache);
/* Network elements init */
#ifndef USE_UPNP
@@ -53,7 +56,6 @@ OptionsDialog::OptionsDialog(QWidget *parent) :
connect(ui->connectSocks, SIGNAL(toggled(bool)), ui->proxyIp, SLOT(setEnabled(bool)));
connect(ui->connectSocks, SIGNAL(toggled(bool)), ui->proxyPort, SLOT(setEnabled(bool)));
connect(ui->connectSocks, SIGNAL(toggled(bool)), ui->socksVersion, SLOT(setEnabled(bool)));
- connect(ui->connectSocks, SIGNAL(clicked(bool)), this, SLOT(showRestartWarning_Proxy()));
ui->proxyIp->installEventFilter(this);
@@ -94,6 +96,7 @@ OptionsDialog::OptionsDialog(QWidget *parent) :
}
ui->unit->setModel(new BitcoinUnits(this));
+ ui->transactionFee->setSingleStep(CTransaction::nMinTxFee);
/* Widget-to-option mapper */
mapper = new MonitoredDataMapper(this);
@@ -149,11 +152,14 @@ void OptionsDialog::setModel(OptionsModel *model)
void OptionsDialog::setMapper()
{
/* Main */
- mapper->addMapping(ui->transactionFee, OptionsModel::Fee);
mapper->addMapping(ui->bitcoinAtStartup, OptionsModel::StartAtStartup);
mapper->addMapping(ui->threadsScriptVerif, OptionsModel::ThreadsScriptVerif);
mapper->addMapping(ui->databaseCache, OptionsModel::DatabaseCache);
+ /* Wallet */
+ mapper->addMapping(ui->transactionFee, OptionsModel::Fee);
+ mapper->addMapping(ui->spendZeroConfChange, OptionsModel::SpendZeroConfChange);
+
/* Network */
mapper->addMapping(ui->mapPortUpnp, OptionsModel::MapPortUPnP);
@@ -204,7 +210,7 @@ void OptionsDialog::on_resetButton_clicked()
if(btnRetVal == QMessageBox::Cancel)
return;
- /* reset all options and close Bitcoin-Qt */
+ /* reset all options and close GUI */
model->Reset();
QApplication::quit();
}
diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp
index 1133c457b3..3b83a5ff62 100644
--- a/src/qt/optionsmodel.cpp
+++ b/src/qt/optionsmodel.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2013 The Bitcoin developers
+// Copyright (c) 2011-2014 The Bitcoin developers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
@@ -14,11 +14,13 @@
#include "init.h"
#include "main.h"
#include "net.h"
+#include "txdb.h" // for -dbcache defaults
#ifdef ENABLE_WALLET
#include "wallet.h"
#include "walletdb.h"
#endif
+#include <QNetworkProxy>
#include <QSettings>
#include <QStringList>
@@ -72,10 +74,18 @@ void OptionsModel::Init()
#ifdef ENABLE_WALLET
if (!settings.contains("nTransactionFee"))
settings.setValue("nTransactionFee", 0);
+ nTransactionFee = settings.value("nTransactionFee").toLongLong(); // if -paytxfee is set, this will be overridden later in init.cpp
+ if (mapArgs.count("-paytxfee"))
+ strOverriddenByCommandLine += "-paytxfee ";
+
+ if (!settings.contains("bSpendZeroConfChange"))
+ settings.setValue("bSpendZeroConfChange", true);
+ if (!SoftSetBoolArg("-spendzeroconfchange", settings.value("bSpendZeroConfChange").toBool()))
+ strOverriddenByCommandLine += "-spendzeroconfchange ";
#endif
if (!settings.contains("nDatabaseCache"))
- settings.setValue("nDatabaseCache", 25);
+ settings.setValue("nDatabaseCache", (qint64)nDefaultDbCache);
if (!SoftSetArg("-dbcache", settings.value("nDatabaseCache").toString().toStdString()))
strOverriddenByCommandLine += "-dbcache ";
@@ -126,69 +136,6 @@ void OptionsModel::Reset()
// default setting for OptionsModel::StartAtStartup - disabled
if (GUIUtil::GetStartOnSystemStartup())
GUIUtil::SetStartOnSystemStartup(false);
-
- // Ensure Upgrade() is not running again by setting the bImportFinished flag
- settings.setValue("bImportFinished", true);
-}
-
-void OptionsModel::Upgrade()
-{
- QSettings settings;
-
- // Already upgraded
- if (settings.contains("bImportFinished"))
- return;
-
- settings.setValue("bImportFinished", true);
-
-#ifdef ENABLE_WALLET
- // Move settings from old wallet.dat (if any):
- CWalletDB walletdb(strWalletFile);
-
- QList<QString> intOptions;
- intOptions << "nDisplayUnit" << "nTransactionFee";
- foreach(QString key, intOptions)
- {
- int value = 0;
- if (walletdb.ReadSetting(key.toStdString(), value))
- {
- settings.setValue(key, value);
- walletdb.EraseSetting(key.toStdString());
- }
- }
- QList<QString> boolOptions;
- boolOptions << "bDisplayAddresses" << "fMinimizeToTray" << "fMinimizeOnClose" << "fUseProxy" << "fUseUPnP";
- foreach(QString key, boolOptions)
- {
- bool value = false;
- if (walletdb.ReadSetting(key.toStdString(), value))
- {
- settings.setValue(key, value);
- walletdb.EraseSetting(key.toStdString());
- }
- }
- try
- {
- CAddress addrProxyAddress;
- if (walletdb.ReadSetting("addrProxy", addrProxyAddress))
- {
- settings.setValue("addrProxy", addrProxyAddress.ToStringIPPort().c_str());
- walletdb.EraseSetting("addrProxy");
- }
- }
- catch (std::ios_base::failure &e)
- {
- // 0.6.0rc1 saved this as a CService, which causes failure when parsing as a CAddress
- CService addrProxy;
- if (walletdb.ReadSetting("addrProxy", addrProxy))
- {
- settings.setValue("addrProxy", addrProxy.ToStringIPPort().c_str());
- walletdb.EraseSetting("addrProxy");
- }
- }
-#endif
-
- Init();
}
int OptionsModel::rowCount(const QModelIndex & parent) const
@@ -243,6 +190,8 @@ QVariant OptionsModel::data(const QModelIndex & index, int role) const
// Todo: Consider to revert back to use just nTransactionFee here, if we don't want
// -paytxfee to update our QSettings!
return settings.value("nTransactionFee");
+ case SpendZeroConfChange:
+ return settings.value("bSpendZeroConfChange");
#endif
case DisplayUnit:
return nDisplayUnit;
@@ -333,6 +282,12 @@ bool OptionsModel::setData(const QModelIndex & index, const QVariant & value, in
settings.setValue("nTransactionFee", (qint64)nTransactionFee);
emit transactionFeeChanged(nTransactionFee);
break;
+ case SpendZeroConfChange:
+ if (settings.value("bSpendZeroConfChange") != value) {
+ settings.setValue("bSpendZeroConfChange", value);
+ setRestartRequired(true);
+ }
+ break;
#endif
case DisplayUnit:
nDisplayUnit = value.toInt();
@@ -375,14 +330,25 @@ bool OptionsModel::setData(const QModelIndex & index, const QVariant & value, in
return successful;
}
-bool OptionsModel::getProxySettings(QString& proxyIP, quint16 &proxyPort) const
+bool OptionsModel::getProxySettings(QNetworkProxy& proxy) const
{
- std::string proxy = GetArg("-proxy", "");
- if (proxy.empty()) return false;
+ // Directly query current base proxy, because
+ // GUI settings can be overridden with -proxy.
+ proxyType curProxy;
+ if (GetProxy(NET_IPV4, curProxy)) {
+ if (curProxy.second == 5) {
+ proxy.setType(QNetworkProxy::Socks5Proxy);
+ proxy.setHostName(QString::fromStdString(curProxy.first.ToStringIP()));
+ proxy.setPort(curProxy.first.GetPort());
+
+ return true;
+ }
+ else
+ return false;
+ }
+ else
+ proxy.setType(QNetworkProxy::NoProxy);
- CService addrProxy(proxy);
- proxyIP = QString(addrProxy.ToStringIP().c_str());
- proxyPort = addrProxy.GetPort();
return true;
}
diff --git a/src/qt/optionsmodel.h b/src/qt/optionsmodel.h
index d05cb46746..a3487ddd2e 100644
--- a/src/qt/optionsmodel.h
+++ b/src/qt/optionsmodel.h
@@ -7,6 +7,10 @@
#include <QAbstractListModel>
+QT_BEGIN_NAMESPACE
+class QNetworkProxy;
+QT_END_NAMESPACE
+
/** Interface from Qt to configuration data structure for Bitcoin client.
To Qt, the options are presented as a list with the different options
laid out vertically.
@@ -36,15 +40,13 @@ public:
CoinControlFeatures, // bool
ThreadsScriptVerif, // int
DatabaseCache, // int
+ SpendZeroConfChange, // bool
OptionIDRowCount,
};
void Init();
void Reset();
- /* Migrate settings from wallet.dat after app initialization */
- void Upgrade();
-
int rowCount(const QModelIndex & parent = QModelIndex()) const;
QVariant data(const QModelIndex & index, int role = Qt::DisplayRole) const;
bool setData(const QModelIndex & index, const QVariant & value, int role = Qt::EditRole);
@@ -54,7 +56,7 @@ public:
bool getMinimizeOnClose() { return fMinimizeOnClose; }
int getDisplayUnit() { return nDisplayUnit; }
bool getDisplayAddresses() { return bDisplayAddresses; }
- bool getProxySettings(QString& proxyIP, quint16 &proxyPort) const;
+ bool getProxySettings(QNetworkProxy& proxy) const;
bool getCoinControlFeatures() { return fCoinControlFeatures; }
const QString& getOverriddenByCommandLine() { return strOverriddenByCommandLine; }
diff --git a/src/qt/overviewpage.cpp b/src/qt/overviewpage.cpp
index 016097c5a0..1a9d1de571 100644
--- a/src/qt/overviewpage.cpp
+++ b/src/qt/overviewpage.cpp
@@ -175,6 +175,7 @@ void OverviewPage::setWalletModel(WalletModel *model)
filter->setLimit(NUM_ITEMS);
filter->setDynamicSortFilter(true);
filter->setSortRole(Qt::EditRole);
+ filter->setShowInactive(false);
filter->sort(TransactionTableModel::Status, Qt::DescendingOrder);
ui->listTransactions->setModel(filter);
diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp
index 7642cd117a..ca6ae17990 100644
--- a/src/qt/paymentserver.cpp
+++ b/src/qt/paymentserver.cpp
@@ -335,17 +335,22 @@ void PaymentServer::initNetManager()
// netManager is used to fetch paymentrequests given in bitcoin: URIs
netManager = new QNetworkAccessManager(this);
- // Use proxy settings from optionsModel
- QString proxyIP;
- quint16 proxyPort;
- if (optionsModel->getProxySettings(proxyIP, proxyPort))
- {
- QNetworkProxy proxy;
- proxy.setType(QNetworkProxy::Socks5Proxy);
- proxy.setHostName(proxyIP);
- proxy.setPort(proxyPort);
- netManager->setProxy(proxy);
+ QNetworkProxy proxy;
+
+ // Query active proxy (fails if no SOCKS5 proxy)
+ if (optionsModel->getProxySettings(proxy)) {
+ if (proxy.type() == QNetworkProxy::Socks5Proxy) {
+ netManager->setProxy(proxy);
+
+ qDebug() << "PaymentServer::initNetManager : Using SOCKS5 proxy" << proxy.hostName() << ":" << proxy.port();
+ }
+ else
+ qDebug() << "PaymentServer::initNetManager : No active proxy server found.";
}
+ else
+ emit message(tr("Net manager warning"),
+ tr("Your active proxy doesn't support SOCKS5, which is required for payment requests via proxy."),
+ CClientUIInterface::MSG_WARNING);
connect(netManager, SIGNAL(finished(QNetworkReply*)),
this, SLOT(netRequestFinished(QNetworkReply*)));
diff --git a/src/qt/paymentserver.h b/src/qt/paymentserver.h
index af19661bdd..d84d09c57d 100644
--- a/src/qt/paymentserver.h
+++ b/src/qt/paymentserver.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2013 The Bitcoin developers
+// Copyright (c) 2011-2014 The Bitcoin developers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
diff --git a/src/qt/qvalidatedlineedit.cpp b/src/qt/qvalidatedlineedit.cpp
index 1e7596c9c1..c2567835c9 100644
--- a/src/qt/qvalidatedlineedit.cpp
+++ b/src/qt/qvalidatedlineedit.cpp
@@ -4,10 +4,13 @@
#include "qvalidatedlineedit.h"
+#include "bitcoinaddressvalidator.h"
#include "guiconstants.h"
QValidatedLineEdit::QValidatedLineEdit(QWidget *parent) :
- QLineEdit(parent), valid(true)
+ QLineEdit(parent),
+ valid(true),
+ checkValidator(0)
{
connect(this, SIGNAL(textChanged(QString)), this, SLOT(markValid()));
}
@@ -34,11 +37,20 @@ void QValidatedLineEdit::focusInEvent(QFocusEvent *evt)
{
// Clear invalid flag on focus
setValid(true);
+
QLineEdit::focusInEvent(evt);
}
+void QValidatedLineEdit::focusOutEvent(QFocusEvent *evt)
+{
+ checkValidity();
+
+ QLineEdit::focusOutEvent(evt);
+}
+
void QValidatedLineEdit::markValid()
{
+ // As long as a user is typing ensure we display state as valid
setValid(true);
}
@@ -47,3 +59,49 @@ void QValidatedLineEdit::clear()
setValid(true);
QLineEdit::clear();
}
+
+void QValidatedLineEdit::setEnabled(bool enabled)
+{
+ if (!enabled)
+ {
+ // A disabled QValidatedLineEdit should be marked valid
+ setValid(true);
+ }
+ else
+ {
+ // Recheck validity when QValidatedLineEdit gets enabled
+ checkValidity();
+ }
+
+ QLineEdit::setEnabled(enabled);
+}
+
+void QValidatedLineEdit::checkValidity()
+{
+ if (text().isEmpty())
+ {
+ setValid(true);
+ }
+ else if (hasAcceptableInput())
+ {
+ setValid(true);
+
+ // Check contents on focus out
+ if (checkValidator)
+ {
+ QString address = text();
+ int pos = 0;
+ if (checkValidator->validate(address, pos) == QValidator::Acceptable)
+ setValid(true);
+ else
+ setValid(false);
+ }
+ }
+ else
+ setValid(false);
+}
+
+void QValidatedLineEdit::setCheckValidator(const QValidator *v)
+{
+ checkValidator = v;
+}
diff --git a/src/qt/qvalidatedlineedit.h b/src/qt/qvalidatedlineedit.h
index 53ef04e4a0..c2a4817e65 100644
--- a/src/qt/qvalidatedlineedit.h
+++ b/src/qt/qvalidatedlineedit.h
@@ -15,20 +15,25 @@ class QValidatedLineEdit : public QLineEdit
Q_OBJECT
public:
- explicit QValidatedLineEdit(QWidget *parent = 0);
+ explicit QValidatedLineEdit(QWidget *parent);
void clear();
+ void setCheckValidator(const QValidator *v);
protected:
void focusInEvent(QFocusEvent *evt);
+ void focusOutEvent(QFocusEvent *evt);
private:
bool valid;
+ const QValidator *checkValidator;
public slots:
void setValid(bool valid);
+ void setEnabled(bool enabled);
private slots:
void markValid();
+ void checkValidity();
};
#endif // QVALIDATEDLINEEDIT_H
diff --git a/src/qt/receivecoinsdialog.cpp b/src/qt/receivecoinsdialog.cpp
index 075a16dabf..7539645b47 100644
--- a/src/qt/receivecoinsdialog.cpp
+++ b/src/qt/receivecoinsdialog.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2013 The Bitcoin developers
+// Copyright (c) 2011-2014 The Bitcoin developers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
@@ -14,6 +14,8 @@
#include "addresstablemodel.h"
#include "recentrequeststablemodel.h"
+#include <QAction>
+#include <QCursor>
#include <QMessageBox>
#include <QTextDocument>
#include <QScrollBar>
@@ -31,6 +33,24 @@ ReceiveCoinsDialog::ReceiveCoinsDialog(QWidget *parent) :
ui->showRequestButton->setIcon(QIcon());
ui->removeRequestButton->setIcon(QIcon());
#endif
+
+ // context menu actions
+ QAction *copyLabelAction = new QAction(tr("Copy label"), this);
+ QAction *copyMessageAction = new QAction(tr("Copy message"), this);
+ QAction *copyAmountAction = new QAction(tr("Copy amount"), this);
+
+ // context menu
+ contextMenu = new QMenu();
+ contextMenu->addAction(copyLabelAction);
+ contextMenu->addAction(copyMessageAction);
+ contextMenu->addAction(copyAmountAction);
+
+ // context menu signals
+ connect(ui->recentRequestsView, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(showMenu(QPoint)));
+ connect(copyLabelAction, SIGNAL(triggered()), this, SLOT(copyLabel()));
+ connect(copyMessageAction, SIGNAL(triggered()), this, SLOT(copyMessage()));
+ connect(copyAmountAction, SIGNAL(triggered()), this, SLOT(copyAmount()));
+
connect(ui->clearButton, SIGNAL(clicked()), this, SLOT(clear()));
}
@@ -55,6 +75,8 @@ void ReceiveCoinsDialog::setModel(WalletModel *model)
ui->recentRequestsView->horizontalHeader()->setSectionResizeMode(RecentRequestsTableModel::Message, QHeaderView::Stretch);
#endif
ui->recentRequestsView->horizontalHeader()->resizeSection(RecentRequestsTableModel::Amount, 100);
+
+ model->getRecentRequestsTableModel()->sort(RecentRequestsTableModel::Date, Qt::DescendingOrder);
}
}
@@ -162,3 +184,61 @@ void ReceiveCoinsDialog::on_removeRequestButton_clicked()
QModelIndex firstIndex = selection.at(0);
model->getRecentRequestsTableModel()->removeRows(firstIndex.row(), selection.length(), firstIndex.parent());
}
+
+void ReceiveCoinsDialog::keyPressEvent(QKeyEvent *event)
+{
+ if (event->key() == Qt::Key_Return)
+ {
+ // press return -> submit form
+ if (ui->reqLabel->hasFocus() || ui->reqAmount->hasFocus() || ui->reqMessage->hasFocus())
+ {
+ event->ignore();
+ on_receiveButton_clicked();
+ return;
+ }
+ }
+
+ this->QDialog::keyPressEvent(event);
+}
+
+// copy column of selected row to clipboard
+void ReceiveCoinsDialog::copyColumnToClipboard(int column)
+{
+ if(!model || !model->getRecentRequestsTableModel() || !ui->recentRequestsView->selectionModel())
+ return;
+ QModelIndexList selection = ui->recentRequestsView->selectionModel()->selectedRows();
+ if(selection.empty())
+ return;
+ // correct for selection mode ContiguousSelection
+ QModelIndex firstIndex = selection.at(0);
+ GUIUtil::setClipboard(model->getRecentRequestsTableModel()->data(firstIndex.child(firstIndex.row(), column), Qt::EditRole).toString());
+}
+
+// context menu
+void ReceiveCoinsDialog::showMenu(const QPoint &point)
+{
+ if(!model || !model->getRecentRequestsTableModel() || !ui->recentRequestsView->selectionModel())
+ return;
+ QModelIndexList selection = ui->recentRequestsView->selectionModel()->selectedRows();
+ if(selection.empty())
+ return;
+ contextMenu->exec(QCursor::pos());
+}
+
+// context menu action: copy label
+void ReceiveCoinsDialog::copyLabel()
+{
+ copyColumnToClipboard(RecentRequestsTableModel::Label);
+}
+
+// context menu action: copy message
+void ReceiveCoinsDialog::copyMessage()
+{
+ copyColumnToClipboard(RecentRequestsTableModel::Message);
+}
+
+// context menu action: copy amount
+void ReceiveCoinsDialog::copyAmount()
+{
+ copyColumnToClipboard(RecentRequestsTableModel::Amount);
+}
diff --git a/src/qt/receivecoinsdialog.h b/src/qt/receivecoinsdialog.h
index ed4b04d361..12d2235782 100644
--- a/src/qt/receivecoinsdialog.h
+++ b/src/qt/receivecoinsdialog.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2013 The Bitcoin developers
+// Copyright (c) 2011-2014 The Bitcoin developers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
@@ -6,6 +6,9 @@
#define RECEIVECOINSDIALOG_H
#include <QDialog>
+#include <QKeyEvent>
+#include <QMenu>
+#include <QPoint>
#include <QVariant>
namespace Ui {
@@ -34,9 +37,14 @@ public slots:
void reject();
void accept();
+protected:
+ virtual void keyPressEvent(QKeyEvent *event);
+
private:
Ui::ReceiveCoinsDialog *ui;
WalletModel *model;
+ QMenu *contextMenu;
+ void copyColumnToClipboard(int column);
private slots:
void on_receiveButton_clicked();
@@ -44,6 +52,10 @@ private slots:
void on_removeRequestButton_clicked();
void on_recentRequestsView_doubleClicked(const QModelIndex &index);
void updateDisplayUnit();
+ void showMenu(const QPoint &);
+ void copyLabel();
+ void copyMessage();
+ void copyAmount();
};
#endif // RECEIVECOINSDIALOG_H
diff --git a/src/qt/recentrequeststablemodel.cpp b/src/qt/recentrequeststablemodel.cpp
index 86c29dd02b..844d62518c 100644
--- a/src/qt/recentrequeststablemodel.cpp
+++ b/src/qt/recentrequeststablemodel.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2013 The Bitcoin developers
+// Copyright (c) 2011-2014 The Bitcoin developers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
@@ -12,6 +12,13 @@ RecentRequestsTableModel::RecentRequestsTableModel(CWallet *wallet, WalletModel
walletModel(parent)
{
Q_UNUSED(wallet);
+ nReceiveRequestsMaxId = 0;
+
+ // Load entries from wallet
+ std::vector<std::string> vReceiveRequests;
+ parent->loadReceiveRequests(vReceiveRequests);
+ BOOST_FOREACH(const std::string& request, vReceiveRequests)
+ addNewRequest(request);
/* These columns must match the indices in the ColumnIndex enumeration */
columns << tr("Date") << tr("Label") << tr("Message") << tr("Amount");
@@ -68,7 +75,10 @@ QVariant RecentRequestsTableModel::data(const QModelIndex &index, int role) cons
return rec->recipient.message;
}
case Amount:
- return BitcoinUnits::format(walletModel->getOptionsModel()->getDisplayUnit(), rec->recipient.amount);
+ if (rec->recipient.amount == 0 && role == Qt::DisplayRole)
+ return tr("(no amount)");
+ else
+ return BitcoinUnits::format(walletModel->getOptionsModel()->getDisplayUnit(), rec->recipient.amount);
}
}
return QVariant();
@@ -104,6 +114,14 @@ bool RecentRequestsTableModel::removeRows(int row, int count, const QModelIndex
if(count > 0 && row >= 0 && (row+count) <= list.size())
{
+ const RecentRequestEntry *rec;
+ for (int i = 0; i < count; ++i)
+ {
+ rec = &list[row+i];
+ if (!walletModel->saveReceiveRequest(rec->recipient.address.toStdString(), rec->id, ""))
+ return false;
+ }
+
beginRemoveRows(parent, row, row + count - 1);
list.erase(list.begin() + row, list.begin() + row + count);
endRemoveRows();
@@ -118,12 +136,73 @@ Qt::ItemFlags RecentRequestsTableModel::flags(const QModelIndex &index) const
return Qt::ItemIsSelectable | Qt::ItemIsEnabled;
}
+// called when adding a request from the GUI
void RecentRequestsTableModel::addNewRequest(const SendCoinsRecipient &recipient)
{
RecentRequestEntry newEntry;
+ newEntry.id = ++nReceiveRequestsMaxId;
newEntry.date = QDateTime::currentDateTime();
newEntry.recipient = recipient;
+
+ CDataStream ss(SER_DISK, CLIENT_VERSION);
+ ss << newEntry;
+
+ if (!walletModel->saveReceiveRequest(recipient.address.toStdString(), newEntry.id, ss.str()))
+ return;
+
+ addNewRequest(newEntry);
+}
+
+// called from ctor when loading from wallet
+void RecentRequestsTableModel::addNewRequest(const std::string &recipient)
+{
+ std::vector<char> data(recipient.begin(), recipient.end());
+ CDataStream ss(data, SER_DISK, CLIENT_VERSION);
+
+ RecentRequestEntry entry;
+ ss >> entry;
+
+ if (entry.id == 0) // should not happen
+ return;
+
+ if (entry.id > nReceiveRequestsMaxId)
+ nReceiveRequestsMaxId = entry.id;
+
+ addNewRequest(entry);
+}
+
+// actually add to table in GUI
+void RecentRequestsTableModel::addNewRequest(RecentRequestEntry &recipient)
+{
beginInsertRows(QModelIndex(), 0, 0);
- list.prepend(newEntry);
+ list.prepend(recipient);
endInsertRows();
}
+
+void RecentRequestsTableModel::sort(int column, Qt::SortOrder order)
+{
+ qSort(list.begin(), list.end(), RecentRequestEntryLessThan(column, order));
+ emit dataChanged(index(0, 0, QModelIndex()), index(list.size() - 1, NUMBER_OF_COLUMNS - 1, QModelIndex()));
+}
+
+bool RecentRequestEntryLessThan::operator()(RecentRequestEntry &left, RecentRequestEntry &right) const
+{
+ RecentRequestEntry *pLeft = &left;
+ RecentRequestEntry *pRight = &right;
+ if (order == Qt::DescendingOrder)
+ std::swap(pLeft, pRight);
+
+ switch(column)
+ {
+ case RecentRequestsTableModel::Date:
+ return pLeft->date.toTime_t() < pRight->date.toTime_t();
+ case RecentRequestsTableModel::Label:
+ return pLeft->recipient.label < pRight->recipient.label;
+ case RecentRequestsTableModel::Message:
+ return pLeft->recipient.message < pRight->recipient.message;
+ case RecentRequestsTableModel::Amount:
+ return pLeft->recipient.amount < pRight->recipient.amount;
+ default:
+ return pLeft->id < pRight->id;
+ }
+}
diff --git a/src/qt/recentrequeststablemodel.h b/src/qt/recentrequeststablemodel.h
index 3aab7b0a48..d4cc5078aa 100644
--- a/src/qt/recentrequeststablemodel.h
+++ b/src/qt/recentrequeststablemodel.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2013 The Bitcoin developers
+// Copyright (c) 2011-2014 The Bitcoin developers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
@@ -13,13 +13,47 @@
class CWallet;
-struct RecentRequestEntry
+class RecentRequestEntry
{
+public:
+ RecentRequestEntry() : nVersion(RecentRequestEntry::CURRENT_VERSION), id(0) { }
+
+ static const int CURRENT_VERSION = 1;
+ int nVersion;
+ int64_t id;
QDateTime date;
SendCoinsRecipient recipient;
+
+ IMPLEMENT_SERIALIZE
+ (
+ RecentRequestEntry* pthis = const_cast<RecentRequestEntry*>(this);
+
+ unsigned int nDate = date.toTime_t();
+
+ READWRITE(pthis->nVersion);
+ nVersion = pthis->nVersion;
+ READWRITE(id);
+ READWRITE(nDate);
+ READWRITE(recipient);
+
+ if (fRead)
+ pthis->date = QDateTime::fromTime_t(nDate);
+ )
};
-/** Model for list of recently generated payment requests / bitcoin URIs.
+class RecentRequestEntryLessThan
+{
+public:
+ RecentRequestEntryLessThan(int nColumn, Qt::SortOrder fOrder):
+ column(nColumn), order(fOrder) {}
+ bool operator()(RecentRequestEntry &left, RecentRequestEntry &right) const;
+
+private:
+ int column;
+ Qt::SortOrder order;
+};
+
+/** Model for list of recently generated payment requests / bitcoin: URIs.
* Part of wallet model.
*/
class RecentRequestsTableModel: public QAbstractTableModel
@@ -34,7 +68,8 @@ public:
Date = 0,
Label = 1,
Message = 2,
- Amount = 3
+ Amount = 3,
+ NUMBER_OF_COLUMNS
};
/** @name Methods overridden from QAbstractTableModel
@@ -51,11 +86,17 @@ public:
const RecentRequestEntry &entry(int row) const { return list[row]; }
void addNewRequest(const SendCoinsRecipient &recipient);
+ void addNewRequest(const std::string &recipient);
+ void addNewRequest(RecentRequestEntry &recipient);
+
+public slots:
+ void sort(int column, Qt::SortOrder order = Qt::AscendingOrder);
private:
WalletModel *walletModel;
QStringList columns;
QList<RecentRequestEntry> list;
+ int64_t nReceiveRequestsMaxId;
};
#endif
diff --git a/src/qt/res/icons/transaction_conflicted.png b/src/qt/res/icons/transaction_conflicted.png
new file mode 100644
index 0000000000..51fff649ab
--- /dev/null
+++ b/src/qt/res/icons/transaction_conflicted.png
Binary files differ
diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
index a8470572dd..bd29efee86 100644
--- a/src/qt/rpcconsole.cpp
+++ b/src/qt/rpcconsole.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2013 The Bitcoin developers
+// Copyright (c) 2011-2014 The Bitcoin developers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
@@ -200,7 +200,6 @@ RPCConsole::RPCConsole(QWidget *parent) :
#ifndef Q_OS_MAC
ui->openDebugLogfileButton->setIcon(QIcon(":/icons/export"));
- ui->showCLOptionsButton->setIcon(QIcon(":/icons/options"));
#endif
// Install event filter for up and down arrow
@@ -441,12 +440,6 @@ void RPCConsole::scrollToEnd()
scrollbar->setValue(scrollbar->maximum());
}
-void RPCConsole::on_showCLOptionsButton_clicked()
-{
- GUIUtil::HelpMessageBox help;
- help.exec();
-}
-
void RPCConsole::on_sldGraphRange_valueChanged(int value)
{
const int multiplier = 5; // each position on the slider represents 5 min
diff --git a/src/qt/rpcconsole.h b/src/qt/rpcconsole.h
index 6fbf197728..e5da01546a 100644
--- a/src/qt/rpcconsole.h
+++ b/src/qt/rpcconsole.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2013 The Bitcoin developers
+// Copyright (c) 2011-2014 The Bitcoin developers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
@@ -40,8 +40,6 @@ private slots:
void on_tabWidget_currentChanged(int index);
/** open the debug.log from the current datadir */
void on_openDebugLogfileButton_clicked();
- /** display messagebox with program parameters (same as bitcoin-qt --help) */
- void on_showCLOptionsButton_clicked();
/** change the time range of the network traffic graph */
void on_sldGraphRange_valueChanged(int value);
/** update traffic statistics */
diff --git a/src/qt/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp
index 92be835c56..33621e54b0 100644
--- a/src/qt/sendcoinsdialog.cpp
+++ b/src/qt/sendcoinsdialog.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2013 The Bitcoin developers
+// Copyright (c) 2011-2014 The Bitcoin developers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
@@ -33,9 +33,8 @@ SendCoinsDialog::SendCoinsDialog(QWidget *parent) :
ui->clearButton->setIcon(QIcon());
ui->sendButton->setIcon(QIcon());
#endif
-#if QT_VERSION >= 0x040700
- ui->lineEditCoinControlChange->setPlaceholderText(tr("Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)"));
-#endif
+
+ GUIUtil::setupAddressWidget(ui->lineEditCoinControlChange, this);
addEntry();
@@ -43,7 +42,6 @@ SendCoinsDialog::SendCoinsDialog(QWidget *parent) :
connect(ui->clearButton, SIGNAL(clicked()), this, SLOT(clear()));
// Coin Control
- ui->lineEditCoinControlChange->setFont(GUIUtil::bitcoinAddressFont());
connect(ui->pushButtonCoinControl, SIGNAL(clicked()), this, SLOT(coinControlButtonClicked()));
connect(ui->checkBoxCoinControlChange, SIGNAL(stateChanged(int)), this, SLOT(coinControlChangeChecked(int)));
connect(ui->lineEditCoinControlChange, SIGNAL(textEdited(const QString &)), this, SLOT(coinControlChangeEdited(const QString &)));
@@ -327,9 +325,10 @@ QWidget *SendCoinsDialog::setupTabChain(QWidget *prev)
prev = entry->setupTabChain(prev);
}
}
- QWidget::setTabOrder(prev, ui->addButton);
- QWidget::setTabOrder(ui->addButton, ui->sendButton);
- return ui->sendButton;
+ QWidget::setTabOrder(prev, ui->sendButton);
+ QWidget::setTabOrder(ui->sendButton, ui->clearButton);
+ QWidget::setTabOrder(ui->clearButton, ui->addButton);
+ return ui->addButton;
}
void SendCoinsDialog::setAddress(const QString &address)
@@ -516,6 +515,9 @@ void SendCoinsDialog::coinControlFeatureChanged(bool checked)
if (!checked && model) // coin control features disabled
CoinControlDialog::coinControl->SetNull();
+
+ if (checked)
+ coinControlUpdateLabels();
}
// Coin Control: button inputs -> show actual coin control dialog
@@ -533,7 +535,6 @@ void SendCoinsDialog::coinControlChangeChecked(int state)
if (state == Qt::Unchecked)
{
CoinControlDialog::coinControl->destChange = CNoDestination();
- ui->lineEditCoinControlChange->setValid(true);
ui->labelCoinControlChangeLabel->clear();
}
else
@@ -560,7 +561,6 @@ void SendCoinsDialog::coinControlChangeEdited(const QString& text)
}
else if (!addr.IsValid()) // Invalid address
{
- ui->lineEditCoinControlChange->setValid(false);
ui->labelCoinControlChangeLabel->setText(tr("Warning: Invalid Bitcoin address"));
}
else // Valid address
@@ -570,7 +570,6 @@ void SendCoinsDialog::coinControlChangeEdited(const QString& text)
addr.GetKeyID(keyid);
if (!model->getPubKey(keyid, pubkey)) // Unknown change address
{
- ui->lineEditCoinControlChange->setValid(false);
ui->labelCoinControlChangeLabel->setText(tr("Warning: Unknown change address"));
}
else // Known change address
diff --git a/src/qt/sendcoinsentry.cpp b/src/qt/sendcoinsentry.cpp
index 3f5d0cda3a..ad8dd7b732 100644
--- a/src/qt/sendcoinsentry.cpp
+++ b/src/qt/sendcoinsentry.cpp
@@ -28,9 +28,7 @@ SendCoinsEntry::SendCoinsEntry(QWidget *parent) :
#endif
#if QT_VERSION >= 0x040700
ui->addAsLabel->setPlaceholderText(tr("Enter a label for this address to add it to your address book"));
- ui->payTo->setPlaceholderText(tr("Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)"));
#endif
- setFocusProxy(ui->payTo);
// normal bitcoin address field
GUIUtil::setupAddressWidget(ui->payTo, this);
@@ -88,6 +86,9 @@ void SendCoinsEntry::clear()
ui->payTo->clear();
ui->addAsLabel->clear();
ui->payAmount->clear();
+ ui->messageTextLabel->clear();
+ ui->messageTextLabel->hide();
+ ui->messageLabel->hide();
// clear UI elements for insecure payment request
ui->payTo_is->clear();
ui->memoTextLabel_is->clear();
@@ -118,7 +119,7 @@ bool SendCoinsEntry::validate()
if (recipient.paymentRequest.IsInitialized())
return retval;
- if (!ui->payTo->hasAcceptableInput() || !model->validateAddress(ui->payTo->text()))
+ if (!model->validateAddress(ui->payTo->text()))
{
ui->payTo->setValid(false);
retval = false;
@@ -148,6 +149,7 @@ SendCoinsRecipient SendCoinsEntry::getValue()
recipient.address = ui->payTo->text();
recipient.label = ui->addAsLabel->text();
recipient.amount = ui->payAmount->value();
+ recipient.message = ui->messageTextLabel->text();
return recipient;
}
@@ -188,6 +190,11 @@ void SendCoinsEntry::setValue(const SendCoinsRecipient &value)
}
else // normal payment
{
+ // message
+ ui->messageTextLabel->setText(recipient.message);
+ ui->messageTextLabel->setVisible(!recipient.message.isEmpty());
+ ui->messageLabel->setVisible(!recipient.message.isEmpty());
+
ui->payTo->setText(recipient.address);
ui->addAsLabel->setText(recipient.label);
ui->payAmount->setValue(recipient.amount);
diff --git a/src/qt/signverifymessagedialog.cpp b/src/qt/signverifymessagedialog.cpp
index e319f5075a..3e56412c7c 100644
--- a/src/qt/signverifymessagedialog.cpp
+++ b/src/qt/signverifymessagedialog.cpp
@@ -26,11 +26,8 @@ SignVerifyMessageDialog::SignVerifyMessageDialog(QWidget *parent) :
ui->setupUi(this);
#if QT_VERSION >= 0x040700
- ui->addressIn_SM->setPlaceholderText(tr("Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)"));
ui->signatureOut_SM->setPlaceholderText(tr("Click \"Sign Message\" to generate signature"));
-
ui->addressIn_VM->setPlaceholderText(tr("Enter a Bitcoin address (e.g. 1NS17iag9jJgTHD1VXjvLCEnZuQ3rJDE9L)"));
- ui->signatureIn_VM->setPlaceholderText(tr("Enter Bitcoin signature"));
#endif
GUIUtil::setupAddressWidget(ui->addressIn_SM, this);
@@ -112,7 +109,6 @@ void SignVerifyMessageDialog::on_signMessageButton_SM_clicked()
CBitcoinAddress addr(ui->addressIn_SM->text().toStdString());
if (!addr.IsValid())
{
- ui->addressIn_SM->setValid(false);
ui->statusLabel_SM->setStyleSheet("QLabel { color: red; }");
ui->statusLabel_SM->setText(tr("The entered address is invalid.") + QString(" ") + tr("Please check the address and try again."));
return;
@@ -193,7 +189,6 @@ void SignVerifyMessageDialog::on_verifyMessageButton_VM_clicked()
CBitcoinAddress addr(ui->addressIn_VM->text().toStdString());
if (!addr.IsValid())
{
- ui->addressIn_VM->setValid(false);
ui->statusLabel_VM->setStyleSheet("QLabel { color: red; }");
ui->statusLabel_VM->setText(tr("The entered address is invalid.") + QString(" ") + tr("Please check the address and try again."));
return;
diff --git a/src/qt/splashscreen.cpp b/src/qt/splashscreen.cpp
index 8b16496c18..cacf5dc49b 100644
--- a/src/qt/splashscreen.cpp
+++ b/src/qt/splashscreen.cpp
@@ -1,12 +1,12 @@
-// Copyright (c) 2011-2013 The Bitcoin developers
+// Copyright (c) 2011-2014 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 "splashscreen.h"
#include "clientversion.h"
-#include "util.h"
#include "ui_interface.h"
+#include "util.h"
#include <QApplication>
#include <QPainter>
diff --git a/src/qt/splashscreen.h b/src/qt/splashscreen.h
index 6bc10e60ab..d79038d81d 100644
--- a/src/qt/splashscreen.h
+++ b/src/qt/splashscreen.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2013 The Bitcoin developers
+// Copyright (c) 2011-2014 The Bitcoin developers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
diff --git a/src/qt/test/Makefile.am b/src/qt/test/Makefile.am
index 00ccfadf3f..2461b5ff4d 100644
--- a/src/qt/test/Makefile.am
+++ b/src/qt/test/Makefile.am
@@ -41,5 +41,6 @@ endif
test_bitcoin_qt_LDADD += $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBLEVELDB) \
$(LIBMEMENV) $(BOOST_LIBS) $(QT_DBUS_LIBS) $(QT_TEST_LIBS) $(QT_LIBS) \
$(QR_LIBS) $(PROTOBUF_LIBS) $(BDB_LIBS)
+test_bitcoin_qt_LDFLAGS = $(QT_LDFLAGS)
CLEANFILES = $(BUILT_SOURCES) *.gcda *.gcno
diff --git a/src/qt/transactiondesc.cpp b/src/qt/transactiondesc.cpp
index c0c4d53732..4aebaa1e7f 100644
--- a/src/qt/transactiondesc.cpp
+++ b/src/qt/transactiondesc.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2013 The Bitcoin developers
+// Copyright (c) 2011-2014 The Bitcoin developers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
@@ -20,17 +20,19 @@
QString TransactionDesc::FormatTxStatus(const CWalletTx& wtx)
{
- if (!IsFinalTx(wtx))
+ if (!IsFinalTx(wtx, chainActive.Height() + 1))
{
if (wtx.nLockTime < LOCKTIME_THRESHOLD)
- return tr("Open for %n more block(s)", "", wtx.nLockTime - chainActive.Height() + 1);
+ return tr("Open for %n more block(s)", "", wtx.nLockTime - chainActive.Height());
else
return tr("Open until %1").arg(GUIUtil::dateTimeStr(wtx.nLockTime));
}
else
{
int nDepth = wtx.GetDepthInMainChain();
- if (GetAdjustedTime() - wtx.nTimeReceived > 2 * 60 && wtx.GetRequestCount() == 0)
+ if (nDepth < 0)
+ return tr("conflicted");
+ else if (GetAdjustedTime() - wtx.nTimeReceived > 2 * 60 && wtx.GetRequestCount() == 0)
return tr("%1/offline").arg(nDepth);
else if (nDepth < 6)
return tr("%1/unconfirmed").arg(nDepth);
@@ -224,6 +226,11 @@ QString TransactionDesc::toHTML(CWallet *wallet, CWalletTx &wtx, int vout, int u
strHTML += "<b>" + tr("Transaction ID") + ":</b> " + TransactionRecord::formatSubTxId(wtx.GetHash(), vout) + "<br>";
+ // Message from normal bitcoin:URI (bitcoin:123...?message=example)
+ foreach (const PAIRTYPE(string, string)& r, wtx.vOrderForm)
+ if (r.first == "Message")
+ strHTML += "<br><b>" + tr("Message") + ":</b><br>" + GUIUtil::HtmlEscape(r.second, true) + "<br>";
+
//
// PaymentRequest info:
//
diff --git a/src/qt/transactionfilterproxy.cpp b/src/qt/transactionfilterproxy.cpp
index a14e74a469..f9546fddb5 100644
--- a/src/qt/transactionfilterproxy.cpp
+++ b/src/qt/transactionfilterproxy.cpp
@@ -5,6 +5,7 @@
#include "transactionfilterproxy.h"
#include "transactiontablemodel.h"
+#include "transactionrecord.h"
#include <cstdlib>
@@ -22,7 +23,8 @@ TransactionFilterProxy::TransactionFilterProxy(QObject *parent) :
addrPrefix(),
typeFilter(ALL_TYPES),
minAmount(0),
- limitRows(-1)
+ limitRows(-1),
+ showInactive(true)
{
}
@@ -35,7 +37,10 @@ bool TransactionFilterProxy::filterAcceptsRow(int sourceRow, const QModelIndex &
QString address = index.data(TransactionTableModel::AddressRole).toString();
QString label = index.data(TransactionTableModel::LabelRole).toString();
qint64 amount = llabs(index.data(TransactionTableModel::AmountRole).toLongLong());
+ int status = index.data(TransactionTableModel::StatusRole).toInt();
+ if(!showInactive && status == TransactionStatus::Conflicted)
+ return false;
if(!(TYPE(type) & typeFilter))
return false;
if(datetime < dateFrom || datetime > dateTo)
@@ -78,6 +83,12 @@ void TransactionFilterProxy::setLimit(int limit)
this->limitRows = limit;
}
+void TransactionFilterProxy::setShowInactive(bool showInactive)
+{
+ this->showInactive = showInactive;
+ invalidateFilter();
+}
+
int TransactionFilterProxy::rowCount(const QModelIndex &parent) const
{
if(limitRows != -1)
diff --git a/src/qt/transactionfilterproxy.h b/src/qt/transactionfilterproxy.h
index 6d1644d48d..9919bc3fd6 100644
--- a/src/qt/transactionfilterproxy.h
+++ b/src/qt/transactionfilterproxy.h
@@ -36,6 +36,9 @@ public:
/** Set maximum number of rows returned, -1 if unlimited. */
void setLimit(int limit);
+ /** Set whether to show conflicted transactions. */
+ void setShowInactive(bool showInactive);
+
int rowCount(const QModelIndex &parent = QModelIndex()) const;
protected:
@@ -48,6 +51,7 @@ private:
quint32 typeFilter;
qint64 minAmount;
int limitRows;
+ bool showInactive;
};
#endif // TRANSACTIONFILTERPROXY_H
diff --git a/src/qt/transactionrecord.cpp b/src/qt/transactionrecord.cpp
index 6823557ebc..8cfaed27c7 100644
--- a/src/qt/transactionrecord.cpp
+++ b/src/qt/transactionrecord.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2013 The Bitcoin developers
+// Copyright (c) 2011-2014 The Bitcoin developers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
@@ -164,16 +164,16 @@ void TransactionRecord::updateStatus(const CWalletTx &wtx)
(wtx.IsCoinBase() ? 1 : 0),
wtx.nTimeReceived,
idx);
- status.confirmed = wtx.IsConfirmed();
+ status.confirmed = wtx.IsTrusted();
status.depth = wtx.GetDepthInMainChain();
status.cur_num_blocks = chainActive.Height();
- if (!IsFinalTx(wtx))
+ if (!IsFinalTx(wtx, chainActive.Height() + 1))
{
if (wtx.nLockTime < LOCKTIME_THRESHOLD)
{
status.status = TransactionStatus::OpenUntilBlock;
- status.open_for = wtx.nLockTime - chainActive.Height() + 1;
+ status.open_for = wtx.nLockTime - chainActive.Height();
}
else
{
@@ -183,7 +183,11 @@ void TransactionRecord::updateStatus(const CWalletTx &wtx)
}
else
{
- if (GetAdjustedTime() - wtx.nTimeReceived > 2 * 60 && wtx.GetRequestCount() == 0)
+ if (status.depth < 0)
+ {
+ status.status = TransactionStatus::Conflicted;
+ }
+ else if (GetAdjustedTime() - wtx.nTimeReceived > 2 * 60 && wtx.GetRequestCount() == 0)
{
status.status = TransactionStatus::Offline;
}
diff --git a/src/qt/transactionrecord.h b/src/qt/transactionrecord.h
index 8a7c9044e3..d7be0bc438 100644
--- a/src/qt/transactionrecord.h
+++ b/src/qt/transactionrecord.h
@@ -36,7 +36,8 @@ public:
OpenUntilBlock,
Offline,
Unconfirmed,
- HaveConfirmations
+ HaveConfirmations,
+ Conflicted
};
bool confirmed;
diff --git a/src/qt/transactiontablemodel.cpp b/src/qt/transactiontablemodel.cpp
index b29be7e0cb..7d76204ba4 100644
--- a/src/qt/transactiontablemodel.cpp
+++ b/src/qt/transactiontablemodel.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2013 The Bitcoin developers
+// Copyright (c) 2011-2014 The Bitcoin developers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
@@ -312,7 +312,7 @@ QString TransactionTableModel::formatTxStatus(const TransactionRecord *wtx) cons
status = tr("Open until %1").arg(GUIUtil::dateTimeStr(wtx->status.open_for));
break;
case TransactionStatus::Offline:
- status = tr("Offline (%1 confirmations)").arg(wtx->status.depth);
+ status = tr("Offline");
break;
case TransactionStatus::Unconfirmed:
status = tr("Unconfirmed (%1 of %2 confirmations)").arg(wtx->status.depth).arg(TransactionRecord::NumConfirmations);
@@ -320,6 +320,9 @@ QString TransactionTableModel::formatTxStatus(const TransactionRecord *wtx) cons
case TransactionStatus::HaveConfirmations:
status = tr("Confirmed (%1 confirmations)").arg(wtx->status.depth);
break;
+ case TransactionStatus::Conflicted:
+ status = tr("Conflicted");
+ break;
}
}
@@ -471,7 +474,6 @@ QVariant TransactionTableModel::txStatusDecoration(const TransactionRecord *wtx)
case TransactionStatus::OpenUntilBlock:
case TransactionStatus::OpenUntilDate:
return QColor(64,64,255);
- break;
case TransactionStatus::Offline:
return QColor(192,192,192);
case TransactionStatus::Unconfirmed:
@@ -486,6 +488,8 @@ QVariant TransactionTableModel::txStatusDecoration(const TransactionRecord *wtx)
};
case TransactionStatus::HaveConfirmations:
return QIcon(":/icons/transaction_confirmed");
+ case TransactionStatus::Conflicted:
+ return QIcon(":/icons/transaction_conflicted");
}
}
return QColor(0,0,0);
@@ -587,6 +591,8 @@ QVariant TransactionTableModel::data(const QModelIndex &index, int role) const
rec->status.maturity != TransactionStatus::Mature);
case FormattedAmountRole:
return formatTxAmount(rec, false);
+ case StatusRole:
+ return rec->status.status;
}
return QVariant();
}
diff --git a/src/qt/transactiontablemodel.h b/src/qt/transactiontablemodel.h
index c23c606c31..7b9cf09cbe 100644
--- a/src/qt/transactiontablemodel.h
+++ b/src/qt/transactiontablemodel.h
@@ -53,7 +53,9 @@ public:
/** Is transaction confirmed? */
ConfirmedRole,
/** Formatted amount, without brackets when unconfirmed */
- FormattedAmountRole
+ FormattedAmountRole,
+ /** Transaction status (TransactionRecord::Status) */
+ StatusRole
};
int rowCount(const QModelIndex &parent) const;
diff --git a/src/qt/utilitydialog.cpp b/src/qt/utilitydialog.cpp
new file mode 100644
index 0000000000..24992db465
--- /dev/null
+++ b/src/qt/utilitydialog.cpp
@@ -0,0 +1,134 @@
+// Copyright (c) 2011-2014 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 "utilitydialog.h"
+
+#include "ui_aboutdialog.h"
+#include "ui_helpmessagedialog.h"
+
+#include "bitcoingui.h"
+#include "clientmodel.h"
+#include "guiutil.h"
+
+#include "clientversion.h"
+#include "init.h"
+#include "util.h"
+
+#include <QLabel>
+#include <QVBoxLayout>
+
+/** "About" dialog box */
+AboutDialog::AboutDialog(QWidget *parent) :
+ QDialog(parent),
+ ui(new Ui::AboutDialog)
+{
+ ui->setupUi(this);
+
+ // Set current copyright year
+ ui->copyrightLabel->setText(tr("Copyright") + QString(" &copy; 2009-%1 ").arg(COPYRIGHT_YEAR) + tr("The Bitcoin Core developers"));
+}
+
+void AboutDialog::setModel(ClientModel *model)
+{
+ if(model)
+ {
+ QString version = model->formatFullVersion();
+ /* On x86 add a bit specifier to the version so that users can distinguish between
+ * 32 and 64 bit builds. On other architectures, 32/64 bit may be more ambigious.
+ */
+#if defined(__x86_64__)
+ version += tr(" (%1-bit)").arg(64);
+#elif defined(__i386__ )
+ version += tr(" (%1-bit)").arg(32);
+#endif
+ ui->versionLabel->setText(version);
+ }
+}
+
+AboutDialog::~AboutDialog()
+{
+ delete ui;
+}
+
+void AboutDialog::on_buttonBox_accepted()
+{
+ close();
+}
+
+/** "Help message" dialog box */
+HelpMessageDialog::HelpMessageDialog(QWidget *parent) :
+ QDialog(parent),
+ ui(new Ui::HelpMessageDialog)
+{
+ ui->setupUi(this);
+ GUIUtil::restoreWindowGeometry("nHelpMessageDialogWindow", this->size(), this);
+
+ header = tr("Bitcoin Core") + " " + tr("version") + " " +
+ QString::fromStdString(FormatFullVersion()) + "\n\n" +
+ tr("Usage:") + "\n" +
+ " bitcoin-qt [" + tr("command-line options") + "] " + "\n";
+
+ coreOptions = QString::fromStdString(HelpMessage(HMM_BITCOIN_QT));
+
+ uiOptions = tr("UI options") + ":\n" +
+ " -lang=<lang> " + tr("Set language, for example \"de_DE\" (default: system locale)") + "\n" +
+ " -min " + tr("Start minimized") + "\n" +
+ " -splash " + tr("Show splash screen on startup (default: 1)") + "\n" +
+ " -choosedatadir " + tr("Choose data directory on startup (default: 0)");
+
+ ui->helpMessageLabel->setFont(GUIUtil::bitcoinAddressFont());
+
+ // Set help message text
+ ui->helpMessageLabel->setText(header + "\n" + coreOptions + "\n" + uiOptions);
+}
+
+HelpMessageDialog::~HelpMessageDialog()
+{
+ GUIUtil::saveWindowGeometry("nHelpMessageDialogWindow", this);
+ delete ui;
+}
+
+void HelpMessageDialog::printToConsole()
+{
+ // On other operating systems, the expected action is to print the message to the console.
+ QString strUsage = header + "\n" + coreOptions + "\n" + uiOptions + "\n";
+ fprintf(stdout, "%s", strUsage.toStdString().c_str());
+}
+
+void HelpMessageDialog::showOrPrint()
+{
+#if defined(WIN32)
+ // On Windows, show a message box, as there is no stderr/stdout in windowed applications
+ exec();
+#else
+ // On other operating systems, print help text to console
+ printToConsole();
+#endif
+}
+
+void HelpMessageDialog::on_okButton_accepted()
+{
+ close();
+}
+
+
+/** "Shutdown" window */
+void ShutdownWindow::showShutdownWindow(BitcoinGUI *window)
+{
+ if (!window)
+ return;
+
+ // Show a simple window indicating shutdown status
+ QWidget *shutdownWindow = new QWidget();
+ QVBoxLayout *layout = new QVBoxLayout();
+ layout->addWidget(new QLabel(
+ tr("Bitcoin Core is shutting down...") + "<br /><br />" +
+ tr("Do not shut down the computer until this window disappears.")));
+ shutdownWindow->setLayout(layout);
+
+ // Center shutdown window at where main window was
+ const QPoint global = window->mapToGlobal(window->rect().center());
+ shutdownWindow->move(global.x() - shutdownWindow->width() / 2, global.y() - shutdownWindow->height() / 2);
+ shutdownWindow->show();
+}
diff --git a/src/qt/utilitydialog.h b/src/qt/utilitydialog.h
new file mode 100644
index 0000000000..874daf6a7f
--- /dev/null
+++ b/src/qt/utilitydialog.h
@@ -0,0 +1,69 @@
+// Copyright (c) 2011-2014 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 UTILITYDIALOG_H
+#define UTILITYDIALOG_H
+
+#include <QDialog>
+#include <QObject>
+
+class BitcoinGUI;
+class ClientModel;
+
+namespace Ui {
+ class AboutDialog;
+ class HelpMessageDialog;
+}
+
+/** "About" dialog box */
+class AboutDialog : public QDialog
+{
+ Q_OBJECT
+
+public:
+ explicit AboutDialog(QWidget *parent);
+ ~AboutDialog();
+
+ void setModel(ClientModel *model);
+
+private:
+ Ui::AboutDialog *ui;
+
+private slots:
+ void on_buttonBox_accepted();
+};
+
+/** "Help message" dialog box */
+class HelpMessageDialog : public QDialog
+{
+ Q_OBJECT
+
+public:
+ explicit HelpMessageDialog(QWidget *parent);
+ ~HelpMessageDialog();
+
+ void printToConsole();
+ void showOrPrint();
+
+private:
+ Ui::HelpMessageDialog *ui;
+ QString header;
+ QString coreOptions;
+ QString uiOptions;
+
+private slots:
+ void on_okButton_accepted();
+};
+
+
+/** "Shutdown" window */
+class ShutdownWindow : public QObject
+{
+ Q_OBJECT
+
+public:
+ static void showShutdownWindow(BitcoinGUI *window);
+};
+
+#endif // UTILITYDIALOG_H
diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp
index 14f29c933b..3549cd49f0 100644
--- a/src/qt/walletmodel.cpp
+++ b/src/qt/walletmodel.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2013 The Bitcoin developers
+// Copyright (c) 2011-2014 The Bitcoin developers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
@@ -269,6 +269,8 @@ WalletModel::SendCoinsReturn WalletModel::sendCoins(WalletModelTransaction &tran
rcp.paymentRequest.SerializeToString(&value);
newTx->vOrderForm.push_back(make_pair(key, value));
}
+ else if (!rcp.message.isEmpty()) // Message from normal bitcoin:URI (bitcoin:123...?message=example)
+ newTx->vOrderForm.push_back(make_pair("Message", rcp.message.toStdString()));
}
CReserveKey *keyChange = transaction.getPossibleKeyChange();
@@ -492,7 +494,9 @@ void WalletModel::getOutputs(const std::vector<COutPoint>& vOutpoints, std::vect
BOOST_FOREACH(const COutPoint& outpoint, vOutpoints)
{
if (!wallet->mapWallet.count(outpoint.hash)) continue;
- COutput out(&wallet->mapWallet[outpoint.hash], outpoint.n, wallet->mapWallet[outpoint.hash].GetDepthInMainChain());
+ int nDepth = wallet->mapWallet[outpoint.hash].GetDepthInMainChain();
+ if (nDepth < 0) continue;
+ COutput out(&wallet->mapWallet[outpoint.hash], outpoint.n, nDepth);
vOutputs.push_back(out);
}
}
@@ -511,7 +515,9 @@ void WalletModel::listCoins(std::map<QString, std::vector<COutput> >& mapCoins)
BOOST_FOREACH(const COutPoint& outpoint, vLockedCoins)
{
if (!wallet->mapWallet.count(outpoint.hash)) continue;
- COutput out(&wallet->mapWallet[outpoint.hash], outpoint.n, wallet->mapWallet[outpoint.hash].GetDepthInMainChain());
+ int nDepth = wallet->mapWallet[outpoint.hash].GetDepthInMainChain();
+ if (nDepth < 0) continue;
+ COutput out(&wallet->mapWallet[outpoint.hash], outpoint.n, nDepth);
vCoins.push_back(out);
}
@@ -554,3 +560,27 @@ void WalletModel::listLockedCoins(std::vector<COutPoint>& vOutpts)
LOCK(wallet->cs_wallet);
wallet->ListLockedCoins(vOutpts);
}
+
+void WalletModel::loadReceiveRequests(std::vector<std::string>& vReceiveRequests)
+{
+ LOCK(wallet->cs_wallet);
+ BOOST_FOREACH(const PAIRTYPE(CTxDestination, CAddressBookData)& item, wallet->mapAddressBook)
+ BOOST_FOREACH(const PAIRTYPE(std::string, std::string)& item2, item.second.destdata)
+ if (item2.first.size() > 2 && item2.first.substr(0,2) == "rr") // receive request
+ vReceiveRequests.push_back(item2.second);
+}
+
+bool WalletModel::saveReceiveRequest(const std::string &sAddress, const int64_t nId, const std::string &sRequest)
+{
+ CTxDestination dest = CBitcoinAddress(sAddress).Get();
+
+ std::stringstream ss;
+ ss << nId;
+ std::string key = "rr" + ss.str(); // "rr" prefix = "receive request" in destdata
+
+ LOCK(wallet->cs_wallet);
+ if (sRequest.empty())
+ return wallet->EraseDestData(dest, key);
+ else
+ return wallet->AddDestData(dest, key, sRequest);
+}
diff --git a/src/qt/walletmodel.h b/src/qt/walletmodel.h
index 1a4d25615a..91a6fba222 100644
--- a/src/qt/walletmodel.h
+++ b/src/qt/walletmodel.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011-2013 The Bitcoin developers
+// Copyright (c) 2011-2014 The Bitcoin developers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
@@ -36,9 +36,9 @@ QT_END_NAMESPACE
class SendCoinsRecipient
{
public:
- explicit SendCoinsRecipient() : amount(0) { }
+ explicit SendCoinsRecipient() : amount(0), nVersion(SendCoinsRecipient::CURRENT_VERSION) { }
explicit SendCoinsRecipient(const QString &addr, const QString &label, quint64 amount, const QString &message):
- address(addr), label(label), amount(amount), message(message) {}
+ address(addr), label(label), amount(amount), message(message), nVersion(SendCoinsRecipient::CURRENT_VERSION) {}
// If from an insecure payment request, this is used for storing
// the addresses, e.g. address-A<br />address-B<br />address-C.
@@ -55,6 +55,41 @@ public:
PaymentRequestPlus paymentRequest;
// Empty if no authentication or invalid signature/cert/etc.
QString authenticatedMerchant;
+
+ static const int CURRENT_VERSION = 1;
+ int nVersion;
+
+ IMPLEMENT_SERIALIZE
+ (
+ SendCoinsRecipient* pthis = const_cast<SendCoinsRecipient*>(this);
+
+ std::string sAddress = pthis->address.toStdString();
+ std::string sLabel = pthis->label.toStdString();
+ std::string sMessage = pthis->message.toStdString();
+ std::string sPaymentRequest;
+ if (!fRead && pthis->paymentRequest.IsInitialized())
+ pthis->paymentRequest.SerializeToString(&sPaymentRequest);
+ std::string sAuthenticatedMerchant = pthis->authenticatedMerchant.toStdString();
+
+ READWRITE(pthis->nVersion);
+ nVersion = pthis->nVersion;
+ READWRITE(sAddress);
+ READWRITE(sLabel);
+ READWRITE(amount);
+ READWRITE(sMessage);
+ READWRITE(sPaymentRequest);
+ READWRITE(sAuthenticatedMerchant);
+
+ if (fRead)
+ {
+ pthis->address = QString::fromStdString(sAddress);
+ pthis->label = QString::fromStdString(sLabel);
+ pthis->message = QString::fromStdString(sMessage);
+ if (!sPaymentRequest.empty())
+ pthis->paymentRequest.parse(QByteArray::fromRawData(sPaymentRequest.data(), sPaymentRequest.size()));
+ pthis->authenticatedMerchant = QString::fromStdString(sAuthenticatedMerchant);
+ }
+ )
};
/** Interface to Bitcoin wallet from Qt view code. */
@@ -152,6 +187,9 @@ public:
void unlockCoin(COutPoint& output);
void listLockedCoins(std::vector<COutPoint>& vOutpts);
+ void loadReceiveRequests(std::vector<std::string>& vReceiveRequests);
+ bool saveReceiveRequest(const std::string &sAddress, const int64_t nId, const std::string &sRequest);
+
private:
CWallet *wallet;
diff --git a/src/rpcblockchain.cpp b/src/rpcblockchain.cpp
index 661deffb19..78a92ce1e9 100644
--- a/src/rpcblockchain.cpp
+++ b/src/rpcblockchain.cpp
@@ -410,8 +410,8 @@ Value verifychain(const Array& params, bool fHelp)
"verifychain ( checklevel numblocks )\n"
"\nVerifies blockchain database.\n"
"\nArguments:\n"
- "1. checklevel (numeric, optional, default=3) The level\n"
- "2. numblocks (numeric, optional, 288) The number of blocks\n"
+ "1. checklevel (numeric, optional, 0-4, default=3) How thorough the block verification is.\n"
+ "2. numblocks (numeric, optional, default=288, 0=all) The number of blocks to check.\n"
"\nResult:\n"
"true|false (boolean) Verified or not\n"
"\nExamples:\n"
diff --git a/src/rpcdump.cpp b/src/rpcdump.cpp
index c801b284cb..9e1d47846e 100644
--- a/src/rpcdump.cpp
+++ b/src/rpcdump.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2013 The Bitcoin developers
+// Copyright (c) 2009-2014 The Bitcoin developers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
@@ -23,13 +23,13 @@ using namespace std;
void EnsureWalletIsUnlocked();
std::string static EncodeDumpTime(int64_t nTime) {
- return DateTimeStrFormat("%Y-%m-%"PRId64"T%H:%M:%SZ", nTime);
+ return DateTimeStrFormat("%Y-%m-%dT%H:%M:%SZ", nTime);
}
int64_t static DecodeDumpTime(const std::string &str) {
- static boost::posix_time::time_input_facet facet("%Y-%m-%dT%H:%M:%SZ");
static const boost::posix_time::ptime epoch = boost::posix_time::from_time_t(0);
- const std::locale loc(std::locale::classic(), &facet);
+ static const std::locale loc(std::locale::classic(),
+ new boost::posix_time::time_input_facet("%Y-%m-%dT%H:%M:%SZ"));
std::istringstream iss(str);
iss.imbue(loc);
boost::posix_time::ptime ptime(boost::date_time::not_a_date_time);
@@ -101,9 +101,11 @@ Value importprivkey(const Array& params, bool fHelp)
CBitcoinSecret vchSecret;
bool fGood = vchSecret.SetString(strSecret);
- if (!fGood) throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid private key");
+ if (!fGood) throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid private key encoding");
CKey key = vchSecret.GetKey();
+ if (!key.IsValid()) throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Private key outside allowed range");
+
CPubKey pubkey = key.GetPubKey();
CKeyID vchAddress = pubkey.GetID();
{
@@ -116,9 +118,14 @@ Value importprivkey(const Array& params, bool fHelp)
if (pwalletMain->HaveKey(vchAddress))
return Value::null;
+ pwalletMain->mapKeyMetadata[vchAddress].nCreateTime = 1;
+
if (!pwalletMain->AddKeyPubKey(key, pubkey))
throw JSONRPCError(RPC_WALLET_ERROR, "Error adding key to wallet");
+ // whenever a key is imported, we need to scan the whole chain
+ pwalletMain->nTimeFirstKey = 1; // 0 would be considered 'no value'
+
if (fRescan) {
pwalletMain->ScanForWalletTransactions(chainActive.Genesis(), true);
pwalletMain->ReacceptWalletTransactions();
@@ -173,7 +180,7 @@ Value importwallet(const Array& params, bool fHelp)
CPubKey pubkey = key.GetPubKey();
CKeyID keyid = pubkey.GetID();
if (pwalletMain->HaveKey(keyid)) {
- LogPrintf("Skipping import of %s (key already present)\n", CBitcoinAddress(keyid).ToString().c_str());
+ LogPrintf("Skipping import of %s (key already present)\n", CBitcoinAddress(keyid).ToString());
continue;
}
int64_t nTime = DecodeDumpTime(vstr[1]);
@@ -191,7 +198,7 @@ Value importwallet(const Array& params, bool fHelp)
fLabel = true;
}
}
- LogPrintf("Importing %s...\n", CBitcoinAddress(keyid).ToString().c_str());
+ LogPrintf("Importing %s...\n", CBitcoinAddress(keyid).ToString());
if (!pwalletMain->AddKeyPubKey(key, pubkey)) {
fGood = false;
continue;
@@ -285,10 +292,10 @@ Value dumpwallet(const Array& params, bool fHelp)
std::sort(vKeyBirth.begin(), vKeyBirth.end());
// produce output
- file << strprintf("# Wallet dump created by Bitcoin %s (%s)\n", CLIENT_BUILD.c_str(), CLIENT_DATE.c_str());
- file << strprintf("# * Created on %s\n", EncodeDumpTime(GetTime()).c_str());
- file << strprintf("# * Best block at time of backup was %i (%s),\n", chainActive.Height(), chainActive.Tip()->GetBlockHash().ToString().c_str());
- file << strprintf("# mined on %s\n", EncodeDumpTime(chainActive.Tip()->nTime).c_str());
+ file << strprintf("# Wallet dump created by Bitcoin %s (%s)\n", CLIENT_BUILD, CLIENT_DATE);
+ file << strprintf("# * Created on %s\n", EncodeDumpTime(GetTime()));
+ file << strprintf("# * Best block at time of backup was %i (%s),\n", chainActive.Height(), chainActive.Tip()->GetBlockHash().ToString());
+ file << strprintf("# mined on %s\n", EncodeDumpTime(chainActive.Tip()->nTime));
file << "\n";
for (std::vector<std::pair<int64_t, CKeyID> >::const_iterator it = vKeyBirth.begin(); it != vKeyBirth.end(); it++) {
const CKeyID &keyid = it->second;
@@ -297,11 +304,11 @@ Value dumpwallet(const Array& params, bool fHelp)
CKey key;
if (pwalletMain->GetKey(keyid, key)) {
if (pwalletMain->mapAddressBook.count(keyid)) {
- file << strprintf("%s %s label=%s # addr=%s\n", CBitcoinSecret(key).ToString().c_str(), strTime.c_str(), EncodeDumpString(pwalletMain->mapAddressBook[keyid].name).c_str(), strAddr.c_str());
+ file << strprintf("%s %s label=%s # addr=%s\n", CBitcoinSecret(key).ToString(), strTime, EncodeDumpString(pwalletMain->mapAddressBook[keyid].name), strAddr);
} else if (setKeyPool.count(keyid)) {
- file << strprintf("%s %s reserve=1 # addr=%s\n", CBitcoinSecret(key).ToString().c_str(), strTime.c_str(), strAddr.c_str());
+ file << strprintf("%s %s reserve=1 # addr=%s\n", CBitcoinSecret(key).ToString(), strTime, strAddr);
} else {
- file << strprintf("%s %s change=1 # addr=%s\n", CBitcoinSecret(key).ToString().c_str(), strTime.c_str(), strAddr.c_str());
+ file << strprintf("%s %s change=1 # addr=%s\n", CBitcoinSecret(key).ToString(), strTime, strAddr);
}
}
}
diff --git a/src/rpcmisc.cpp b/src/rpcmisc.cpp
index f8a7d07fc3..353fb77b88 100644
--- a/src/rpcmisc.cpp
+++ b/src/rpcmisc.cpp
@@ -1,5 +1,5 @@
// Copyright (c) 2010 Satoshi Nakamoto
-// Copyright (c) 2009-2013 The Bitcoin developers
+// Copyright (c) 2009-2014 The Bitcoin developers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
@@ -199,11 +199,11 @@ CScript _createmultisig(const Array& params)
CKeyID keyID;
if (!address.GetKeyID(keyID))
throw runtime_error(
- strprintf("%s does not refer to a key",ks.c_str()));
+ strprintf("%s does not refer to a key",ks));
CPubKey vchPubKey;
if (!pwalletMain->GetPubKey(keyID, vchPubKey))
throw runtime_error(
- strprintf("no full public key for address %s",ks.c_str()));
+ strprintf("no full public key for address %s",ks));
if (!vchPubKey.IsFullyValid())
throw runtime_error(" Invalid public key: "+ks);
pubkeys[i] = vchPubKey;
diff --git a/src/rpcnet.cpp b/src/rpcnet.cpp
index 06ae7070c3..738b966b8a 100644
--- a/src/rpcnet.cpp
+++ b/src/rpcnet.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2009-2013 The Bitcoin developers
+// Copyright (c) 2009-2014 The Bitcoin developers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
@@ -15,8 +15,6 @@
#include "wallet.h" // for getinfo
#endif
-#include <inttypes.h>
-
#include <boost/foreach.hpp>
#include "json/json_spirit_value.h"
@@ -47,7 +45,7 @@ Value ping(const Array& params, bool fHelp)
"ping\n"
"\nRequests that a ping be sent to all other nodes, to measure ping time.\n"
"Results provided in getpeerinfo, pingtime and pingwait fields are decimal seconds.\n"
- "Ping command is handled in queue with all other commands, so it measures processing backlog, not just network ping."
+ "Ping command is handled in queue with all other commands, so it measures processing backlog, not just network ping.\n"
"\nExamples:\n"
+ HelpExampleCli("ping", "")
+ HelpExampleRpc("ping", "")
@@ -255,16 +253,18 @@ Value getaddednodeinfo(const Array& params, bool fHelp)
throw JSONRPCError(RPC_CLIENT_NODE_NOT_ADDED, "Error: Node has not been added.");
}
+ Array ret;
if (!fDns)
{
- Object ret;
BOOST_FOREACH(string& strAddNode, laddedNodes)
- ret.push_back(Pair("addednode", strAddNode));
+ {
+ Object obj;
+ obj.push_back(Pair("addednode", strAddNode));
+ ret.push_back(obj);
+ }
return ret;
}
- Array ret;
-
list<pair<string, vector<CService> > > laddedAddreses(0);
BOOST_FOREACH(string& strAddNode, laddedNodes)
{
diff --git a/src/rpcprotocol.cpp b/src/rpcprotocol.cpp
index 4a2241edaa..4ea84e99be 100644
--- a/src/rpcprotocol.cpp
+++ b/src/rpcprotocol.cpp
@@ -1,5 +1,5 @@
// Copyright (c) 2010 Satoshi Nakamoto
-// Copyright (c) 2009-2013 The Bitcoin developers
+// Copyright (c) 2009-2014 The Bitcoin developers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
@@ -81,7 +81,7 @@ string HTTPReply(int nStatus, const string& strMsg, bool keepalive)
"<META HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=ISO-8859-1'>\r\n"
"</HEAD>\r\n"
"<BODY><H1>401 Unauthorized.</H1></BODY>\r\n"
- "</HTML>\r\n", rfc1123Time().c_str(), FormatFullVersion().c_str());
+ "</HTML>\r\n", rfc1123Time(), FormatFullVersion());
const char *cStatus;
if (nStatus == HTTP_OK) cStatus = "OK";
else if (nStatus == HTTP_BAD_REQUEST) cStatus = "Bad Request";
@@ -100,11 +100,11 @@ string HTTPReply(int nStatus, const string& strMsg, bool keepalive)
"%s",
nStatus,
cStatus,
- rfc1123Time().c_str(),
+ rfc1123Time(),
keepalive ? "keep-alive" : "close",
strMsg.size(),
- FormatFullVersion().c_str(),
- strMsg.c_str());
+ FormatFullVersion(),
+ strMsg);
}
bool ReadHTTPRequestLine(std::basic_istream<char>& stream, int &proto,
diff --git a/src/rpcprotocol.h b/src/rpcprotocol.h
index 6bf371e759..80cdb34f15 100644
--- a/src/rpcprotocol.h
+++ b/src/rpcprotocol.h
@@ -1,5 +1,5 @@
// Copyright (c) 2010 Satoshi Nakamoto
-// Copyright (c) 2009-2013 The Bitcoin developers
+// Copyright (c) 2009-2014 The Bitcoin developers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
@@ -49,7 +49,6 @@ enum RPCErrorCode
RPC_INVALID_PARAMETER = -8, // Invalid, missing or duplicate parameter
RPC_DATABASE_ERROR = -20, // Database error
RPC_DESERIALIZATION_ERROR = -22, // Error parsing or validating structure in raw format
- RPC_SERVER_NOT_STARTED = -18, // RPC server was not started (StartRPCThreads() not called)
// P2P client errors
RPC_CLIENT_NOT_CONNECTED = -9, // Bitcoin is not connected
diff --git a/src/rpcrawtransaction.cpp b/src/rpcrawtransaction.cpp
index ff652ca34d..837aee7eaa 100644
--- a/src/rpcrawtransaction.cpp
+++ b/src/rpcrawtransaction.cpp
@@ -1,5 +1,5 @@
// Copyright (c) 2010 Satoshi Nakamoto
-// Copyright (c) 2009-2013 The Bitcoin developers
+// Copyright (c) 2009-2014 The Bitcoin developers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
@@ -522,7 +522,7 @@ Value signrawtransaction(const Array& params, bool fHelp)
"\nArguments:\n"
"1. \"hexstring\" (string, required) The transaction hex string\n"
"2. \"prevtxs\" (string, optional) An json array of previous dependent transaction outputs\n"
- " [ (json array of json objects)\n"
+ " [ (json array of json objects, or 'null' if none provided)\n"
" {\n"
" \"txid\":\"id\", (string, required) The transaction id\n"
" \"vout\":n, (numeric, required) The output number\n"
@@ -532,7 +532,7 @@ Value signrawtransaction(const Array& params, bool fHelp)
" ,...\n"
" ]\n"
"3. \"privatekeys\" (string, optional) A json array of base58-encoded private keys for signing\n"
- " [ (json array of strings)\n"
+ " [ (json array of strings, or 'null' if none provided)\n"
" \"privatekey\" (string) private key in base58-encoding\n"
" ,...\n"
" ]\n"
diff --git a/src/rpcserver.cpp b/src/rpcserver.cpp
index 9d34a900ff..4d110124b2 100644
--- a/src/rpcserver.cpp
+++ b/src/rpcserver.cpp
@@ -1,5 +1,5 @@
// Copyright (c) 2010 Satoshi Nakamoto
-// Copyright (c) 2009-2013 The Bitcoin developers
+// Copyright (c) 2009-2014 The Bitcoin developers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
@@ -38,6 +38,7 @@ static asio::io_service* rpc_io_service = NULL;
static map<string, boost::shared_ptr<deadline_timer> > deadlineTimers;
static ssl::context* rpc_ssl_context = NULL;
static boost::thread_group* rpc_worker_group = NULL;
+static boost::asio::io_service::work *rpc_dummy_work = NULL;
void RPCTypeCheck(const Array& params,
const list<Value_type>& typesExpected,
@@ -68,12 +69,12 @@ void RPCTypeCheck(const Object& o,
{
const Value& v = find_value(o, t.first);
if (!fAllowNull && v.type() == null_type)
- throw JSONRPCError(RPC_TYPE_ERROR, strprintf("Missing %s", t.first.c_str()));
+ throw JSONRPCError(RPC_TYPE_ERROR, strprintf("Missing %s", t.first));
if (!((v.type() == t.second) || (fAllowNull && (v.type() == null_type))))
{
string err = strprintf("Expected type %s for %s, got %s",
- Value_type_name[t.second], t.first.c_str(), Value_type_name[v.type()]);
+ Value_type_name[t.second], t.first, Value_type_name[v.type()]);
throw JSONRPCError(RPC_TYPE_ERROR, err);
}
}
@@ -175,7 +176,7 @@ string CRPCTable::help(string strCommand) const
}
}
if (strRet == "")
- strRet = strprintf("help: unknown command: %s\n", strCommand.c_str());
+ strRet = strprintf("help: unknown command: %s\n", strCommand);
strRet = strRet.substr(0,strRet.size()-1);
return strRet;
}
@@ -512,9 +513,9 @@ void StartRPCThreads()
"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()),
+ strWhatAmI,
+ GetConfigFile().string(),
+ EncodeBase58(&rand_pwd[0],&rand_pwd[0]+32)),
"", CClientUIInterface::MSG_ERROR);
StartShutdown();
return;
@@ -533,12 +534,12 @@ void StartRPCThreads()
filesystem::path pathCertFile(GetArg("-rpcsslcertificatechainfile", "server.cert"));
if (!pathCertFile.is_complete()) pathCertFile = filesystem::path(GetDataDir()) / pathCertFile;
if (filesystem::exists(pathCertFile)) rpc_ssl_context->use_certificate_chain_file(pathCertFile.string());
- else LogPrintf("ThreadRPCServer ERROR: missing server certificate file %s\n", pathCertFile.string().c_str());
+ else LogPrintf("ThreadRPCServer ERROR: missing server certificate file %s\n", pathCertFile.string());
filesystem::path pathPKFile(GetArg("-rpcsslprivatekeyfile", "server.pem"));
if (!pathPKFile.is_complete()) pathPKFile = filesystem::path(GetDataDir()) / pathPKFile;
if (filesystem::exists(pathPKFile)) rpc_ssl_context->use_private_key_file(pathPKFile.string(), ssl::context::pem);
- else LogPrintf("ThreadRPCServer ERROR: missing server private key file %s\n", pathPKFile.string().c_str());
+ else LogPrintf("ThreadRPCServer ERROR: missing server private key file %s\n", pathPKFile.string());
string strCiphers = GetArg("-rpcsslciphers", "TLSv1.2+HIGH:TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!3DES:@STRENGTH");
SSL_CTX_set_cipher_list(rpc_ssl_context->impl(), strCiphers.c_str());
@@ -607,6 +608,19 @@ void StartRPCThreads()
rpc_worker_group->create_thread(boost::bind(&asio::io_service::run, rpc_io_service));
}
+void StartDummyRPCThread()
+{
+ if(rpc_io_service == NULL)
+ {
+ rpc_io_service = new asio::io_service();
+ /* Create dummy "work" to keep the thread from exiting when no timeouts active,
+ * see http://www.boost.org/doc/libs/1_51_0/doc/html/boost_asio/reference/io_service.html#boost_asio.reference.io_service.stopping_the_io_service_from_running_out_of_work */
+ rpc_dummy_work = new asio::io_service::work(*rpc_io_service);
+ rpc_worker_group = new boost::thread_group();
+ rpc_worker_group->create_thread(boost::bind(&asio::io_service::run, rpc_io_service));
+ }
+}
+
void StopRPCThreads()
{
if (rpc_io_service == NULL) return;
@@ -615,6 +629,7 @@ void StopRPCThreads()
rpc_io_service->stop();
if (rpc_worker_group != NULL)
rpc_worker_group->join_all();
+ delete rpc_dummy_work; rpc_dummy_work = NULL;
delete rpc_worker_group; rpc_worker_group = NULL;
delete rpc_ssl_context; rpc_ssl_context = NULL;
delete rpc_io_service; rpc_io_service = NULL;
@@ -668,7 +683,7 @@ void JSONRequest::parse(const Value& valRequest)
throw JSONRPCError(RPC_INVALID_REQUEST, "Method must be a string");
strMethod = valMethod.get_str();
if (strMethod != "getwork" && strMethod != "getblocktemplate")
- LogPrint("rpc", "ThreadRPCServer method=%s\n", strMethod.c_str());
+ LogPrint("rpc", "ThreadRPCServer method=%s\n", strMethod);
// Parse params
Value valParams = find_value(request, "params");
@@ -743,7 +758,7 @@ void ServiceConnection(AcceptedConnection *conn)
}
if (!HTTPAuthorized(mapHeaders))
{
- LogPrintf("ThreadRPCServer incorrect password attempt from %s\n", conn->peer_address_to_string().c_str());
+ LogPrintf("ThreadRPCServer incorrect password attempt from %s\n", conn->peer_address_to_string());
/* Deter brute-forcing short passwords.
If this results in a DoS the user really
shouldn't have their RPC port exposed. */
diff --git a/src/rpcserver.h b/src/rpcserver.h
index 9087be9e88..0dd583c8eb 100644
--- a/src/rpcserver.h
+++ b/src/rpcserver.h
@@ -1,5 +1,5 @@
// Copyright (c) 2010 Satoshi Nakamoto
-// Copyright (c) 2009-2013 The Bitcoin developers
+// Copyright (c) 2009-2014 The Bitcoin developers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
@@ -20,7 +20,14 @@
class CBlockIndex;
+/* Start RPC threads */
void StartRPCThreads();
+/* Alternative to StartRPCThreads for the GUI, when no server is
+ * used. The RPC thread in this case is only used to handle timeouts.
+ * If real RPC threads have already been started this is a no-op.
+ */
+void StartDummyRPCThread();
+/* Stop RPC threads */
void StopRPCThreads();
/*
diff --git a/src/rpcwallet.cpp b/src/rpcwallet.cpp
index 8ad5c9c51d..7b605af589 100644
--- a/src/rpcwallet.cpp
+++ b/src/rpcwallet.cpp
@@ -1,5 +1,5 @@
// Copyright (c) 2010 Satoshi Nakamoto
-// Copyright (c) 2009-2013 The Bitcoin developers
+// Copyright (c) 2009-2014 The Bitcoin developers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
@@ -45,13 +45,18 @@ void WalletTxToJSON(const CWalletTx& wtx, Object& entry)
entry.push_back(Pair("confirmations", confirms));
if (wtx.IsCoinBase())
entry.push_back(Pair("generated", true));
- if (confirms)
+ if (confirms > 0)
{
entry.push_back(Pair("blockhash", wtx.hashBlock.GetHex()));
entry.push_back(Pair("blockindex", wtx.nIndex));
entry.push_back(Pair("blocktime", (boost::int64_t)(mapBlockIndex[wtx.hashBlock]->nTime)));
}
- entry.push_back(Pair("txid", wtx.GetHash().GetHex()));
+ uint256 hash = wtx.GetHash();
+ entry.push_back(Pair("txid", hash.GetHex()));
+ Array conflicts;
+ BOOST_FOREACH(const uint256& conflict, wtx.GetConflicts())
+ conflicts.push_back(conflict.GetHex());
+ entry.push_back(Pair("walletconflicts", conflicts));
entry.push_back(Pair("time", (boost::int64_t)wtx.GetTxTime()));
entry.push_back(Pair("timereceived", (boost::int64_t)wtx.nTimeReceived));
BOOST_FOREACH(const PAIRTYPE(string,string)& item, wtx.mapValue)
@@ -589,13 +594,15 @@ Value getbalance(const Array& params, bool fHelp)
"Note that the account \"\" is not the same as leaving the parameter out.\n"
"The server total may be different to the balance in the default \"\" account.\n"
"\nArguments:\n"
- "1. \"account\" (string, optional) The selected account. It may be the default account using \"\".\n"
+ "1. \"account\" (string, optional) The selected account, or \"*\" for entire wallet. It may be the default account using \"\".\n"
"2. minconf (numeric, optional, default=1) Only include transactions confirmed at least this many times.\n"
"\nResult:\n"
"amount (numeric) The total amount in btc received for this account.\n"
"\nExamples:\n"
"\nThe total amount in the server across all accounts\n"
+ HelpExampleCli("getbalance", "") +
+ "\nThe total amount in the server across all accounts, with at least 5 confirmations\n"
+ + HelpExampleCli("getbalance", "\"*\" 6") +
"\nThe total amount in the default account with at least 1 confirmation\n"
+ HelpExampleCli("getbalance", "\"\"") +
"\nThe total amount in the account named tabby with at least 6 confirmations\n"
@@ -619,7 +626,7 @@ Value getbalance(const Array& params, bool fHelp)
for (map<uint256, CWalletTx>::iterator it = pwalletMain->mapWallet.begin(); it != pwalletMain->mapWallet.end(); ++it)
{
const CWalletTx& wtx = (*it).second;
- if (!wtx.IsConfirmed())
+ if (!wtx.IsTrusted() || wtx.GetBlocksToMaturity() > 0)
continue;
int64_t allFee;
@@ -1139,7 +1146,9 @@ void ListTransactions(const CWalletTx& wtx, const string& strAccount, int nMinDe
entry.push_back(Pair("category", "generate"));
}
else
+ {
entry.push_back(Pair("category", "receive"));
+ }
entry.push_back(Pair("amount", ValueFromAmount(r.second)));
if (fLong)
WalletTxToJSON(wtx, entry);
@@ -1315,6 +1324,8 @@ Value listaccounts(const Array& params, bool fHelp)
string strSentAccount;
list<pair<CTxDestination, int64_t> > listReceived;
list<pair<CTxDestination, int64_t> > listSent;
+ if (wtx.GetBlocksToMaturity() > 0)
+ continue;
wtx.GetAmounts(listReceived, listSent, nFee, strSentAccount);
mapAccountBalances[strSentAccount] -= nFee;
BOOST_FOREACH(const PAIRTYPE(CTxDestination, int64_t)& s, listSent)
@@ -1446,7 +1457,8 @@ Value gettransaction(const Array& params, bool fHelp)
" \"amount\" : x.xxx (numeric) The amount in btc\n"
" }\n"
" ,...\n"
- " ]\n"
+ " ],\n"
+ " \"hex\" : \"data\" (string) Raw data for transaction\n"
"}\n"
"\nbExamples\n"
@@ -1477,6 +1489,11 @@ Value gettransaction(const Array& params, bool fHelp)
ListTransactions(wtx, "*", 0, false, details);
entry.push_back(Pair("details", details));
+ CDataStream ssTx(SER_NETWORK, PROTOCOL_VERSION);
+ ssTx << static_cast<CTransaction>(wtx);
+ string strHex = HexStr(ssTx.begin(), ssTx.end());
+ entry.push_back(Pair("hex", strHex));
+
return entry;
}
@@ -1551,6 +1568,9 @@ Value walletpassphrase(const Array& params, bool fHelp)
"\nArguments:\n"
"1. \"passphrase\" (string, required) The wallet passphrase\n"
"2. timeout (numeric, required) The time to keep the decryption key in seconds.\n"
+ "\nNote:\n"
+ "Issuing the walletpassphrase command while the wallet is already unlocked will set a new unlock\n"
+ "time that overrides the old one.\n"
"\nExamples:\n"
"\nunlock the wallet for 60 seconds\n"
+ HelpExampleCli("walletpassphrase", "\"my pass phrase\" 60") +
@@ -1562,8 +1582,6 @@ Value walletpassphrase(const Array& params, bool fHelp)
if (fHelp)
return true;
- if (!fServer)
- throw JSONRPCError(RPC_SERVER_NOT_STARTED, "Error: RPC server was not started, use server=1 to change this.");
if (!pwalletMain->IsCrypted())
throw JSONRPCError(RPC_WALLET_WRONG_ENC_STATE, "Error: running with an unencrypted wallet, but walletpassphrase was called.");
@@ -1850,9 +1868,9 @@ Value settxfee(const Array& params, bool fHelp)
if (fHelp || params.size() < 1 || params.size() > 1)
throw runtime_error(
"settxfee amount\n"
- "\nSet the transaction fee. 'amount' is a real and is rounded to the nearest 0.00000001\n"
+ "\nSet the transaction fee per kB.\n"
"\nArguments:\n"
- "1. amount (numeric, required) The transaction fee in btc rounded to the nearest 0.00000001\n"
+ "1. amount (numeric, required) The transaction fee in BTC/kB rounded to the nearest 0.00000001\n"
"\nResult\n"
"true|false (boolean) Returns true if successful\n"
"\nExamples:\n"
diff --git a/src/script.cpp b/src/script.cpp
index 2b66bc73d6..f03a1e3cbb 100644
--- a/src/script.cpp
+++ b/src/script.cpp
@@ -1261,7 +1261,7 @@ bool Solver(const CScript& scriptPubKey, txnouttype& typeRet, vector<vector<unsi
// Template matching opcodes:
if (opcode2 == OP_PUBKEYS)
{
- while (vch1.size() >= 33 && vch1.size() <= 120)
+ while (vch1.size() >= 33 && vch1.size() <= 65)
{
vSolutionsRet.push_back(vch1);
if (!script1.GetOp(pc1, opcode1, vch1))
@@ -1275,7 +1275,7 @@ bool Solver(const CScript& scriptPubKey, txnouttype& typeRet, vector<vector<unsi
if (opcode2 == OP_PUBKEY)
{
- if (vch1.size() < 33 || vch1.size() > 120)
+ if (vch1.size() < 33 || vch1.size() > 65)
break;
vSolutionsRet.push_back(vch1);
}
@@ -1863,6 +1863,51 @@ bool CScript::IsPayToScriptHash() const
this->at(22) == OP_EQUAL);
}
+bool CScript::IsPushOnly() const
+{
+ const_iterator pc = begin();
+ while (pc < end())
+ {
+ opcodetype opcode;
+ if (!GetOp(pc, opcode))
+ return false;
+ // Note that IsPushOnly() *does* consider OP_RESERVED to be a
+ // push-type opcode, however execution of OP_RESERVED fails, so
+ // it's not relevant to P2SH as the scriptSig would fail prior to
+ // the P2SH special validation code being executed.
+ if (opcode > OP_16)
+ return false;
+ }
+ return true;
+}
+
+bool CScript::HasCanonicalPushes() const
+{
+ const_iterator pc = begin();
+ while (pc < end())
+ {
+ opcodetype opcode;
+ std::vector<unsigned char> data;
+ if (!GetOp(pc, opcode, data))
+ return false;
+ if (opcode > OP_16)
+ continue;
+ if (opcode < OP_PUSHDATA1 && opcode > OP_0 && (data.size() == 1 && data[0] <= 16))
+ // Could have used an OP_n code, rather than a 1-byte push.
+ return false;
+ if (opcode == OP_PUSHDATA1 && data.size() < OP_PUSHDATA1)
+ // Could have used a normal n-byte push, rather than OP_PUSHDATA1.
+ return false;
+ if (opcode == OP_PUSHDATA2 && data.size() <= 0xFF)
+ // Could have used an OP_PUSHDATA1.
+ return false;
+ if (opcode == OP_PUSHDATA4 && data.size() <= 0xFFFF)
+ // Could have used an OP_PUSHDATA2.
+ return false;
+ }
+ return true;
+}
+
class CScriptVisitor : public boost::static_visitor<bool>
{
private:
diff --git a/src/script.h b/src/script.h
index bd120cc07d..335ddfb1b2 100644
--- a/src/script.h
+++ b/src/script.h
@@ -541,24 +541,11 @@ public:
bool IsPayToScriptHash() const;
- // Called by IsStandardTx
- bool IsPushOnly() const
- {
- const_iterator pc = begin();
- while (pc < end())
- {
- opcodetype opcode;
- if (!GetOp(pc, opcode))
- return false;
- // Note that IsPushOnly() *does* consider OP_RESERVED to be a
- // push-type opcode, however execution of OP_RESERVED fails, so
- // it's not relevant to P2SH as the scriptSig would fail prior to
- // the P2SH special validation code being executed.
- if (opcode > OP_16)
- return false;
- }
- return true;
- }
+ // Called by IsStandardTx and P2SH VerifyScript (which makes it consensus-critical).
+ bool IsPushOnly() const;
+
+ // Called by IsStandardTx.
+ bool HasCanonicalPushes() const;
// Returns whether the script is guaranteed to fail at execution,
// regardless of the initial stack. This allows outputs to be pruned
diff --git a/src/sync.cpp b/src/sync.cpp
index b57d8c3c00..e624a9ee84 100644
--- a/src/sync.cpp
+++ b/src/sync.cpp
@@ -65,14 +65,14 @@ static void potential_deadlock_detected(const std::pair<void*, void*>& mismatch,
{
if (i.first == mismatch.first) LogPrintf(" (1)");
if (i.first == mismatch.second) LogPrintf(" (2)");
- LogPrintf(" %s\n", i.second.ToString().c_str());
+ LogPrintf(" %s\n", i.second.ToString());
}
LogPrintf("Current lock order is:\n");
BOOST_FOREACH(const PAIRTYPE(void*, CLockLocation)& i, s1)
{
if (i.first == mismatch.first) LogPrintf(" (1)");
if (i.first == mismatch.second) LogPrintf(" (2)");
- LogPrintf(" %s\n", i.second.ToString().c_str());
+ LogPrintf(" %s\n", i.second.ToString());
}
}
@@ -81,7 +81,7 @@ static void push_lock(void* c, const CLockLocation& locklocation, bool fTry)
if (lockstack.get() == NULL)
lockstack.reset(new LockStack);
- LogPrint("lock", "Locking: %s\n", locklocation.ToString().c_str());
+ LogPrint("lock", "Locking: %s\n", locklocation.ToString());
dd_mutex.lock();
(*lockstack).push_back(std::make_pair(c, locklocation));
@@ -111,7 +111,7 @@ static void pop_lock()
if (fDebug)
{
const CLockLocation& locklocation = (*lockstack).rbegin()->second;
- LogPrint("lock", "Unlocked: %s\n", locklocation.ToString().c_str());
+ LogPrint("lock", "Unlocked: %s\n", locklocation.ToString());
}
dd_mutex.lock();
(*lockstack).pop_back();
@@ -140,8 +140,9 @@ void AssertLockHeldInternal(const char *pszName, const char* pszFile, int nLine,
{
BOOST_FOREACH(const PAIRTYPE(void*, CLockLocation)&i, *lockstack)
if (i.first == cs) return;
- LogPrintf("Lock %s not held in %s:%i; locks held:\n%s", pszName, pszFile, nLine, LocksHeld().c_str());
- assert(0);
+ fprintf(stderr, "Assertion failed: lock %s not held in %s:%i; locks held:\n%s",
+ pszName, pszFile, nLine, LocksHeld().c_str());
+ abort();
}
#endif /* DEBUG_LOCKORDER */
diff --git a/src/test/accounting_tests.cpp b/src/test/accounting_tests.cpp
index 5f79436e48..bfdb95927b 100644
--- a/src/test/accounting_tests.cpp
+++ b/src/test/accounting_tests.cpp
@@ -34,6 +34,8 @@ BOOST_AUTO_TEST_CASE(acc_orderupgrade)
CAccountingEntry ae;
std::map<int64_t, CAccountingEntry> results;
+ LOCK(pwalletMain->cs_wallet);
+
ae.strAccount = "";
ae.nCreditDebit = 1;
ae.nTime = 1333333333;
diff --git a/src/test/base58_tests.cpp b/src/test/base58_tests.cpp
index 84db99d816..94e84049be 100644
--- a/src/test/base58_tests.cpp
+++ b/src/test/base58_tests.cpp
@@ -63,6 +63,12 @@ BOOST_AUTO_TEST_CASE(base58_DecodeBase58)
}
BOOST_CHECK(!DecodeBase58("invalid", result));
+
+ // check that DecodeBase58 skips whitespace, but still fails with unexpected non-whitespace at the end.
+ BOOST_CHECK(!DecodeBase58(" \t\n\v\f\r skip \r\f\v\n\t a", result));
+ BOOST_CHECK( DecodeBase58(" \t\n\v\f\r skip \r\f\v\n\t ", result));
+ std::vector<unsigned char> expected = ParseHex("971a55");
+ BOOST_CHECK_EQUAL_COLLECTIONS(result.begin(), result.end(), expected.begin(), expected.end());
}
// Visitor to check address type
diff --git a/src/test/data/tx_invalid.json b/src/test/data/tx_invalid.json
index e386f81fe6..faf40ef23d 100644
--- a/src/test/data/tx_invalid.json
+++ b/src/test/data/tx_invalid.json
@@ -70,5 +70,11 @@
["Incorrect signature order"],
["Note the input is just required to make the tester happy"],
[[["b3da01dd4aae683c7aee4d5d8b52a540a508e1115f77cd7fa9a291243f501223", 0, "HASH160 0x14 0xb1ce99298d5f07364b57b1e5c9cc00be0b04a954 EQUAL"]],
-"01000000012312503f2491a2a97fcd775f11e108a540a5528b5d4dee7a3c68ae4add01dab300000000fdfe000048304502207aacee820e08b0b174e248abd8d7a34ed63b5da3abedb99934df9fddd65c05c4022100dfe87896ab5ee3df476c2655f9fbe5bd089dccbef3e4ea05b5d121169fe7f5f401483045022100f6649b0eddfdfd4ad55426663385090d51ee86c3481bdc6b0c18ea6c0ece2c0b0220561c315b07cffa6f7dd9df96dbae9200c2dee09bf93cc35ca05e6cdf613340aa014c695221031d11db38972b712a9fe1fc023577c7ae3ddb4a3004187d41c45121eecfdbb5b7210207ec36911b6ad2382860d32989c7b8728e9489d7bbc94a6b5509ef0029be128821024ea9fac06f666a4adc3fc1357b7bec1fd0bdece2b9d08579226a8ebde53058e453aeffffffff0180380100000000001976a914c9b99cddf847d10685a4fabaa0baf505f7c3dfab88ac00000000", true]
+"01000000012312503f2491a2a97fcd775f11e108a540a5528b5d4dee7a3c68ae4add01dab300000000fdfe000048304502207aacee820e08b0b174e248abd8d7a34ed63b5da3abedb99934df9fddd65c05c4022100dfe87896ab5ee3df476c2655f9fbe5bd089dccbef3e4ea05b5d121169fe7f5f401483045022100f6649b0eddfdfd4ad55426663385090d51ee86c3481bdc6b0c18ea6c0ece2c0b0220561c315b07cffa6f7dd9df96dbae9200c2dee09bf93cc35ca05e6cdf613340aa014c695221031d11db38972b712a9fe1fc023577c7ae3ddb4a3004187d41c45121eecfdbb5b7210207ec36911b6ad2382860d32989c7b8728e9489d7bbc94a6b5509ef0029be128821024ea9fac06f666a4adc3fc1357b7bec1fd0bdece2b9d08579226a8ebde53058e453aeffffffff0180380100000000001976a914c9b99cddf847d10685a4fabaa0baf505f7c3dfab88ac00000000", true],
+
+["Empty stack when we try to run CHECKSIG"],
+[[["ad503f72c18df5801ee64d76090afe4c607fb2b822e9b7b63c5826c50e22fc3b", 0, "0x21 0x027c3a97665bf283a102a587a62a30a0c102d4d3b141015e2cae6f64e2543113e5 CHECKSIG NOT"]],
+"01000000013bfc220ec526583cb6b7e922b8b27f604cfe0a09764de61e80f58dc1723f50ad0000000000ffffffff0101000000000000002321027c3a97665bf283a102a587a62a30a0c102d4d3b141015e2cae6f64e2543113e5ac00000000", true],
+
+["Make diffs cleaner by leaving a comment here without comma at the end"]
]
diff --git a/src/test/data/tx_valid.json b/src/test/data/tx_valid.json
index c33a7a035a..c206f7a722 100644
--- a/src/test/data/tx_valid.json
+++ b/src/test/data/tx_valid.json
@@ -92,5 +92,31 @@
["Correct signature order"],
["Note the input is just required to make the tester happy"],
[[["b3da01dd4aae683c7aee4d5d8b52a540a508e1115f77cd7fa9a291243f501223", 0, "HASH160 0x14 0xb1ce99298d5f07364b57b1e5c9cc00be0b04a954 EQUAL"]],
-"01000000012312503f2491a2a97fcd775f11e108a540a5528b5d4dee7a3c68ae4add01dab300000000fdfe0000483045022100f6649b0eddfdfd4ad55426663385090d51ee86c3481bdc6b0c18ea6c0ece2c0b0220561c315b07cffa6f7dd9df96dbae9200c2dee09bf93cc35ca05e6cdf613340aa0148304502207aacee820e08b0b174e248abd8d7a34ed63b5da3abedb99934df9fddd65c05c4022100dfe87896ab5ee3df476c2655f9fbe5bd089dccbef3e4ea05b5d121169fe7f5f4014c695221031d11db38972b712a9fe1fc023577c7ae3ddb4a3004187d41c45121eecfdbb5b7210207ec36911b6ad2382860d32989c7b8728e9489d7bbc94a6b5509ef0029be128821024ea9fac06f666a4adc3fc1357b7bec1fd0bdece2b9d08579226a8ebde53058e453aeffffffff0180380100000000001976a914c9b99cddf847d10685a4fabaa0baf505f7c3dfab88ac00000000", true]
+"01000000012312503f2491a2a97fcd775f11e108a540a5528b5d4dee7a3c68ae4add01dab300000000fdfe0000483045022100f6649b0eddfdfd4ad55426663385090d51ee86c3481bdc6b0c18ea6c0ece2c0b0220561c315b07cffa6f7dd9df96dbae9200c2dee09bf93cc35ca05e6cdf613340aa0148304502207aacee820e08b0b174e248abd8d7a34ed63b5da3abedb99934df9fddd65c05c4022100dfe87896ab5ee3df476c2655f9fbe5bd089dccbef3e4ea05b5d121169fe7f5f4014c695221031d11db38972b712a9fe1fc023577c7ae3ddb4a3004187d41c45121eecfdbb5b7210207ec36911b6ad2382860d32989c7b8728e9489d7bbc94a6b5509ef0029be128821024ea9fac06f666a4adc3fc1357b7bec1fd0bdece2b9d08579226a8ebde53058e453aeffffffff0180380100000000001976a914c9b99cddf847d10685a4fabaa0baf505f7c3dfab88ac00000000", true],
+
+["cc60b1f899ec0a69b7c3f25ddf32c4524096a9c5b01cbd84c6d0312a0c478984, which is a fairly strange transaction which relies on OP_CHECKSIG returning 0 when checking a completely invalid sig of length 0"],
+[[["cbebc4da731e8995fe97f6fadcd731b36ad40e5ecb31e38e904f6e5982fa09f7", 0, "0x2102085c6600657566acc2d6382a47bc3f324008d2aa10940dd7705a48aa2a5a5e33ac7c2103f5d0fb955f95dd6be6115ce85661db412ec6a08abcbfce7da0ba8297c6cc0ec4ac7c5379a820d68df9e32a147cffa36193c6f7c43a1c8c69cda530e1c6db354bfabdcfefaf3c875379a820f531f3041d3136701ea09067c53e7159c8f9b2746a56c3d82966c54bbc553226879a5479827701200122a59a5379827701200122a59a6353798277537982778779679a68"]],
+"0100000001f709fa82596e4f908ee331cb5e0ed46ab331d7dcfaf697fe95891e73dac4ebcb000000008c20ca42095840735e89283fec298e62ac2ddea9b5f34a8cbb7097ad965b87568100201b1b01dc829177da4a14551d2fc96a9db00c6501edfa12f22cd9cefd335c227f483045022100a9df60536df5733dd0de6bc921fab0b3eee6426501b43a228afa2c90072eb5ca02201c78b74266fac7d1db5deff080d8a403743203f109fbcabf6d5a760bf87386d20100ffffffff01c075790000000000232103611f9a45c18f28f06f19076ad571c344c82ce8fcfe34464cf8085217a2d294a6ac00000000", true],
+
+["Empty pubkey"],
+[[["229257c295e7f555421c1bfec8538dd30a4b5c37c1c8810bbe83cafa7811652c", 0, "0x00 CHECKSIG NOT"]],
+"01000000012c651178faca83be0b81c8c1375c4b0ad38d53c8fe1b1c4255f5e795c25792220000000049483045022100d6044562284ac76c985018fc4a90127847708c9edb280996c507b28babdc4b2a02203d74eca3f1a4d1eea7ff77b528fde6d5dc324ec2dbfdb964ba885f643b9704cd01ffffffff010100000000000000232102c2410f8891ae918cab4ffc4bb4a3b0881be67c7a1e7faa8b5acf9ab8932ec30cac00000000", true],
+
+["Empty signature"],
+[[["9ca93cfd8e3806b9d9e2ba1cf64e3cc6946ee0119670b1796a09928d14ea25f7", 0, "0x21 0x028a1d66975dbdf97897e3a4aef450ebeb5b5293e4a0b4a6d3a2daaa0b2b110e02 CHECKSIG NOT"]],
+"0100000001f725ea148d92096a79b1709611e06e94c63c4ef61cbae2d9b906388efd3ca99c000000000100ffffffff0101000000000000002321028a1d66975dbdf97897e3a4aef450ebeb5b5293e4a0b4a6d3a2daaa0b2b110e02ac00000000", true],
+
+[[["444e00ed7840d41f20ecd9c11d3f91982326c731a02f3c05748414a4fa9e59be", 0, "1 0x00 0x21 0x02136b04758b0b6e363e7a6fbe83aaf527a153db2b060d36cc29f7f8309ba6e458 2 CHECKMULTISIG"]],
+"0100000001be599efaa4148474053c2fa031c7262398913f1dc1d9ec201fd44078ed004e44000000004900473044022022b29706cb2ed9ef0cb3c97b72677ca2dfd7b4160f7b4beb3ba806aa856c401502202d1e52582412eba2ed474f1f437a427640306fd3838725fab173ade7fe4eae4a01ffffffff010100000000000000232103ac4bba7e7ca3e873eea49e08132ad30c7f03640b6539e9b59903cf14fd016bbbac00000000", true],
+
+[[["e16abbe80bf30c080f63830c8dbf669deaef08957446e95940227d8c5e6db612", 0, "1 0x21 0x03905380c7013e36e6e19d305311c1b81fce6581f5ee1c86ef0627c68c9362fc9f 0x00 2 CHECKMULTISIG"]],
+"010000000112b66d5e8c7d224059e946749508efea9d66bf8d0c83630f080cf30be8bb6ae100000000490047304402206ffe3f14caf38ad5c1544428e99da76ffa5455675ec8d9780fac215ca17953520220779502985e194d84baa36b9bd40a0dbd981163fa191eb884ae83fc5bd1c86b1101ffffffff010100000000000000232103905380c7013e36e6e19d305311c1b81fce6581f5ee1c86ef0627c68c9362fc9fac00000000", true],
+
+[[["ebbcf4bfce13292bd791d6a65a2a858d59adbf737e387e40370d4e64cc70efb0", 0, "2 0x21 0x033bcaa0a602f0d44cc9d5637c6e515b0471db514c020883830b7cefd73af04194 0x21 0x03a88b326f8767f4f192ce252afe33c94d25ab1d24f27f159b3cb3aa691ffe1423 2 CHECKMULTISIG NOT"]],
+"0100000001b0ef70cc644e0d37407e387e73bfad598d852a5aa6d691d72b2913cebff4bceb000000004a00473044022068cd4851fc7f9a892ab910df7a24e616f293bcb5c5fbdfbc304a194b26b60fba022078e6da13d8cb881a22939b952c24f88b97afd06b4c47a47d7f804c9a352a6d6d0100ffffffff0101000000000000002321033bcaa0a602f0d44cc9d5637c6e515b0471db514c020883830b7cefd73af04194ac00000000", true],
+
+[[["ba4cd7ae2ad4d4d13ebfc8ab1d93a63e4a6563f25089a18bf0fc68f282aa88c1", 0, "2 0x21 0x037c615d761e71d38903609bf4f46847266edc2fb37532047d747ba47eaae5ffe1 0x21 0x02edc823cd634f2c4033d94f5755207cb6b60c4b1f1f056ad7471c47de5f2e4d50 2 CHECKMULTISIG NOT"]],
+"0100000001c188aa82f268fcf08ba18950f263654a3ea6931dabc8bf3ed1d4d42aaed74cba000000004b0000483045022100940378576e069aca261a6b26fb38344e4497ca6751bb10905c76bb689f4222b002204833806b014c26fd801727b792b1260003c55710f87c5adbd7a9cb57446dbc9801ffffffff0101000000000000002321037c615d761e71d38903609bf4f46847266edc2fb37532047d747ba47eaae5ffe1ac00000000", true],
+
+["Make diffs cleaner by leaving a comment here without comma at the end"]
]
diff --git a/src/test/miner_tests.cpp b/src/test/miner_tests.cpp
index 8e3091d555..d35137a663 100644
--- a/src/test/miner_tests.cpp
+++ b/src/test/miner_tests.cpp
@@ -51,7 +51,7 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity)
{
CScript scriptPubKey = CScript() << ParseHex("04678afdb0fe5548271967f1a67130b7105cd6a828e03909a67962e0ea1f61deb649f6bc3f4cef38c4f35504e51ec112de5c384df7ba0b8d578a4c702b6bf11d5f") << OP_CHECKSIG;
CBlockTemplate *pblocktemplate;
- CTransaction tx;
+ CTransaction tx,tx2;
CScript script;
uint256 hash;
@@ -204,8 +204,57 @@ BOOST_AUTO_TEST_CASE(CreateNewBlock_validity)
delete pblocktemplate;
chainActive.Tip()->nHeight = nHeight;
+ // non-final txs in mempool
+ SetMockTime(chainActive.Tip()->GetMedianTimePast()+1);
+
+ // height locked
+ tx.vin[0].prevout.hash = txFirst[0]->GetHash();
+ tx.vin[0].scriptSig = CScript() << OP_1;
+ tx.vin[0].nSequence = 0;
+ tx.vout[0].nValue = 4900000000LL;
+ tx.vout[0].scriptPubKey = CScript() << OP_1;
+ tx.nLockTime = chainActive.Tip()->nHeight+1;
+ hash = tx.GetHash();
+ mempool.addUnchecked(hash, CTxMemPoolEntry(tx, 11, GetTime(), 111.0, 11));
+ BOOST_CHECK(!IsFinalTx(tx, chainActive.Tip()->nHeight + 1));
+
+ // time locked
+ tx2.vin.resize(1);
+ tx2.vin[0].prevout.hash = txFirst[1]->GetHash();
+ tx2.vin[0].prevout.n = 0;
+ tx2.vin[0].scriptSig = CScript() << OP_1;
+ tx2.vin[0].nSequence = 0;
+ tx2.vout.resize(1);
+ tx2.vout[0].nValue = 4900000000LL;
+ tx2.vout[0].scriptPubKey = CScript() << OP_1;
+ tx2.nLockTime = chainActive.Tip()->GetMedianTimePast()+1;
+ hash = tx2.GetHash();
+ mempool.addUnchecked(hash, CTxMemPoolEntry(tx2, 11, GetTime(), 111.0, 11));
+ BOOST_CHECK(!IsFinalTx(tx2));
+
+ BOOST_CHECK(pblocktemplate = CreateNewBlock(scriptPubKey));
+
+ // Neither tx should have make it into the template.
+ BOOST_CHECK_EQUAL(pblocktemplate->block.vtx.size(), 1);
+ delete pblocktemplate;
+
+ // However if we advance height and time by one, both will.
+ chainActive.Tip()->nHeight++;
+ SetMockTime(chainActive.Tip()->GetMedianTimePast()+2);
+
+ BOOST_CHECK(IsFinalTx(tx, chainActive.Tip()->nHeight + 1));
+ BOOST_CHECK(IsFinalTx(tx2));
+
+ BOOST_CHECK(pblocktemplate = CreateNewBlock(scriptPubKey));
+ BOOST_CHECK_EQUAL(pblocktemplate->block.vtx.size(), 3);
+ delete pblocktemplate;
+
+ chainActive.Tip()->nHeight--;
+ SetMockTime(0);
+
BOOST_FOREACH(CTransaction *tx, txFirst)
delete tx;
+
}
BOOST_AUTO_TEST_CASE(sha256transform_equality)
diff --git a/src/test/rpc_wallet_tests.cpp b/src/test/rpc_wallet_tests.cpp
index 2cf0fb350b..628ba95067 100644
--- a/src/test/rpc_wallet_tests.cpp
+++ b/src/test/rpc_wallet_tests.cpp
@@ -2,6 +2,7 @@
#include "rpcclient.h"
#include "base58.h"
+#include "wallet.h"
#include <boost/algorithm/string.hpp>
#include <boost/test/unit_test.hpp>
@@ -12,10 +13,14 @@ using namespace json_spirit;
extern Array createArgs(int nRequired, const char* address1=NULL, const char* address2=NULL);
extern Value CallRPC(string args);
+extern CWallet* pwalletMain;
+
BOOST_AUTO_TEST_SUITE(rpc_wallet_tests)
BOOST_AUTO_TEST_CASE(rpc_addmultisig)
{
+ LOCK(pwalletMain->cs_wallet);
+
rpcfn_type addmultisig = tableRPC["addmultisigaddress"]->actor;
// old, 65-byte-long:
@@ -56,6 +61,8 @@ BOOST_AUTO_TEST_CASE(rpc_wallet)
// Test RPC calls for various wallet statistics
Value r;
+ LOCK(pwalletMain->cs_wallet);
+
BOOST_CHECK_NO_THROW(CallRPC("listunspent"));
BOOST_CHECK_THROW(CallRPC("listunspent string"), runtime_error);
BOOST_CHECK_THROW(CallRPC("listunspent 0 string"), runtime_error);
diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp
index dee0f110ad..dd1b613047 100644
--- a/src/test/script_tests.cpp
+++ b/src/test/script_tests.cpp
@@ -438,4 +438,22 @@ BOOST_AUTO_TEST_CASE(script_combineSigs)
BOOST_CHECK(combined == partial3c);
}
+BOOST_AUTO_TEST_CASE(script_standard_push)
+{
+ for (int i=0; i<1000; i++) {
+ CScript script;
+ script << i;
+ BOOST_CHECK_MESSAGE(script.IsPushOnly(), "Number " << i << " is not pure push.");
+ BOOST_CHECK_MESSAGE(script.HasCanonicalPushes(), "Number " << i << " push is not canonical.");
+ }
+
+ for (int i=0; i<1000; i++) {
+ std::vector<unsigned char> data(i, '\111');
+ CScript script;
+ script << data;
+ BOOST_CHECK_MESSAGE(script.IsPushOnly(), "Length " << i << " is not pure push.");
+ BOOST_CHECK_MESSAGE(script.HasCanonicalPushes(), "Length " << i << " push is not canonical.");
+ }
+}
+
BOOST_AUTO_TEST_SUITE_END()
diff --git a/src/test/transaction_tests.cpp b/src/test/transaction_tests.cpp
index ad33184bc5..5212dfc70d 100644
--- a/src/test/transaction_tests.cpp
+++ b/src/test/transaction_tests.cpp
@@ -271,10 +271,10 @@ BOOST_AUTO_TEST_CASE(test_IsStandard)
string reason;
BOOST_CHECK(IsStandardTx(t, reason));
- t.vout[0].nValue = 5011; // dust
+ t.vout[0].nValue = 501; // dust
BOOST_CHECK(!IsStandardTx(t, reason));
- t.vout[0].nValue = 6011; // not dust
+ t.vout[0].nValue = 601; // not dust
BOOST_CHECK(IsStandardTx(t, reason));
t.vout[0].scriptPubKey = CScript() << OP_1;
diff --git a/src/test/wallet_tests.cpp b/src/test/wallet_tests.cpp
index 0acd94ef36..bd0517ae08 100644
--- a/src/test/wallet_tests.cpp
+++ b/src/test/wallet_tests.cpp
@@ -62,6 +62,8 @@ BOOST_AUTO_TEST_CASE(coin_selection_tests)
CoinSet setCoinsRet, setCoinsRet2;
int64_t nValueRet;
+ LOCK(wallet.cs_wallet);
+
// test multiple times to allow for differences in the shuffle order
for (int i = 0; i < RUN_TESTS; i++)
{
diff --git a/src/tinyformat.h b/src/tinyformat.h
new file mode 100644
index 0000000000..04b51f0adc
--- /dev/null
+++ b/src/tinyformat.h
@@ -0,0 +1,1010 @@
+// tinyformat.h
+// Copyright (C) 2011, Chris Foster [chris42f (at) gmail (d0t) com]
+//
+// Boost Software License - Version 1.0
+//
+// Permission is hereby granted, free of charge, to any person or organization
+// obtaining a copy of the software and accompanying documentation covered by
+// this license (the "Software") to use, reproduce, display, distribute,
+// execute, and transmit the Software, and to prepare derivative works of the
+// Software, and to permit third-parties to whom the Software is furnished to
+// do so, all subject to the following:
+//
+// The copyright notices in the Software and this entire statement, including
+// the above license grant, this restriction and the following disclaimer,
+// must be included in all copies of the Software, in whole or in part, and
+// all derivative works of the Software, unless such copies or derivative
+// works are solely in the form of machine-executable object code generated by
+// a source language processor.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+//------------------------------------------------------------------------------
+// Tinyformat: A minimal type safe printf replacement
+//
+// tinyformat.h is a type safe printf replacement library in a single C++
+// header file. Design goals include:
+//
+// * Type safety and extensibility for user defined types.
+// * C99 printf() compatibility, to the extent possible using std::ostream
+// * Simplicity and minimalism. A single header file to include and distribute
+// with your projects.
+// * Augment rather than replace the standard stream formatting mechanism
+// * C++98 support, with optional C++11 niceties
+//
+//
+// Main interface example usage
+// ----------------------------
+//
+// To print a date to std::cout:
+//
+// std::string weekday = "Wednesday";
+// const char* month = "July";
+// size_t day = 27;
+// long hour = 14;
+// int min = 44;
+//
+// tfm::printf("%s, %s %d, %.2d:%.2d\n", weekday, month, day, hour, min);
+//
+// The strange types here emphasize the type safety of the interface; it is
+// possible to print a std::string using the "%s" conversion, and a
+// size_t using the "%d" conversion. A similar result could be achieved
+// using either of the tfm::format() functions. One prints on a user provided
+// stream:
+//
+// tfm::format(std::cerr, "%s, %s %d, %.2d:%.2d\n",
+// weekday, month, day, hour, min);
+//
+// The other returns a std::string:
+//
+// std::string date = tfm::format("%s, %s %d, %.2d:%.2d\n",
+// weekday, month, day, hour, min);
+// std::cout << date;
+//
+// These are the three primary interface functions.
+//
+//
+// User defined format functions
+// -----------------------------
+//
+// Simulating variadic templates in C++98 is pretty painful since it requires
+// writing out the same function for each desired number of arguments. To make
+// this bearable tinyformat comes with a set of macros which are used
+// internally to generate the API, but which may also be used in user code.
+//
+// The three macros TINYFORMAT_ARGTYPES(n), TINYFORMAT_VARARGS(n) and
+// TINYFORMAT_PASSARGS(n) will generate a list of n argument types,
+// type/name pairs and argument names respectively when called with an integer
+// n between 1 and 16. We can use these to define a macro which generates the
+// desired user defined function with n arguments. To generate all 16 user
+// defined function bodies, use the macro TINYFORMAT_FOREACH_ARGNUM. For an
+// example, see the implementation of printf() at the end of the source file.
+//
+//
+// Additional API information
+// --------------------------
+//
+// Error handling: Define TINYFORMAT_ERROR to customize the error handling for
+// format strings which are unsupported or have the wrong number of format
+// specifiers (calls assert() by default).
+//
+// User defined types: Uses operator<< for user defined types by default.
+// Overload formatValue() for more control.
+
+
+#ifndef TINYFORMAT_H_INCLUDED
+#define TINYFORMAT_H_INCLUDED
+
+namespace tinyformat {}
+//------------------------------------------------------------------------------
+// Config section. Customize to your liking!
+
+// Namespace alias to encourage brevity
+namespace tfm = tinyformat;
+
+// Error handling; calls assert() by default.
+// #define TINYFORMAT_ERROR(reasonString) your_error_handler(reasonString)
+
+// Define for C++11 variadic templates which make the code shorter & more
+// general. If you don't define this, C++11 support is autodetected below.
+// #define TINYFORMAT_USE_VARIADIC_TEMPLATES
+
+
+//------------------------------------------------------------------------------
+// Implementation details.
+#include <cassert>
+#include <iostream>
+#include <sstream>
+
+#ifndef TINYFORMAT_ERROR
+# define TINYFORMAT_ERROR(reason) assert(0 && reason)
+#endif
+
+#if !defined(TINYFORMAT_USE_VARIADIC_TEMPLATES) && !defined(TINYFORMAT_NO_VARIADIC_TEMPLATES)
+# ifdef __GXX_EXPERIMENTAL_CXX0X__
+# define TINYFORMAT_USE_VARIADIC_TEMPLATES
+# endif
+#endif
+
+#ifdef __GNUC__
+# define TINYFORMAT_NOINLINE __attribute__((noinline))
+#elif defined(_MSC_VER)
+# define TINYFORMAT_NOINLINE __declspec(noinline)
+#else
+# define TINYFORMAT_NOINLINE
+#endif
+
+#if defined(__GLIBCXX__) && __GLIBCXX__ < 20080201
+// std::showpos is broken on old libstdc++ as provided with OSX. See
+// http://gcc.gnu.org/ml/libstdc++/2007-11/msg00075.html
+# define TINYFORMAT_OLD_LIBSTDCPLUSPLUS_WORKAROUND
+#endif
+
+namespace tinyformat {
+
+//------------------------------------------------------------------------------
+namespace detail {
+
+// Test whether type T1 is convertible to type T2
+template <typename T1, typename T2>
+struct is_convertible
+{
+ private:
+ // two types of different size
+ struct fail { char dummy[2]; };
+ struct succeed { char dummy; };
+ // Try to convert a T1 to a T2 by plugging into tryConvert
+ static fail tryConvert(...);
+ static succeed tryConvert(const T2&);
+ static const T1& makeT1();
+ public:
+# ifdef _MSC_VER
+ // Disable spurious loss of precision warnings in tryConvert(makeT1())
+# pragma warning(push)
+# pragma warning(disable:4244)
+# pragma warning(disable:4267)
+# endif
+ // Standard trick: the (...) version of tryConvert will be chosen from
+ // the overload set only if the version taking a T2 doesn't match.
+ // Then we compare the sizes of the return types to check which
+ // function matched. Very neat, in a disgusting kind of way :)
+ static const bool value =
+ sizeof(tryConvert(makeT1())) == sizeof(succeed);
+# ifdef _MSC_VER
+# pragma warning(pop)
+# endif
+};
+
+
+// Detect when a type is not a wchar_t string
+template<typename T> struct is_wchar { typedef int tinyformat_wchar_is_not_supported; };
+template<> struct is_wchar<wchar_t*> {};
+template<> struct is_wchar<const wchar_t*> {};
+template<int n> struct is_wchar<const wchar_t[n]> {};
+template<int n> struct is_wchar<wchar_t[n]> {};
+
+
+// Format the value by casting to type fmtT. This default implementation
+// should never be called.
+template<typename T, typename fmtT, bool convertible = is_convertible<T, fmtT>::value>
+struct formatValueAsType
+{
+ static void invoke(std::ostream& /*out*/, const T& /*value*/) { assert(0); }
+};
+// Specialized version for types that can actually be converted to fmtT, as
+// indicated by the "convertible" template parameter.
+template<typename T, typename fmtT>
+struct formatValueAsType<T,fmtT,true>
+{
+ static void invoke(std::ostream& out, const T& value)
+ { out << static_cast<fmtT>(value); }
+};
+
+#ifdef TINYFORMAT_OLD_LIBSTDCPLUSPLUS_WORKAROUND
+template<typename T, bool convertible = is_convertible<T, int>::value>
+struct formatZeroIntegerWorkaround
+{
+ static bool invoke(std::ostream& /**/, const T& /**/) { return false; }
+};
+template<typename T>
+struct formatZeroIntegerWorkaround<T,true>
+{
+ static bool invoke(std::ostream& out, const T& value)
+ {
+ if (static_cast<int>(value) == 0 && out.flags() & std::ios::showpos)
+ {
+ out << "+0";
+ return true;
+ }
+ return false;
+ }
+};
+#endif // TINYFORMAT_OLD_LIBSTDCPLUSPLUS_WORKAROUND
+
+// Convert an arbitrary type to integer. The version with convertible=false
+// throws an error.
+template<typename T, bool convertible = is_convertible<T,int>::value>
+struct convertToInt
+{
+ static int invoke(const T& /*value*/)
+ {
+ TINYFORMAT_ERROR("tinyformat: Cannot convert from argument type to "
+ "integer for use as variable width or precision");
+ return 0;
+ }
+};
+// Specialization for convertToInt when conversion is possible
+template<typename T>
+struct convertToInt<T,true>
+{
+ static int invoke(const T& value) { return static_cast<int>(value); }
+};
+
+} // namespace detail
+
+
+//------------------------------------------------------------------------------
+// Variable formatting functions. May be overridden for user-defined types if
+// desired.
+
+
+// Format a value into a stream. Called from format() for all types by default.
+//
+// Users may override this for their own types. When this function is called,
+// the stream flags will have been modified according to the format string.
+// The format specification is provided in the range [fmtBegin, fmtEnd).
+//
+// By default, formatValue() uses the usual stream insertion operator
+// operator<< to format the type T, with special cases for the %c and %p
+// conversions.
+template<typename T>
+inline void formatValue(std::ostream& out, const char* /*fmtBegin*/,
+ const char* fmtEnd, const T& value)
+{
+#ifndef TINYFORMAT_ALLOW_WCHAR_STRINGS
+ // Since we don't support printing of wchar_t using "%ls", make it fail at
+ // compile time in preference to printing as a void* at runtime.
+ typedef typename detail::is_wchar<T>::tinyformat_wchar_is_not_supported DummyType;
+ (void) DummyType(); // avoid unused type warning with gcc-4.8
+#endif
+ // The mess here is to support the %c and %p conversions: if these
+ // conversions are active we try to convert the type to a char or const
+ // void* respectively and format that instead of the value itself. For the
+ // %p conversion it's important to avoid dereferencing the pointer, which
+ // could otherwise lead to a crash when printing a dangling (const char*).
+ const bool canConvertToChar = detail::is_convertible<T,char>::value;
+ const bool canConvertToVoidPtr = detail::is_convertible<T, const void*>::value;
+ if(canConvertToChar && *(fmtEnd-1) == 'c')
+ detail::formatValueAsType<T, char>::invoke(out, value);
+ else if(canConvertToVoidPtr && *(fmtEnd-1) == 'p')
+ detail::formatValueAsType<T, const void*>::invoke(out, value);
+#ifdef TINYFORMAT_OLD_LIBSTDCPLUSPLUS_WORKAROUND
+ else if(detail::formatZeroIntegerWorkaround<T>::invoke(out, value)) /**/;
+#endif
+ else
+ out << value;
+}
+
+
+// Overloaded version for char types to support printing as an integer
+#define TINYFORMAT_DEFINE_FORMATVALUE_CHAR(charType) \
+inline void formatValue(std::ostream& out, const char* /*fmtBegin*/, \
+ const char* fmtEnd, charType value) \
+{ \
+ switch(*(fmtEnd-1)) \
+ { \
+ case 'u': case 'd': case 'i': case 'o': case 'X': case 'x': \
+ out << static_cast<int>(value); break; \
+ default: \
+ out << value; break; \
+ } \
+}
+// per 3.9.1: char, signed char and unsigned char are all distinct types
+TINYFORMAT_DEFINE_FORMATVALUE_CHAR(char)
+TINYFORMAT_DEFINE_FORMATVALUE_CHAR(signed char)
+TINYFORMAT_DEFINE_FORMATVALUE_CHAR(unsigned char)
+#undef TINYFORMAT_DEFINE_FORMATVALUE_CHAR
+
+
+//------------------------------------------------------------------------------
+// Tools for emulating variadic templates in C++98. The basic idea here is
+// stolen from the boost preprocessor metaprogramming library and cut down to
+// be just general enough for what we need.
+
+#define TINYFORMAT_ARGTYPES(n) TINYFORMAT_ARGTYPES_ ## n
+#define TINYFORMAT_VARARGS(n) TINYFORMAT_VARARGS_ ## n
+#define TINYFORMAT_PASSARGS(n) TINYFORMAT_PASSARGS_ ## n
+#define TINYFORMAT_PASSARGS_TAIL(n) TINYFORMAT_PASSARGS_TAIL_ ## n
+
+// To keep it as transparent as possible, the macros below have been generated
+// using python via the excellent cog.py code generation script. This avoids
+// the need for a bunch of complex (but more general) preprocessor tricks as
+// used in boost.preprocessor.
+//
+// To rerun the code generation in place, use `cog.py -r tinyformat.h`
+// (see http://nedbatchelder.com/code/cog). Alternatively you can just create
+// extra versions by hand.
+
+/*[[[cog
+maxParams = 16
+
+def makeCommaSepLists(lineTemplate, elemTemplate, startInd=1):
+ for j in range(startInd,maxParams+1):
+ list = ', '.join([elemTemplate % {'i':i} for i in range(startInd,j+1)])
+ cog.outl(lineTemplate % {'j':j, 'list':list})
+
+makeCommaSepLists('#define TINYFORMAT_ARGTYPES_%(j)d %(list)s',
+ 'class T%(i)d')
+
+cog.outl()
+makeCommaSepLists('#define TINYFORMAT_VARARGS_%(j)d %(list)s',
+ 'const T%(i)d& v%(i)d')
+
+cog.outl()
+makeCommaSepLists('#define TINYFORMAT_PASSARGS_%(j)d %(list)s', 'v%(i)d')
+
+cog.outl()
+cog.outl('#define TINYFORMAT_PASSARGS_TAIL_1')
+makeCommaSepLists('#define TINYFORMAT_PASSARGS_TAIL_%(j)d , %(list)s',
+ 'v%(i)d', startInd = 2)
+
+cog.outl()
+cog.outl('#define TINYFORMAT_FOREACH_ARGNUM(m) \\\n ' +
+ ' '.join(['m(%d)' % (j,) for j in range(1,maxParams+1)]))
+]]]*/
+#define TINYFORMAT_ARGTYPES_1 class T1
+#define TINYFORMAT_ARGTYPES_2 class T1, class T2
+#define TINYFORMAT_ARGTYPES_3 class T1, class T2, class T3
+#define TINYFORMAT_ARGTYPES_4 class T1, class T2, class T3, class T4
+#define TINYFORMAT_ARGTYPES_5 class T1, class T2, class T3, class T4, class T5
+#define TINYFORMAT_ARGTYPES_6 class T1, class T2, class T3, class T4, class T5, class T6
+#define TINYFORMAT_ARGTYPES_7 class T1, class T2, class T3, class T4, class T5, class T6, class T7
+#define TINYFORMAT_ARGTYPES_8 class T1, class T2, class T3, class T4, class T5, class T6, class T7, class T8
+#define TINYFORMAT_ARGTYPES_9 class T1, class T2, class T3, class T4, class T5, class T6, class T7, class T8, class T9
+#define TINYFORMAT_ARGTYPES_10 class T1, class T2, class T3, class T4, class T5, class T6, class T7, class T8, class T9, class T10
+#define TINYFORMAT_ARGTYPES_11 class T1, class T2, class T3, class T4, class T5, class T6, class T7, class T8, class T9, class T10, class T11
+#define TINYFORMAT_ARGTYPES_12 class T1, class T2, class T3, class T4, class T5, class T6, class T7, class T8, class T9, class T10, class T11, class T12
+#define TINYFORMAT_ARGTYPES_13 class T1, class T2, class T3, class T4, class T5, class T6, class T7, class T8, class T9, class T10, class T11, class T12, class T13
+#define TINYFORMAT_ARGTYPES_14 class T1, class T2, class T3, class T4, class T5, class T6, class T7, class T8, class T9, class T10, class T11, class T12, class T13, class T14
+#define TINYFORMAT_ARGTYPES_15 class T1, class T2, class T3, class T4, class T5, class T6, class T7, class T8, class T9, class T10, class T11, class T12, class T13, class T14, class T15
+#define TINYFORMAT_ARGTYPES_16 class T1, class T2, class T3, class T4, class T5, class T6, class T7, class T8, class T9, class T10, class T11, class T12, class T13, class T14, class T15, class T16
+
+#define TINYFORMAT_VARARGS_1 const T1& v1
+#define TINYFORMAT_VARARGS_2 const T1& v1, const T2& v2
+#define TINYFORMAT_VARARGS_3 const T1& v1, const T2& v2, const T3& v3
+#define TINYFORMAT_VARARGS_4 const T1& v1, const T2& v2, const T3& v3, const T4& v4
+#define TINYFORMAT_VARARGS_5 const T1& v1, const T2& v2, const T3& v3, const T4& v4, const T5& v5
+#define TINYFORMAT_VARARGS_6 const T1& v1, const T2& v2, const T3& v3, const T4& v4, const T5& v5, const T6& v6
+#define TINYFORMAT_VARARGS_7 const T1& v1, const T2& v2, const T3& v3, const T4& v4, const T5& v5, const T6& v6, const T7& v7
+#define TINYFORMAT_VARARGS_8 const T1& v1, const T2& v2, const T3& v3, const T4& v4, const T5& v5, const T6& v6, const T7& v7, const T8& v8
+#define TINYFORMAT_VARARGS_9 const T1& v1, const T2& v2, const T3& v3, const T4& v4, const T5& v5, const T6& v6, const T7& v7, const T8& v8, const T9& v9
+#define TINYFORMAT_VARARGS_10 const T1& v1, const T2& v2, const T3& v3, const T4& v4, const T5& v5, const T6& v6, const T7& v7, const T8& v8, const T9& v9, const T10& v10
+#define TINYFORMAT_VARARGS_11 const T1& v1, const T2& v2, const T3& v3, const T4& v4, const T5& v5, const T6& v6, const T7& v7, const T8& v8, const T9& v9, const T10& v10, const T11& v11
+#define TINYFORMAT_VARARGS_12 const T1& v1, const T2& v2, const T3& v3, const T4& v4, const T5& v5, const T6& v6, const T7& v7, const T8& v8, const T9& v9, const T10& v10, const T11& v11, const T12& v12
+#define TINYFORMAT_VARARGS_13 const T1& v1, const T2& v2, const T3& v3, const T4& v4, const T5& v5, const T6& v6, const T7& v7, const T8& v8, const T9& v9, const T10& v10, const T11& v11, const T12& v12, const T13& v13
+#define TINYFORMAT_VARARGS_14 const T1& v1, const T2& v2, const T3& v3, const T4& v4, const T5& v5, const T6& v6, const T7& v7, const T8& v8, const T9& v9, const T10& v10, const T11& v11, const T12& v12, const T13& v13, const T14& v14
+#define TINYFORMAT_VARARGS_15 const T1& v1, const T2& v2, const T3& v3, const T4& v4, const T5& v5, const T6& v6, const T7& v7, const T8& v8, const T9& v9, const T10& v10, const T11& v11, const T12& v12, const T13& v13, const T14& v14, const T15& v15
+#define TINYFORMAT_VARARGS_16 const T1& v1, const T2& v2, const T3& v3, const T4& v4, const T5& v5, const T6& v6, const T7& v7, const T8& v8, const T9& v9, const T10& v10, const T11& v11, const T12& v12, const T13& v13, const T14& v14, const T15& v15, const T16& v16
+
+#define TINYFORMAT_PASSARGS_1 v1
+#define TINYFORMAT_PASSARGS_2 v1, v2
+#define TINYFORMAT_PASSARGS_3 v1, v2, v3
+#define TINYFORMAT_PASSARGS_4 v1, v2, v3, v4
+#define TINYFORMAT_PASSARGS_5 v1, v2, v3, v4, v5
+#define TINYFORMAT_PASSARGS_6 v1, v2, v3, v4, v5, v6
+#define TINYFORMAT_PASSARGS_7 v1, v2, v3, v4, v5, v6, v7
+#define TINYFORMAT_PASSARGS_8 v1, v2, v3, v4, v5, v6, v7, v8
+#define TINYFORMAT_PASSARGS_9 v1, v2, v3, v4, v5, v6, v7, v8, v9
+#define TINYFORMAT_PASSARGS_10 v1, v2, v3, v4, v5, v6, v7, v8, v9, v10
+#define TINYFORMAT_PASSARGS_11 v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11
+#define TINYFORMAT_PASSARGS_12 v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12
+#define TINYFORMAT_PASSARGS_13 v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13
+#define TINYFORMAT_PASSARGS_14 v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14
+#define TINYFORMAT_PASSARGS_15 v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15
+#define TINYFORMAT_PASSARGS_16 v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16
+
+#define TINYFORMAT_PASSARGS_TAIL_1
+#define TINYFORMAT_PASSARGS_TAIL_2 , v2
+#define TINYFORMAT_PASSARGS_TAIL_3 , v2, v3
+#define TINYFORMAT_PASSARGS_TAIL_4 , v2, v3, v4
+#define TINYFORMAT_PASSARGS_TAIL_5 , v2, v3, v4, v5
+#define TINYFORMAT_PASSARGS_TAIL_6 , v2, v3, v4, v5, v6
+#define TINYFORMAT_PASSARGS_TAIL_7 , v2, v3, v4, v5, v6, v7
+#define TINYFORMAT_PASSARGS_TAIL_8 , v2, v3, v4, v5, v6, v7, v8
+#define TINYFORMAT_PASSARGS_TAIL_9 , v2, v3, v4, v5, v6, v7, v8, v9
+#define TINYFORMAT_PASSARGS_TAIL_10 , v2, v3, v4, v5, v6, v7, v8, v9, v10
+#define TINYFORMAT_PASSARGS_TAIL_11 , v2, v3, v4, v5, v6, v7, v8, v9, v10, v11
+#define TINYFORMAT_PASSARGS_TAIL_12 , v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12
+#define TINYFORMAT_PASSARGS_TAIL_13 , v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13
+#define TINYFORMAT_PASSARGS_TAIL_14 , v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14
+#define TINYFORMAT_PASSARGS_TAIL_15 , v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15
+#define TINYFORMAT_PASSARGS_TAIL_16 , v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16
+
+#define TINYFORMAT_FOREACH_ARGNUM(m) \
+ m(1) m(2) m(3) m(4) m(5) m(6) m(7) m(8) m(9) m(10) m(11) m(12) m(13) m(14) m(15) m(16)
+//[[[end]]]
+
+
+
+namespace detail {
+
+// Class holding current position in format string and an output stream into
+// which arguments are formatted.
+class FormatIterator
+{
+ public:
+ // Flags for features not representable with standard stream state
+ enum ExtraFormatFlags
+ {
+ Flag_None = 0,
+ Flag_TruncateToPrecision = 1<<0, // truncate length to stream precision()
+ Flag_SpacePadPositive = 1<<1, // pad positive values with spaces
+ Flag_VariableWidth = 1<<2, // variable field width in arg list
+ Flag_VariablePrecision = 1<<3 // variable field precision in arg list
+ };
+
+ // out is the output stream, fmt is the full format string
+ FormatIterator(std::ostream& out, const char* fmt)
+ : m_out(out),
+ m_fmt(fmt),
+ m_extraFlags(Flag_None),
+ m_wantWidth(false),
+ m_wantPrecision(false),
+ m_variableWidth(0),
+ m_variablePrecision(0),
+ m_origWidth(out.width()),
+ m_origPrecision(out.precision()),
+ m_origFlags(out.flags()),
+ m_origFill(out.fill())
+ { }
+
+ // Print remaining part of format string.
+ void finish()
+ {
+ // It would be nice if we could do this from the destructor, but we
+ // can't if TINFORMAT_ERROR is used to throw an exception!
+ m_fmt = printFormatStringLiteral(m_out, m_fmt);
+ if(*m_fmt != '\0')
+ TINYFORMAT_ERROR("tinyformat: Too many conversion specifiers in format string");
+ }
+
+ ~FormatIterator()
+ {
+ // Restore stream state
+ m_out.width(m_origWidth);
+ m_out.precision(m_origPrecision);
+ m_out.flags(m_origFlags);
+ m_out.fill(m_origFill);
+ }
+
+ template<typename T>
+ void accept(const T& value);
+
+ private:
+ // Parse and return an integer from the string c, as atoi()
+ // On return, c is set to one past the end of the integer.
+ static int parseIntAndAdvance(const char*& c)
+ {
+ int i = 0;
+ for(;*c >= '0' && *c <= '9'; ++c)
+ i = 10*i + (*c - '0');
+ return i;
+ }
+
+ // Format at most truncLen characters of a C string to the given
+ // stream. Return true if formatting proceeded (generic version always
+ // returns false)
+ template<typename T>
+ static bool formatCStringTruncate(std::ostream& /*out*/, const T& /*value*/,
+ std::streamsize /*truncLen*/)
+ {
+ return false;
+ }
+# define TINYFORMAT_DEFINE_FORMAT_C_STRING_TRUNCATE(type) \
+ static bool formatCStringTruncate(std::ostream& out, type* value, \
+ std::streamsize truncLen) \
+ { \
+ std::streamsize len = 0; \
+ while(len < truncLen && value[len] != 0) \
+ ++len; \
+ out.write(value, len); \
+ return true; \
+ }
+ // Overload for const char* and char*. Could overload for signed &
+ // unsigned char too, but these are technically unneeded for printf
+ // compatibility.
+ TINYFORMAT_DEFINE_FORMAT_C_STRING_TRUNCATE(const char)
+ TINYFORMAT_DEFINE_FORMAT_C_STRING_TRUNCATE(char)
+# undef TINYFORMAT_DEFINE_FORMAT_C_STRING_TRUNCATE
+
+ // Print literal part of format string and return next format spec
+ // position.
+ //
+ // Skips over any occurrences of '%%', printing a literal '%' to the
+ // output. The position of the first % character of the next
+ // nontrivial format spec is returned, or the end of string.
+ static const char* printFormatStringLiteral(std::ostream& out,
+ const char* fmt)
+ {
+ const char* c = fmt;
+ for(; true; ++c)
+ {
+ switch(*c)
+ {
+ case '\0':
+ out.write(fmt, static_cast<std::streamsize>(c - fmt));
+ return c;
+ case '%':
+ out.write(fmt, static_cast<std::streamsize>(c - fmt));
+ if(*(c+1) != '%')
+ return c;
+ // for "%%", tack trailing % onto next literal section.
+ fmt = ++c;
+ break;
+ }
+ }
+ }
+
+ static const char* streamStateFromFormat(std::ostream& out,
+ unsigned int& extraFlags,
+ const char* fmtStart,
+ int variableWidth,
+ int variablePrecision);
+
+ // Private copy & assign: Kill gcc warnings with -Weffc++
+ FormatIterator(const FormatIterator&);
+ FormatIterator& operator=(const FormatIterator&);
+
+ // Stream, current format string & state
+ std::ostream& m_out;
+ const char* m_fmt;
+ unsigned int m_extraFlags;
+ // State machine info for handling of variable width & precision
+ bool m_wantWidth;
+ bool m_wantPrecision;
+ int m_variableWidth;
+ int m_variablePrecision;
+ // Saved stream state
+ std::streamsize m_origWidth;
+ std::streamsize m_origPrecision;
+ std::ios::fmtflags m_origFlags;
+ char m_origFill;
+};
+
+
+// Accept a value for formatting into the internal stream.
+template<typename T>
+TINYFORMAT_NOINLINE // < greatly reduces bloat in optimized builds
+void FormatIterator::accept(const T& value)
+{
+ // Parse the format string
+ const char* fmtEnd = 0;
+ if(m_extraFlags == Flag_None && !m_wantWidth && !m_wantPrecision)
+ {
+ m_fmt = printFormatStringLiteral(m_out, m_fmt);
+ fmtEnd = streamStateFromFormat(m_out, m_extraFlags, m_fmt, 0, 0);
+ m_wantWidth = (m_extraFlags & Flag_VariableWidth) != 0;
+ m_wantPrecision = (m_extraFlags & Flag_VariablePrecision) != 0;
+ }
+ // Consume value as variable width and precision specifier if necessary
+ if(m_extraFlags & (Flag_VariableWidth | Flag_VariablePrecision))
+ {
+ if(m_wantWidth || m_wantPrecision)
+ {
+ int v = convertToInt<T>::invoke(value);
+ if(m_wantWidth)
+ {
+ m_variableWidth = v;
+ m_wantWidth = false;
+ }
+ else if(m_wantPrecision)
+ {
+ m_variablePrecision = v;
+ m_wantPrecision = false;
+ }
+ return;
+ }
+ // If we get here, we've set both the variable precision and width as
+ // required and we need to rerun the stream state setup to insert these.
+ fmtEnd = streamStateFromFormat(m_out, m_extraFlags, m_fmt,
+ m_variableWidth, m_variablePrecision);
+ }
+
+ // Format the value into the stream.
+ if(!(m_extraFlags & (Flag_SpacePadPositive | Flag_TruncateToPrecision)))
+ formatValue(m_out, m_fmt, fmtEnd, value);
+ else
+ {
+ // The following are special cases where there's no direct
+ // correspondence between stream formatting and the printf() behaviour.
+ // Instead, we simulate the behaviour crudely by formatting into a
+ // temporary string stream and munging the resulting string.
+ std::ostringstream tmpStream;
+ tmpStream.copyfmt(m_out);
+ if(m_extraFlags & Flag_SpacePadPositive)
+ tmpStream.setf(std::ios::showpos);
+ // formatCStringTruncate is required for truncating conversions like
+ // "%.4s" where at most 4 characters of the c-string should be read.
+ // If we didn't include this special case, we might read off the end.
+ if(!( (m_extraFlags & Flag_TruncateToPrecision) &&
+ formatCStringTruncate(tmpStream, value, m_out.precision()) ))
+ {
+ // Not a truncated c-string; just format normally.
+ formatValue(tmpStream, m_fmt, fmtEnd, value);
+ }
+ std::string result = tmpStream.str(); // allocates... yuck.
+ if(m_extraFlags & Flag_SpacePadPositive)
+ {
+ for(size_t i = 0, iend = result.size(); i < iend; ++i)
+ if(result[i] == '+')
+ result[i] = ' ';
+ }
+ if((m_extraFlags & Flag_TruncateToPrecision) &&
+ (int)result.size() > (int)m_out.precision())
+ m_out.write(result.c_str(), m_out.precision());
+ else
+ m_out << result;
+ }
+ m_extraFlags = Flag_None;
+ m_fmt = fmtEnd;
+}
+
+
+// Parse a format string and set the stream state accordingly.
+//
+// The format mini-language recognized here is meant to be the one from C99,
+// with the form "%[flags][width][.precision][length]type".
+//
+// Formatting options which can't be natively represented using the ostream
+// state are returned in the extraFlags parameter which is a bitwise
+// combination of values from the ExtraFormatFlags enum.
+inline const char* FormatIterator::streamStateFromFormat(std::ostream& out,
+ unsigned int& extraFlags,
+ const char* fmtStart,
+ int variableWidth,
+ int variablePrecision)
+{
+ if(*fmtStart != '%')
+ {
+ TINYFORMAT_ERROR("tinyformat: Not enough conversion specifiers in format string");
+ return fmtStart;
+ }
+ // Reset stream state to defaults.
+ out.width(0);
+ out.precision(6);
+ out.fill(' ');
+ // Reset most flags; ignore irrelevant unitbuf & skipws.
+ out.unsetf(std::ios::adjustfield | std::ios::basefield |
+ std::ios::floatfield | std::ios::showbase | std::ios::boolalpha |
+ std::ios::showpoint | std::ios::showpos | std::ios::uppercase);
+ extraFlags = Flag_None;
+ bool precisionSet = false;
+ bool widthSet = false;
+ const char* c = fmtStart + 1;
+ // 1) Parse flags
+ for(;; ++c)
+ {
+ switch(*c)
+ {
+ case '#':
+ out.setf(std::ios::showpoint | std::ios::showbase);
+ continue;
+ case '0':
+ // overridden by left alignment ('-' flag)
+ if(!(out.flags() & std::ios::left))
+ {
+ // Use internal padding so that numeric values are
+ // formatted correctly, eg -00010 rather than 000-10
+ out.fill('0');
+ out.setf(std::ios::internal, std::ios::adjustfield);
+ }
+ continue;
+ case '-':
+ out.fill(' ');
+ out.setf(std::ios::left, std::ios::adjustfield);
+ continue;
+ case ' ':
+ // overridden by show positive sign, '+' flag.
+ if(!(out.flags() & std::ios::showpos))
+ extraFlags |= Flag_SpacePadPositive;
+ continue;
+ case '+':
+ out.setf(std::ios::showpos);
+ extraFlags &= ~Flag_SpacePadPositive;
+ continue;
+ }
+ break;
+ }
+ // 2) Parse width
+ if(*c >= '0' && *c <= '9')
+ {
+ widthSet = true;
+ out.width(parseIntAndAdvance(c));
+ }
+ if(*c == '*')
+ {
+ widthSet = true;
+ if(variableWidth < 0)
+ {
+ // negative widths correspond to '-' flag set
+ out.fill(' ');
+ out.setf(std::ios::left, std::ios::adjustfield);
+ variableWidth = -variableWidth;
+ }
+ out.width(variableWidth);
+ extraFlags |= Flag_VariableWidth;
+ ++c;
+ }
+ // 3) Parse precision
+ if(*c == '.')
+ {
+ ++c;
+ int precision = 0;
+ if(*c == '*')
+ {
+ ++c;
+ extraFlags |= Flag_VariablePrecision;
+ precision = variablePrecision;
+ }
+ else
+ {
+ if(*c >= '0' && *c <= '9')
+ precision = parseIntAndAdvance(c);
+ else if(*c == '-') // negative precisions ignored, treated as zero.
+ parseIntAndAdvance(++c);
+ }
+ out.precision(precision);
+ precisionSet = true;
+ }
+ // 4) Ignore any C99 length modifier
+ while(*c == 'l' || *c == 'h' || *c == 'L' ||
+ *c == 'j' || *c == 'z' || *c == 't')
+ ++c;
+ // 5) We're up to the conversion specifier character.
+ // Set stream flags based on conversion specifier (thanks to the
+ // boost::format class for forging the way here).
+ bool intConversion = false;
+ switch(*c)
+ {
+ case 'u': case 'd': case 'i':
+ out.setf(std::ios::dec, std::ios::basefield);
+ intConversion = true;
+ break;
+ case 'o':
+ out.setf(std::ios::oct, std::ios::basefield);
+ intConversion = true;
+ break;
+ case 'X':
+ out.setf(std::ios::uppercase);
+ case 'x': case 'p':
+ out.setf(std::ios::hex, std::ios::basefield);
+ intConversion = true;
+ break;
+ case 'E':
+ out.setf(std::ios::uppercase);
+ case 'e':
+ out.setf(std::ios::scientific, std::ios::floatfield);
+ out.setf(std::ios::dec, std::ios::basefield);
+ break;
+ case 'F':
+ out.setf(std::ios::uppercase);
+ case 'f':
+ out.setf(std::ios::fixed, std::ios::floatfield);
+ break;
+ case 'G':
+ out.setf(std::ios::uppercase);
+ case 'g':
+ out.setf(std::ios::dec, std::ios::basefield);
+ // As in boost::format, let stream decide float format.
+ out.flags(out.flags() & ~std::ios::floatfield);
+ break;
+ case 'a': case 'A':
+ TINYFORMAT_ERROR("tinyformat: the %a and %A conversion specs "
+ "are not supported");
+ break;
+ case 'c':
+ // Handled as special case inside formatValue()
+ break;
+ case 's':
+ if(precisionSet)
+ extraFlags |= Flag_TruncateToPrecision;
+ // Make %s print booleans as "true" and "false"
+ out.setf(std::ios::boolalpha);
+ break;
+ case 'n':
+ // Not supported - will cause problems!
+ TINYFORMAT_ERROR("tinyformat: %n conversion spec not supported");
+ break;
+ case '\0':
+ TINYFORMAT_ERROR("tinyformat: Conversion spec incorrectly "
+ "terminated by end of string");
+ return c;
+ }
+ if(intConversion && precisionSet && !widthSet)
+ {
+ // "precision" for integers gives the minimum number of digits (to be
+ // padded with zeros on the left). This isn't really supported by the
+ // iostreams, but we can approximately simulate it with the width if
+ // the width isn't otherwise used.
+ out.width(out.precision());
+ out.setf(std::ios::internal, std::ios::adjustfield);
+ out.fill('0');
+ }
+ return c+1;
+}
+
+
+
+//------------------------------------------------------------------------------
+// Private format function on top of which the public interface is implemented.
+// We enforce a mimimum of one value to be formatted to prevent bugs looking like
+//
+// const char* myStr = "100% broken";
+// printf(myStr); // Parses % as a format specifier
+#ifdef TINYFORMAT_USE_VARIADIC_TEMPLATES
+
+template<typename T1>
+void format(FormatIterator& fmtIter, const T1& value1)
+{
+ fmtIter.accept(value1);
+ fmtIter.finish();
+}
+
+// General version for C++11
+template<typename T1, typename... Args>
+void format(FormatIterator& fmtIter, const T1& value1, const Args&... args)
+{
+ fmtIter.accept(value1);
+ format(fmtIter, args...);
+}
+
+#else
+
+inline void format(FormatIterator& fmtIter)
+{
+ fmtIter.finish();
+}
+
+// General version for C++98
+#define TINYFORMAT_MAKE_FORMAT_DETAIL(n) \
+template<TINYFORMAT_ARGTYPES(n)> \
+void format(detail::FormatIterator& fmtIter, TINYFORMAT_VARARGS(n)) \
+{ \
+ fmtIter.accept(v1); \
+ format(fmtIter TINYFORMAT_PASSARGS_TAIL(n)); \
+}
+
+TINYFORMAT_FOREACH_ARGNUM(TINYFORMAT_MAKE_FORMAT_DETAIL)
+#undef TINYFORMAT_MAKE_FORMAT_DETAIL
+
+#endif // End C++98 variadic template emulation for format()
+
+} // namespace detail
+
+
+//------------------------------------------------------------------------------
+// Implement all the main interface functions here in terms of detail::format()
+
+#ifdef TINYFORMAT_USE_VARIADIC_TEMPLATES
+
+// C++11 - the simple case
+template<typename T1, typename... Args>
+void format(std::ostream& out, const char* fmt, const T1& v1, const Args&... args)
+{
+ detail::FormatIterator fmtIter(out, fmt);
+ format(fmtIter, v1, args...);
+}
+
+template<typename T1, typename... Args>
+std::string format(const char* fmt, const T1& v1, const Args&... args)
+{
+ std::ostringstream oss;
+ format(oss, fmt, v1, args...);
+ return oss.str();
+}
+
+template<typename T1, typename... Args>
+std::string format(const std::string &fmt, const T1& v1, const Args&... args)
+{
+ std::ostringstream oss;
+ format(oss, fmt.c_str(), v1, args...);
+ return oss.str();
+}
+
+template<typename T1, typename... Args>
+void printf(const char* fmt, const T1& v1, const Args&... args)
+{
+ format(std::cout, fmt, v1, args...);
+}
+
+#else
+
+// C++98 - define the interface functions using the wrapping macros
+#define TINYFORMAT_MAKE_FORMAT_FUNCS(n) \
+ \
+template<TINYFORMAT_ARGTYPES(n)> \
+void format(std::ostream& out, const char* fmt, TINYFORMAT_VARARGS(n)) \
+{ \
+ tinyformat::detail::FormatIterator fmtIter(out, fmt); \
+ tinyformat::detail::format(fmtIter, TINYFORMAT_PASSARGS(n)); \
+} \
+ \
+template<TINYFORMAT_ARGTYPES(n)> \
+std::string format(const char* fmt, TINYFORMAT_VARARGS(n)) \
+{ \
+ std::ostringstream oss; \
+ tinyformat::format(oss, fmt, TINYFORMAT_PASSARGS(n)); \
+ return oss.str(); \
+} \
+ \
+template<TINYFORMAT_ARGTYPES(n)> \
+std::string format(const std::string &fmt, TINYFORMAT_VARARGS(n)) \
+{ \
+ std::ostringstream oss; \
+ tinyformat::format(oss, fmt.c_str(), TINYFORMAT_PASSARGS(n)); \
+ return oss.str(); \
+} \
+ \
+template<TINYFORMAT_ARGTYPES(n)> \
+void printf(const char* fmt, TINYFORMAT_VARARGS(n)) \
+{ \
+ tinyformat::format(std::cout, fmt, TINYFORMAT_PASSARGS(n)); \
+}
+
+TINYFORMAT_FOREACH_ARGNUM(TINYFORMAT_MAKE_FORMAT_FUNCS)
+#undef TINYFORMAT_MAKE_FORMAT_FUNCS
+#endif
+
+
+//------------------------------------------------------------------------------
+// Define deprecated wrapping macro for backward compatibility in tinyformat
+// 1.x. Will be removed in version 2!
+#define TINYFORMAT_WRAP_FORMAT_EXTRA_ARGS
+#define TINYFORMAT_WRAP_FORMAT_N(n, returnType, funcName, funcDeclSuffix, \
+ bodyPrefix, streamName, bodySuffix) \
+template<TINYFORMAT_ARGTYPES(n)> \
+returnType funcName(TINYFORMAT_WRAP_FORMAT_EXTRA_ARGS const char* fmt, \
+ TINYFORMAT_VARARGS(n)) funcDeclSuffix \
+{ \
+ bodyPrefix \
+ tinyformat::format(streamName, fmt, TINYFORMAT_PASSARGS(n)); \
+ bodySuffix \
+} \
+
+#define TINYFORMAT_WRAP_FORMAT(returnType, funcName, funcDeclSuffix, \
+ bodyPrefix, streamName, bodySuffix) \
+inline \
+returnType funcName(TINYFORMAT_WRAP_FORMAT_EXTRA_ARGS const char* fmt \
+ ) funcDeclSuffix \
+{ \
+ bodyPrefix \
+ tinyformat::detail::FormatIterator(streamName, fmt).finish(); \
+ bodySuffix \
+} \
+TINYFORMAT_WRAP_FORMAT_N(1 , returnType, funcName, funcDeclSuffix, bodyPrefix, streamName, bodySuffix) \
+TINYFORMAT_WRAP_FORMAT_N(2 , returnType, funcName, funcDeclSuffix, bodyPrefix, streamName, bodySuffix) \
+TINYFORMAT_WRAP_FORMAT_N(3 , returnType, funcName, funcDeclSuffix, bodyPrefix, streamName, bodySuffix) \
+TINYFORMAT_WRAP_FORMAT_N(4 , returnType, funcName, funcDeclSuffix, bodyPrefix, streamName, bodySuffix) \
+TINYFORMAT_WRAP_FORMAT_N(5 , returnType, funcName, funcDeclSuffix, bodyPrefix, streamName, bodySuffix) \
+TINYFORMAT_WRAP_FORMAT_N(6 , returnType, funcName, funcDeclSuffix, bodyPrefix, streamName, bodySuffix) \
+TINYFORMAT_WRAP_FORMAT_N(7 , returnType, funcName, funcDeclSuffix, bodyPrefix, streamName, bodySuffix) \
+TINYFORMAT_WRAP_FORMAT_N(8 , returnType, funcName, funcDeclSuffix, bodyPrefix, streamName, bodySuffix) \
+TINYFORMAT_WRAP_FORMAT_N(9 , returnType, funcName, funcDeclSuffix, bodyPrefix, streamName, bodySuffix) \
+TINYFORMAT_WRAP_FORMAT_N(10, returnType, funcName, funcDeclSuffix, bodyPrefix, streamName, bodySuffix) \
+TINYFORMAT_WRAP_FORMAT_N(11, returnType, funcName, funcDeclSuffix, bodyPrefix, streamName, bodySuffix) \
+TINYFORMAT_WRAP_FORMAT_N(12, returnType, funcName, funcDeclSuffix, bodyPrefix, streamName, bodySuffix) \
+TINYFORMAT_WRAP_FORMAT_N(13, returnType, funcName, funcDeclSuffix, bodyPrefix, streamName, bodySuffix) \
+TINYFORMAT_WRAP_FORMAT_N(14, returnType, funcName, funcDeclSuffix, bodyPrefix, streamName, bodySuffix) \
+TINYFORMAT_WRAP_FORMAT_N(15, returnType, funcName, funcDeclSuffix, bodyPrefix, streamName, bodySuffix) \
+TINYFORMAT_WRAP_FORMAT_N(16, returnType, funcName, funcDeclSuffix, bodyPrefix, streamName, bodySuffix) \
+
+
+} // namespace tinyformat
+
+#endif // TINYFORMAT_H_INCLUDED
diff --git a/src/txdb.cpp b/src/txdb.cpp
index 6ed0d18785..d06639a112 100644
--- a/src/txdb.cpp
+++ b/src/txdb.cpp
@@ -1,5 +1,5 @@
// Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2013 The Bitcoin developers
+// Copyright (c) 2009-2014 The Bitcoin developers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
@@ -219,7 +219,7 @@ bool CBlockTreeDB::LoadBlockIndexGuts()
pindexNew->nTx = diskindex.nTx;
if (!pindexNew->CheckIndex())
- return error("LoadBlockIndex() : CheckIndex failed: %s", pindexNew->ToString().c_str());
+ return error("LoadBlockIndex() : CheckIndex failed: %s", pindexNew->ToString());
pcursor->Next();
} else {
diff --git a/src/txdb.h b/src/txdb.h
index 7ce6585d37..5eb5731db3 100644
--- a/src/txdb.h
+++ b/src/txdb.h
@@ -18,6 +18,13 @@ class CBigNum;
class CCoins;
class uint256;
+// -dbcache default (MiB)
+static const int64_t nDefaultDbCache = 100;
+// max. -dbcache in (MiB)
+static const int64_t nMaxDbCache = sizeof(void*) > 4 ? 4096 : 1024;
+// min. -dbcache in (MiB)
+static const int64_t nMinDbCache = 4;
+
/** CCoinsView backed by the LevelDB coin database (chainstate/) */
class CCoinsViewDB : public CCoinsView
{
diff --git a/src/util.cpp b/src/util.cpp
index 280798f2fb..8cfd1c2e03 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -1,5 +1,5 @@
// Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2013 The Bitcoin developers
+// Copyright (c) 2009-2014 The Bitcoin developers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
@@ -235,12 +235,12 @@ static void DebugPrintInit()
mutexDebugLog = new boost::mutex();
}
-int LogPrint(const char* category, const char* pszFormat, ...)
+bool LogAcceptCategory(const char* category)
{
if (category != NULL)
{
if (!fDebug)
- return 0;
+ return false;
// Give each thread quick access to -debug settings.
// This helps prevent issues debugging global destructors,
@@ -258,17 +258,18 @@ int LogPrint(const char* category, const char* pszFormat, ...)
// if not debugging everything and not debugging specific category, LogPrint does nothing.
if (setCategories.count(string("")) == 0 &&
setCategories.count(string(category)) == 0)
- return 0;
+ return false;
}
+ return true;
+}
+int LogPrintStr(const std::string &str)
+{
int ret = 0; // Returns total number of characters written
if (fPrintToConsole)
{
// print to console
- va_list arg_ptr;
- va_start(arg_ptr, pszFormat);
- ret += vprintf(pszFormat, arg_ptr);
- va_end(arg_ptr);
+ ret = fwrite(str.data(), 1, str.size(), stdout);
}
else if (fPrintToDebugLog)
{
@@ -291,76 +292,17 @@ int LogPrint(const char* category, const char* pszFormat, ...)
// Debug print useful for profiling
if (fLogTimestamps && fStartedNewLine)
ret += fprintf(fileout, "%s ", DateTimeStrFormat("%Y-%m-%d %H:%M:%S", GetTime()).c_str());
- if (pszFormat[strlen(pszFormat) - 1] == '\n')
+ if (!str.empty() && str[str.size()-1] == '\n')
fStartedNewLine = true;
else
fStartedNewLine = false;
- va_list arg_ptr;
- va_start(arg_ptr, pszFormat);
- ret += vfprintf(fileout, pszFormat, arg_ptr);
- va_end(arg_ptr);
+ ret = fwrite(str.data(), 1, str.size(), fileout);
}
return ret;
}
-string vstrprintf(const char *format, va_list ap)
-{
- char buffer[50000];
- char* p = buffer;
- int limit = sizeof(buffer);
- int ret;
- while (true)
- {
- va_list arg_ptr;
- va_copy(arg_ptr, ap);
- ret = vsnprintf(p, limit, format, arg_ptr);
- va_end(arg_ptr);
- if (ret >= 0 && ret < limit)
- break;
- if (p != buffer)
- delete[] p;
- limit *= 2;
- p = new char[limit];
- if (p == NULL)
- throw std::bad_alloc();
- }
- string str(p, p+ret);
- if (p != buffer)
- delete[] p;
- return str;
-}
-
-string real_strprintf(const char *format, int dummy, ...)
-{
- va_list arg_ptr;
- va_start(arg_ptr, dummy);
- string str = vstrprintf(format, arg_ptr);
- va_end(arg_ptr);
- return str;
-}
-
-string real_strprintf(const std::string &format, int dummy, ...)
-{
- va_list arg_ptr;
- va_start(arg_ptr, dummy);
- string str = vstrprintf(format.c_str(), arg_ptr);
- va_end(arg_ptr);
- return str;
-}
-
-bool error(const char *format, ...)
-{
- va_list arg_ptr;
- va_start(arg_ptr, format);
- std::string str = vstrprintf(format, arg_ptr);
- va_end(arg_ptr);
- LogPrintf("ERROR: %s\n", str.c_str());
- return false;
-}
-
-
void ParseString(const string& str, char c, vector<string>& v)
{
if (str.empty())
@@ -1003,13 +945,13 @@ static std::string FormatException(std::exception* pex, const char* pszThread)
void LogException(std::exception* pex, const char* pszThread)
{
std::string message = FormatException(pex, pszThread);
- LogPrintf("\n%s", message.c_str());
+ LogPrintf("\n%s", message);
}
void PrintException(std::exception* pex, const char* pszThread)
{
std::string message = FormatException(pex, pszThread);
- LogPrintf("\n\n************************\n%s\n", message.c_str());
+ LogPrintf("\n\n************************\n%s\n", message);
fprintf(stderr, "\n\n************************\n%s\n", message.c_str());
strMiscWarning = message;
throw;
@@ -1018,7 +960,7 @@ void PrintException(std::exception* pex, const char* pszThread)
void PrintExceptionContinue(std::exception* pex, const char* pszThread)
{
std::string message = FormatException(pex, pszThread);
- LogPrintf("\n\n************************\n%s\n", message.c_str());
+ LogPrintf("\n\n************************\n%s\n", message);
fprintf(stderr, "\n\n************************\n%s\n", message.c_str());
strMiscWarning = message;
}
@@ -1159,9 +1101,10 @@ bool RenameOver(boost::filesystem::path src, boost::filesystem::path dest)
void FileCommit(FILE *fileout)
{
- fflush(fileout); // harmless if redundantly called
+ fflush(fileout); // harmless if redundantly called
#ifdef WIN32
- _commit(_fileno(fileout));
+ HANDLE hFile = (HANDLE)_get_osfhandle(_fileno(fileout));
+ FlushFileBuffers(hFile);
#else
#if defined(__linux__) || defined(__NetBSD__)
fdatasync(fileno(fileout));
@@ -1363,7 +1306,7 @@ void AddTimeData(const CNetAddr& ip, int64_t nTime)
fDone = true;
string strMessage = _("Warning: Please check that your computer's date and time are correct! If your clock is wrong Bitcoin will not work properly.");
strMiscWarning = strMessage;
- LogPrintf("*** %s\n", strMessage.c_str());
+ LogPrintf("*** %s\n", strMessage);
uiInterface.ThreadSafeMessageBox(strMessage, "", CClientUIInterface::MSG_WARNING);
}
}
@@ -1466,7 +1409,7 @@ void runCommand(std::string strCommand)
{
int nErr = ::system(strCommand.c_str());
if (nErr)
- LogPrintf("runCommand error: system(%s) returned %d\n", strCommand.c_str(), nErr);
+ LogPrintf("runCommand error: system(%s) returned %d\n", strCommand, nErr);
}
void RenameThread(const char* name)
diff --git a/src/util.h b/src/util.h
index c6a1318fd7..6ef93021fd 100644
--- a/src/util.h
+++ b/src/util.h
@@ -1,5 +1,5 @@
// Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2013 The Bitcoin developers
+// Copyright (c) 2009-2014 The Bitcoin developers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
@@ -12,10 +12,10 @@
#include "compat.h"
#include "serialize.h"
+#include "tinyformat.h"
#include <cstdio>
#include <exception>
-#include <inttypes.h>
#include <map>
#include <stdarg.h>
#include <stdint.h>
@@ -44,13 +44,25 @@ static const int64_t CENT = 1000000;
#define UEND(a) ((unsigned char*)&((&(a))[1]))
#define ARRAYLEN(array) (sizeof(array)/sizeof((array)[0]))
-/* Format characters for (s)size_t and ptrdiff_t (C99 standard) */
-#define PRIszx "zx"
-#define PRIszu "zu"
-#define PRIszd "zd"
-#define PRIpdx "tx"
-#define PRIpdu "tu"
-#define PRIpdd "td"
+/* Format characters for (s)size_t, ptrdiff_t, uint64_t.
+ *
+ * As the tinyformat-based formatting system is type-safe, no special format
+ * characters are really needed to specify sizes. Tinyformat can support
+ * (ignores) the C99 prefixes such as "ll" but chokes on MSVC's inttypes
+ * defines prefixes such as "I64X". So don't include inttypes.h and define our
+ * own for compatibility.
+ * If you get a warning here about a redefine of PRI?64, make sure that
+ * inttypes.h is not included.
+ */
+#define PRIszx "x"
+#define PRIszu "u"
+#define PRIszd "d"
+#define PRIpdx "x"
+#define PRIpdu "u"
+#define PRIpdd "d"
+#define PRIx64 "x"
+#define PRIu64 "u"
+#define PRId64 "d"
// This is needed because the foreach macro can't get over the comma in pair<t1, t2>
#define PAIRTYPE(t1, t2) std::pair<t1, t2>
@@ -99,21 +111,6 @@ inline void MilliSleep(int64_t 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.
- * Parameters count from 1.
- */
-#ifdef __GNUC__
-#define ATTR_WARN_PRINTF(X,Y) __attribute__((format(gnu_printf,X,Y)))
-#else
-#define ATTR_WARN_PRINTF(X,Y)
-#endif
-
-
-
-
-
-
extern std::map<std::string, std::string> mapArgs;
@@ -130,27 +127,49 @@ extern volatile bool fReopenDebugLog;
void RandAddSeed();
void RandAddSeedPerfmon();
-// Print to debug.log if -debug=category switch is given OR category is NULL.
-int ATTR_WARN_PRINTF(2,3) LogPrint(const char* category, const char* pszFormat, ...);
+/* Return true if log accepts specified category */
+bool LogAcceptCategory(const char* category);
+/* Send a string to the log output */
+int LogPrintStr(const std::string &str);
+
+#define strprintf tfm::format
#define LogPrintf(...) LogPrint(NULL, __VA_ARGS__)
-/*
- Rationale for the real_strprintf / strprintf construction:
- It is not allowed to use va_start with a pass-by-reference argument.
- (C++ standard, 18.7, paragraph 3). Use a dummy argument to work around this, and use a
- macro to keep similar semantics.
-*/
-
-/** Overload strprintf for char*, so that GCC format type warnings can be given */
-std::string ATTR_WARN_PRINTF(1,3) real_strprintf(const char *format, int dummy, ...);
-/** Overload strprintf for std::string, to be able to use it with _ (translation).
- * This will not support GCC format type warnings (-Wformat) so be careful.
+/* When we switch to C++11, this can be switched to variadic templates instead
+ * of this macro-based construction (see tinyformat.h).
+ */
+#define MAKE_ERROR_AND_LOG_FUNC(n) \
+ /* Print to debug.log if -debug=category switch is given OR category is NULL. */ \
+ template<TINYFORMAT_ARGTYPES(n)> \
+ static inline int LogPrint(const char* category, const char* format, TINYFORMAT_VARARGS(n)) \
+ { \
+ if(!LogAcceptCategory(category)) return 0; \
+ return LogPrintStr(tfm::format(format, TINYFORMAT_PASSARGS(n))); \
+ } \
+ /* Log error and return false */ \
+ template<TINYFORMAT_ARGTYPES(n)> \
+ static inline bool error(const char* format, TINYFORMAT_VARARGS(n)) \
+ { \
+ LogPrintStr("ERROR: " + tfm::format(format, TINYFORMAT_PASSARGS(n)) + "\n"); \
+ return false; \
+ }
+
+TINYFORMAT_FOREACH_ARGNUM(MAKE_ERROR_AND_LOG_FUNC)
+
+/* Zero-arg versions of logging and error, these are not covered by
+ * TINYFORMAT_FOREACH_ARGNUM
*/
-std::string real_strprintf(const std::string &format, int dummy, ...);
-#define strprintf(format, ...) real_strprintf(format, 0, __VA_ARGS__)
-std::string vstrprintf(const char *format, va_list ap);
+static inline int LogPrint(const char* category, const char* format)
+{
+ if(!LogAcceptCategory(category)) return 0;
+ return LogPrintStr(format);
+}
+static inline bool error(const char* format)
+{
+ LogPrintStr(std::string("ERROR: ") + format + "\n");
+ return false;
+}
-bool ATTR_WARN_PRINTF(1,2) error(const char *format, ...);
void LogException(std::exception* pex, const char* pszThread);
void PrintException(std::exception* pex, const char* pszThread);
diff --git a/src/wallet.cpp b/src/wallet.cpp
index 9065ba8483..5e24738b54 100644
--- a/src/wallet.cpp
+++ b/src/wallet.cpp
@@ -1,5 +1,5 @@
// Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2013 The Bitcoin developers
+// Copyright (c) 2009-2014 The Bitcoin developers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
@@ -9,8 +9,6 @@
#include "coincontrol.h"
#include "net.h"
-#include <inttypes.h>
-
#include <boost/algorithm/string/replace.hpp>
#include <openssl/rand.h>
@@ -18,6 +16,7 @@ using namespace std;
// Settings
int64_t nTransactionFee = 0;
+bool bSpendZeroConfChange = true;
//////////////////////////////////////////////////////////////////////////////
//
@@ -191,21 +190,9 @@ void CWallet::SetBestChain(const CBlockLocator& loc)
walletdb.WriteBestBlock(loc);
}
-// This class implements an addrIncoming entry that causes pre-0.4
-// clients to crash on startup if reading a private-key-encrypted wallet.
-class CCorruptAddress
-{
-public:
- IMPLEMENT_SERIALIZE
- (
- if (nType & SER_DISK)
- READWRITE(nVersion);
- )
-};
-
bool CWallet::SetMinVersion(enum WalletFeature nVersion, CWalletDB* pwalletdbIn, bool fExplicit)
{
- AssertLockHeld(cs_wallet); // nWalletVersion
+ LOCK(cs_wallet); // nWalletVersion
if (nWalletVersion >= nVersion)
return true;
@@ -221,13 +208,6 @@ bool CWallet::SetMinVersion(enum WalletFeature nVersion, CWalletDB* pwalletdbIn,
if (fFileBacked)
{
CWalletDB* pwalletdb = pwalletdbIn ? pwalletdbIn : new CWalletDB(strWalletFile);
- if (nWalletVersion >= 40000)
- {
- // Versions prior to 0.4.0 did not support the "minversion" record.
- // Use a CCorruptAddress to make them crash instead.
- CCorruptAddress corruptAddress;
- pwalletdb->WriteSetting("addrIncoming", corruptAddress);
- }
if (nWalletVersion > 40000)
pwalletdb->WriteMinVersion(nWalletVersion);
if (!pwalletdbIn)
@@ -239,7 +219,7 @@ bool CWallet::SetMinVersion(enum WalletFeature nVersion, CWalletDB* pwalletdbIn,
bool CWallet::SetMaxVersion(int nVersion)
{
- AssertLockHeld(cs_wallet); // nWalletVersion, nWalletMaxVersion
+ LOCK(cs_wallet); // nWalletVersion, nWalletMaxVersion
// cannot downgrade below current version
if (nWalletVersion > nVersion)
return false;
@@ -249,6 +229,82 @@ bool CWallet::SetMaxVersion(int nVersion)
return true;
}
+set<uint256> CWallet::GetConflicts(const uint256& txid) const
+{
+ set<uint256> result;
+ AssertLockHeld(cs_wallet);
+
+ std::map<uint256, CWalletTx>::const_iterator it = mapWallet.find(txid);
+ if (it == mapWallet.end())
+ return result;
+ const CWalletTx& wtx = it->second;
+
+ std::pair<TxConflicts::const_iterator, TxConflicts::const_iterator> range;
+
+ BOOST_FOREACH(const CTxIn& txin, wtx.vin)
+ {
+ range = mapTxConflicts.equal_range(txin.prevout);
+ for (TxConflicts::const_iterator it = range.first; it != range.second; ++it)
+ result.insert(it->second);
+ }
+ return result;
+}
+
+void CWallet::SyncMetaData(pair<TxConflicts::iterator, TxConflicts::iterator> range)
+{
+ // We want all the wallet transactions in range to have the same metadata as
+ // the oldest (smallest nOrderPos).
+ // So: find smallest nOrderPos:
+
+ int nMinOrderPos = std::numeric_limits<int>::max();
+ const CWalletTx* copyFrom = NULL;
+ for (TxConflicts::iterator it = range.first; it != range.second; ++it)
+ {
+ const uint256& hash = it->second;
+ int n = mapWallet[hash].nOrderPos;
+ if (n < nMinOrderPos)
+ {
+ nMinOrderPos = n;
+ copyFrom = &mapWallet[hash];
+ }
+ }
+ // Now copy data from copyFrom to rest:
+ for (TxConflicts::iterator it = range.first; it != range.second; ++it)
+ {
+ const uint256& hash = it->second;
+ CWalletTx* copyTo = &mapWallet[hash];
+ if (copyFrom == copyTo) continue;
+ copyTo->mapValue = copyFrom->mapValue;
+ copyTo->vOrderForm = copyFrom->vOrderForm;
+ // fTimeReceivedIsTxTime not copied on purpose
+ // nTimeReceived not copied on purpose
+ copyTo->nTimeSmart = copyFrom->nTimeSmart;
+ copyTo->fFromMe = copyFrom->fFromMe;
+ copyTo->strFromAccount = copyFrom->strFromAccount;
+ // vfSpent not copied on purpose
+ // nOrderPos not copied on purpose
+ // cached members not copied on purpose
+ }
+}
+
+void CWallet::AddToConflicts(const uint256& wtxhash)
+{
+ assert(mapWallet.count(wtxhash));
+ CWalletTx& thisTx = mapWallet[wtxhash];
+ if (thisTx.IsCoinBase())
+ return;
+
+ BOOST_FOREACH(const CTxIn& txin, thisTx.vin)
+ {
+ mapTxConflicts.insert(make_pair(txin.prevout, wtxhash));
+
+ pair<TxConflicts::iterator, TxConflicts::iterator> range;
+ range = mapTxConflicts.equal_range(txin.prevout);
+ if (range.first != range.second)
+ SyncMetaData(range);
+ }
+}
+
bool CWallet::EncryptWallet(const SecureString& strWalletPassphrase)
{
if (IsCrypted())
@@ -381,10 +437,10 @@ void CWallet::WalletUpdateSpent(const CTransaction &tx)
{
CWalletTx& wtx = (*mi).second;
if (txin.prevout.n >= wtx.vout.size())
- LogPrintf("WalletUpdateSpent: bad wtx %s\n", wtx.GetHash().ToString().c_str());
+ LogPrintf("WalletUpdateSpent: bad wtx %s\n", wtx.GetHash().ToString());
else if (!wtx.IsSpent(txin.prevout.n) && IsMine(wtx.vout[txin.prevout.n]))
{
- LogPrintf("WalletUpdateSpent found spent coin %sbc %s\n", FormatMoney(wtx.GetCredit()).c_str(), wtx.GetHash().ToString().c_str());
+ LogPrintf("WalletUpdateSpent found spent coin %sbc %s\n", FormatMoney(wtx.GetCredit()), wtx.GetHash().ToString());
wtx.MarkSpent(txin.prevout.n);
wtx.WriteToDisk();
NotifyTransactionChanged(this, txin.prevout.hash, CT_UPDATED);
@@ -403,9 +459,16 @@ void CWallet::MarkDirty()
}
}
-bool CWallet::AddToWallet(const CWalletTx& wtxIn)
+bool CWallet::AddToWallet(const CWalletTx& wtxIn, bool fFromLoadWallet)
{
uint256 hash = wtxIn.GetHash();
+
+ if (fFromLoadWallet)
+ {
+ mapWallet[hash] = wtxIn;
+ AddToConflicts(hash);
+ }
+ else
{
LOCK(cs_wallet);
// Inserts only if not already there, returns tx inserted or tx found
@@ -460,9 +523,10 @@ bool CWallet::AddToWallet(const CWalletTx& wtxIn)
}
else
LogPrintf("AddToWallet() : found %s in block %s not in index\n",
- wtxIn.GetHash().ToString().c_str(),
- wtxIn.hashBlock.ToString().c_str());
+ wtxIn.GetHash().ToString(),
+ wtxIn.hashBlock.ToString());
}
+ AddToConflicts(hash);
}
bool fUpdated = false;
@@ -489,7 +553,7 @@ bool CWallet::AddToWallet(const CWalletTx& wtxIn)
}
//// debug print
- LogPrintf("AddToWallet %s %s%s\n", wtxIn.GetHash().ToString().c_str(), (fInsertedNew ? "new" : ""), (fUpdated ? "update" : ""));
+ LogPrintf("AddToWallet %s %s%s\n", wtxIn.GetHash().ToString(), (fInsertedNew ? "new" : ""), (fUpdated ? "update" : ""));
// Write to disk
if (fInsertedNew || fUpdated)
@@ -690,7 +754,7 @@ void CWalletTx::GetAmounts(list<pair<CTxDestination, int64_t> >& listReceived,
if (!ExtractDestination(txout.scriptPubKey, address))
{
LogPrintf("CWalletTx::GetAmounts: Unknown transaction type found, txid %s\n",
- this->GetHash().ToString().c_str());
+ this->GetHash().ToString());
address = CNoDestination();
}
@@ -883,7 +947,7 @@ void CWallet::ReacceptWalletTransactions()
}
if (fUpdated)
{
- LogPrintf("ReacceptWalletTransactions found spent coin %sbc %s\n", FormatMoney(wtx.GetCredit()).c_str(), wtx.GetHash().ToString().c_str());
+ LogPrintf("ReacceptWalletTransactions found spent coin %sbc %s\n", FormatMoney(wtx.GetCredit()), wtx.GetHash().ToString());
wtx.MarkDirty();
wtx.WriteToDisk();
}
@@ -919,12 +983,24 @@ void CWalletTx::RelayWalletTransaction()
{
if (GetDepthInMainChain() == 0) {
uint256 hash = GetHash();
- LogPrintf("Relaying wtx %s\n", hash.ToString().c_str());
+ LogPrintf("Relaying wtx %s\n", hash.ToString());
RelayTransaction((CTransaction)*this, hash);
}
}
}
+set<uint256> CWalletTx::GetConflicts() const
+{
+ set<uint256> result;
+ if (pwallet != NULL)
+ {
+ uint256 myHash = GetHash();
+ result = pwallet->GetConflicts(myHash);
+ result.erase(myHash);
+ }
+ return result;
+}
+
void CWallet::ResendWalletTransactions()
{
// Do this infrequently and randomly to avoid giving away
@@ -982,7 +1058,7 @@ int64_t CWallet::GetBalance() const
for (map<uint256, CWalletTx>::const_iterator it = mapWallet.begin(); it != mapWallet.end(); ++it)
{
const CWalletTx* pcoin = &(*it).second;
- if (pcoin->IsConfirmed())
+ if (pcoin->IsTrusted())
nTotal += pcoin->GetAvailableCredit();
}
}
@@ -998,7 +1074,7 @@ int64_t CWallet::GetUnconfirmedBalance() const
for (map<uint256, CWalletTx>::const_iterator it = mapWallet.begin(); it != mapWallet.end(); ++it)
{
const CWalletTx* pcoin = &(*it).second;
- if (!IsFinalTx(*pcoin) || !pcoin->IsConfirmed())
+ if (!IsFinalTx(*pcoin) || (!pcoin->IsTrusted() && pcoin->GetDepthInMainChain() == 0))
nTotal += pcoin->GetAvailableCredit();
}
}
@@ -1033,17 +1109,21 @@ void CWallet::AvailableCoins(vector<COutput>& vCoins, bool fOnlyConfirmed, const
if (!IsFinalTx(*pcoin))
continue;
- if (fOnlyConfirmed && !pcoin->IsConfirmed())
+ if (fOnlyConfirmed && !pcoin->IsTrusted())
continue;
if (pcoin->IsCoinBase() && pcoin->GetBlocksToMaturity() > 0)
continue;
+ int nDepth = pcoin->GetDepthInMainChain();
+ if (nDepth < 0)
+ continue;
+
for (unsigned int i = 0; i < pcoin->vout.size(); i++) {
if (!(pcoin->IsSpent(i)) && IsMine(pcoin->vout[i]) &&
!IsLockedCoin((*it).first, i) && pcoin->vout[i].nValue > 0 &&
(!coinControl || !coinControl->HasSelected() || coinControl->IsSelected((*it).first, i)))
- vCoins.push_back(COutput(pcoin, i, pcoin->GetDepthInMainChain()));
+ vCoins.push_back(COutput(pcoin, i, nDepth));
}
}
}
@@ -1186,8 +1266,8 @@ bool CWallet::SelectCoinsMinConf(int64_t nTargetValue, int nConfMine, int nConfT
LogPrint("selectcoins", "SelectCoins() best subset: ");
for (unsigned int i = 0; i < vValue.size(); i++)
if (vfBest[i])
- LogPrint("selectcoins", "%s ", FormatMoney(vValue[i].first).c_str());
- LogPrint("selectcoins", "total %s\n", FormatMoney(nBest).c_str());
+ LogPrint("selectcoins", "%s ", FormatMoney(vValue[i].first));
+ LogPrint("selectcoins", "total %s\n", FormatMoney(nBest));
}
return true;
@@ -1211,7 +1291,7 @@ bool CWallet::SelectCoins(int64_t nTargetValue, set<pair<const CWalletTx*,unsign
return (SelectCoinsMinConf(nTargetValue, 1, 6, vCoins, setCoinsRet, nValueRet) ||
SelectCoinsMinConf(nTargetValue, 1, 1, vCoins, setCoinsRet, nValueRet) ||
- SelectCoinsMinConf(nTargetValue, 0, 1, vCoins, setCoinsRet, nValueRet));
+ (bSpendZeroConfChange && SelectCoinsMinConf(nTargetValue, 0, 1, vCoins, setCoinsRet, nValueRet)));
}
@@ -1396,7 +1476,7 @@ bool CWallet::CommitTransaction(CWalletTx& wtxNew, CReserveKey& reservekey)
{
{
LOCK2(cs_main, cs_wallet);
- LogPrintf("CommitTransaction:\n%s", wtxNew.ToString().c_str());
+ LogPrintf("CommitTransaction:\n%s", wtxNew.ToString());
{
// This is only to keep the database open to defeat the auto-flush for the
// duration of this scope. This is the only place where this optimization
@@ -1451,15 +1531,15 @@ string CWallet::SendMoney(CScript scriptPubKey, int64_t nValue, CWalletTx& wtxNe
if (IsLocked())
{
string strError = _("Error: Wallet locked, unable to create transaction!");
- LogPrintf("SendMoney() : %s", strError.c_str());
+ LogPrintf("SendMoney() : %s", strError);
return strError;
}
string strError;
if (!CreateTransaction(scriptPubKey, nValue, wtxNew, reservekey, nFeeRequired, strError))
{
if (nValue + nFeeRequired > GetBalance())
- strError = strprintf(_("Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds!"), FormatMoney(nFeeRequired).c_str());
- LogPrintf("SendMoney() : %s\n", strError.c_str());
+ strError = strprintf(_("Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds!"), FormatMoney(nFeeRequired));
+ LogPrintf("SendMoney() : %s\n", strError);
return strError;
}
@@ -1515,16 +1595,43 @@ DBErrors CWallet::LoadWallet(bool& fFirstRunRet)
}
+DBErrors CWallet::ZapWalletTx()
+{
+ if (!fFileBacked)
+ return DB_LOAD_OK;
+ DBErrors nZapWalletTxRet = CWalletDB(strWalletFile,"cr+").ZapWalletTx(this);
+ if (nZapWalletTxRet == DB_NEED_REWRITE)
+ {
+ if (CDB::Rewrite(strWalletFile, "\x04pool"))
+ {
+ LOCK(cs_wallet);
+ setKeyPool.clear();
+ // Note: can't top-up keypool here, because wallet is locked.
+ // User will be prompted to unlock wallet the next operation
+ // the requires a new key.
+ }
+ }
+
+ if (nZapWalletTxRet != DB_LOAD_OK)
+ return nZapWalletTxRet;
+
+ return DB_LOAD_OK;
+}
+
+
bool CWallet::SetAddressBook(const CTxDestination& address, const string& strName, const string& strPurpose)
{
- AssertLockHeld(cs_wallet); // mapAddressBook
- std::map<CTxDestination, CAddressBookData>::iterator mi = mapAddressBook.find(address);
- mapAddressBook[address].name = strName;
- if (!strPurpose.empty()) /* update purpose only if requested */
- mapAddressBook[address].purpose = strPurpose;
+ bool fUpdated = false;
+ {
+ LOCK(cs_wallet); // mapAddressBook
+ std::map<CTxDestination, CAddressBookData>::iterator mi = mapAddressBook.find(address);
+ fUpdated = mi != mapAddressBook.end();
+ mapAddressBook[address].name = strName;
+ if (!strPurpose.empty()) /* update purpose only if requested */
+ mapAddressBook[address].purpose = strPurpose;
+ }
NotifyAddressBookChanged(this, address, strName, ::IsMine(*this, address),
- mapAddressBook[address].purpose,
- (mi == mapAddressBook.end()) ? CT_NEW : CT_UPDATED);
+ strPurpose, (fUpdated ? CT_UPDATED : CT_NEW) );
if (!fFileBacked)
return false;
if (!strPurpose.empty() && !CWalletDB(strWalletFile).WritePurpose(CBitcoinAddress(address).ToString(), strPurpose))
@@ -1534,9 +1641,23 @@ bool CWallet::SetAddressBook(const CTxDestination& address, const string& strNam
bool CWallet::DelAddressBook(const CTxDestination& address)
{
- AssertLockHeld(cs_wallet); // mapAddressBook
- mapAddressBook.erase(address);
+ {
+ LOCK(cs_wallet); // mapAddressBook
+
+ if(fFileBacked)
+ {
+ // Delete destdata tuples associated with address
+ std::string strAddress = CBitcoinAddress(address).ToString();
+ BOOST_FOREACH(const PAIRTYPE(string, string) &item, mapAddressBook[address].destdata)
+ {
+ CWalletDB(strWalletFile).EraseDestData(strAddress, item.first);
+ }
+ }
+ mapAddressBook.erase(address);
+ }
+
NotifyAddressBookChanged(this, address, "", ::IsMine(*this, address), "", CT_DELETED);
+
if (!fFileBacked)
return false;
CWalletDB(strWalletFile).ErasePurpose(CBitcoinAddress(address).ToString());
@@ -1716,7 +1837,7 @@ std::map<CTxDestination, int64_t> CWallet::GetAddressBalances()
{
CWalletTx *pcoin = &walletEntry.second;
- if (!IsFinalTx(*pcoin) || !pcoin->IsConfirmed())
+ if (!IsFinalTx(*pcoin) || !pcoin->IsTrusted())
continue;
if (pcoin->IsCoinBase() && pcoin->GetBlocksToMaturity() > 0)
@@ -2008,3 +2129,45 @@ void CWallet::GetKeyBirthTimes(std::map<CKeyID, int64_t> &mapKeyBirth) const {
for (std::map<CKeyID, CBlockIndex*>::const_iterator it = mapKeyFirstBlock.begin(); it != mapKeyFirstBlock.end(); it++)
mapKeyBirth[it->first] = it->second->nTime - 7200; // block times can be 2h off
}
+
+bool CWallet::AddDestData(const CTxDestination &dest, const std::string &key, const std::string &value)
+{
+ if (boost::get<CNoDestination>(&dest))
+ return false;
+
+ mapAddressBook[dest].destdata.insert(std::make_pair(key, value));
+ if (!fFileBacked)
+ return true;
+ return CWalletDB(strWalletFile).WriteDestData(CBitcoinAddress(dest).ToString(), key, value);
+}
+
+bool CWallet::EraseDestData(const CTxDestination &dest, const std::string &key)
+{
+ if (!mapAddressBook[dest].destdata.erase(key))
+ return false;
+ if (!fFileBacked)
+ return true;
+ return CWalletDB(strWalletFile).EraseDestData(CBitcoinAddress(dest).ToString(), key);
+}
+
+bool CWallet::LoadDestData(const CTxDestination &dest, const std::string &key, const std::string &value)
+{
+ mapAddressBook[dest].destdata.insert(std::make_pair(key, value));
+ return true;
+}
+
+bool CWallet::GetDestData(const CTxDestination &dest, const std::string &key, std::string *value) const
+{
+ std::map<CTxDestination, CAddressBookData>::const_iterator i = mapAddressBook.find(dest);
+ if(i != mapAddressBook.end())
+ {
+ CAddressBookData::StringMap::const_iterator j = i->second.destdata.find(key);
+ if(j != i->second.destdata.end())
+ {
+ if(value)
+ *value = j->second;
+ return true;
+ }
+ }
+ return false;
+}
diff --git a/src/wallet.h b/src/wallet.h
index e4452a3093..eb192f1ca6 100644
--- a/src/wallet.h
+++ b/src/wallet.h
@@ -25,6 +25,7 @@
// Settings
extern int64_t nTransactionFee;
+extern bool bSpendZeroConfChange;
class CAccountingEntry;
class CCoinControl;
@@ -83,6 +84,9 @@ public:
{
purpose = "unknown";
}
+
+ typedef std::map<std::string, std::string> StringMap;
+ StringMap destdata;
};
/** A CWallet is an extension of a keystore, which also maintains a set of transactions and balances,
@@ -104,6 +108,12 @@ private:
int64_t nNextResend;
int64_t nLastResend;
+ // Used to detect and report conflicted transactions:
+ typedef std::multimap<COutPoint, uint256> TxConflicts;
+ TxConflicts mapTxConflicts;
+ void AddToConflicts(const uint256& wtxhash);
+ void SyncMetaData(std::pair<TxConflicts::iterator, TxConflicts::iterator>);
+
public:
/// Main wallet lock.
/// This lock protects all the fields added by CWallet
@@ -147,6 +157,7 @@ public:
}
std::map<uint256, CWalletTx> mapWallet;
+
int64_t nOrderPosNext;
std::map<uint256, int> mapRequestCount;
@@ -189,6 +200,15 @@ public:
bool AddCScript(const CScript& redeemScript);
bool LoadCScript(const CScript& redeemScript) { return CCryptoKeyStore::AddCScript(redeemScript); }
+ /// Adds a destination data tuple to the store, and saves it to disk
+ bool AddDestData(const CTxDestination &dest, const std::string &key, const std::string &value);
+ /// Erases a destination data tuple in the store and on disk
+ bool EraseDestData(const CTxDestination &dest, const std::string &key);
+ /// Adds a destination data tuple to the store, without saving it to disk
+ bool LoadDestData(const CTxDestination &dest, const std::string &key, const std::string &value);
+ /// Look up a destination data tuple in the store, return true if found false otherwise
+ bool GetDestData(const CTxDestination &dest, const std::string &key, std::string *value) const;
+
bool Unlock(const SecureString& strWalletPassphrase);
bool ChangeWalletPassphrase(const SecureString& strOldWalletPassphrase, const SecureString& strNewWalletPassphrase);
bool EncryptWallet(const SecureString& strWalletPassphrase);
@@ -210,7 +230,7 @@ public:
TxItems OrderedTxItems(std::list<CAccountingEntry>& acentries, std::string strAccount = "");
void MarkDirty();
- bool AddToWallet(const CWalletTx& wtxIn);
+ bool AddToWallet(const CWalletTx& wtxIn, bool fFromLoadWallet=false);
void SyncTransaction(const uint256 &hash, const CTransaction& tx, const CBlock* pblock);
bool AddToWalletIfInvolvingMe(const uint256 &hash, const CTransaction& tx, const CBlock* pblock, bool fUpdate);
void EraseFromWallet(const uint256 &hash);
@@ -310,6 +330,7 @@ public:
void SetBestChain(const CBlockLocator& loc);
DBErrors LoadWallet(bool& fFirstRunRet);
+ DBErrors ZapWalletTx();
bool SetAddressBook(const CTxDestination& address, const std::string& strName, const std::string& purpose);
@@ -342,7 +363,10 @@ public:
bool SetMaxVersion(int nVersion);
// get the current wallet format (the oldest client version guaranteed to understand this wallet)
- int GetVersion() { AssertLockHeld(cs_wallet); return nWalletVersion; }
+ int GetVersion() { LOCK(cs_wallet); return nWalletVersion; }
+
+ // Get wallet transactions that conflict with given transaction (spend same outputs)
+ std::set<uint256> GetConflicts(const uint256& txid) const;
/** Address book entry changed.
* @note called with lock cs_wallet held.
@@ -682,14 +706,17 @@ public:
return (GetDebit() > 0);
}
- bool IsConfirmed() const
+ bool IsTrusted() const
{
// Quick answer in most cases
if (!IsFinalTx(*this))
return false;
- if (GetDepthInMainChain() >= 1)
+ int nDepth = GetDepthInMainChain();
+ if (nDepth >= 1)
return true;
- if (!IsFromMe()) // using wtx's cached debit
+ if (nDepth < 0)
+ return false;
+ if (!bSpendZeroConfChange || !IsFromMe()) // using wtx's cached debit
return false;
// If no confirmations but it's from us, we can still
@@ -704,8 +731,11 @@ public:
if (!IsFinalTx(*ptx))
return false;
- if (ptx->GetDepthInMainChain() >= 1)
+ int nPDepth = ptx->GetDepthInMainChain();
+ if (nPDepth >= 1)
continue;
+ if (nPDepth < 0)
+ return false;
if (!pwallet->IsFromMe(*ptx))
return false;
@@ -733,6 +763,8 @@ public:
void AddSupportingTransactions();
bool AcceptWalletTransaction();
void RelayWalletTransaction();
+
+ std::set<uint256> GetConflicts() const;
};
diff --git a/src/walletdb.cpp b/src/walletdb.cpp
index 9c5bddba60..b5b523740b 100644
--- a/src/walletdb.cpp
+++ b/src/walletdb.cpp
@@ -1,5 +1,5 @@
// Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2013 The Bitcoin developers
+// Copyright (c) 2009-2014 The Bitcoin developers
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
@@ -11,8 +11,6 @@
#include "sync.h"
#include "wallet.h"
-#include <inttypes.h>
-
#include <boost/filesystem.hpp>
#include <boost/foreach.hpp>
@@ -154,12 +152,6 @@ bool CWalletDB::ErasePool(int64_t nPool)
return Erase(std::make_pair(std::string("pool"), nPool));
}
-bool CWalletDB::EraseSetting(const std::string& strKey)
-{
- nWalletDBUpdated++;
- return Erase(std::make_pair(std::string("setting"), strKey));
-}
-
bool CWalletDB::WriteMinVersion(int nVersion)
{
return Write(std::string("minversion"), nVersion);
@@ -374,12 +366,12 @@ ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue,
char fUnused;
ssValue >> fTmp >> fUnused >> wtx.strFromAccount;
strErr = strprintf("LoadWallet() upgrading tx ver=%d %d '%s' %s",
- wtx.fTimeReceivedIsTxTime, fTmp, wtx.strFromAccount.c_str(), hash.ToString().c_str());
+ wtx.fTimeReceivedIsTxTime, fTmp, wtx.strFromAccount, hash.ToString());
wtx.fTimeReceivedIsTxTime = fTmp;
}
else
{
- strErr = strprintf("LoadWallet() repairing tx ver=%d %s", wtx.fTimeReceivedIsTxTime, hash.ToString().c_str());
+ strErr = strprintf("LoadWallet() repairing tx ver=%d %s", wtx.fTimeReceivedIsTxTime, hash.ToString());
wtx.fTimeReceivedIsTxTime = 0;
}
wss.vWalletUpgrade.push_back(hash);
@@ -388,14 +380,14 @@ ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue,
if (wtx.nOrderPos == -1)
wss.fAnyUnordered = true;
- pwallet->mapWallet[hash] = wtx;
+ pwallet->AddToWallet(wtx, true);
//// debug print
- //LogPrintf("LoadWallet %s\n", wtx.GetHash().ToString().c_str());
+ //LogPrintf("LoadWallet %s\n", wtx.GetHash().ToString());
//LogPrintf(" %12"PRId64" %s %s %s\n",
// wtx.vout[0].nValue,
- // DateTimeStrFormat("%Y-%m-%d %H:%M:%S", wtx.GetBlockTime()).c_str(),
- // wtx.hashBlock.ToString().c_str(),
- // wtx.mapValue["message"].c_str());
+ // DateTimeStrFormat("%Y-%m-%d %H:%M:%S", wtx.GetBlockTime()),
+ // wtx.hashBlock.ToString(),
+ // wtx.mapValue["message"]);
}
else if (strType == "acentry")
{
@@ -564,6 +556,18 @@ ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue,
{
ssValue >> pwallet->nOrderPosNext;
}
+ else if (strType == "destdata")
+ {
+ std::string strAddress, strKey, strValue;
+ ssKey >> strAddress;
+ ssKey >> strKey;
+ ssValue >> strValue;
+ if (!pwallet->LoadDestData(CBitcoinAddress(strAddress).Get(), strKey, strValue))
+ {
+ strErr = "Error reading wallet database: LoadDestData failed";
+ return false;
+ }
+ }
} catch (...)
{
return false;
@@ -634,7 +638,7 @@ DBErrors CWalletDB::LoadWallet(CWallet* pwallet)
}
}
if (!strErr.empty())
- LogPrintf("%s\n", strErr.c_str());
+ LogPrintf("%s\n", strErr);
}
pcursor->close();
}
@@ -678,6 +682,86 @@ DBErrors CWalletDB::LoadWallet(CWallet* pwallet)
return result;
}
+DBErrors CWalletDB::FindWalletTx(CWallet* pwallet, vector<uint256>& vTxHash)
+{
+ pwallet->vchDefaultKey = CPubKey();
+ CWalletScanState wss;
+ bool fNoncriticalErrors = false;
+ DBErrors result = DB_LOAD_OK;
+
+ try {
+ LOCK(pwallet->cs_wallet);
+ int nMinVersion = 0;
+ if (Read((string)"minversion", nMinVersion))
+ {
+ if (nMinVersion > CLIENT_VERSION)
+ return DB_TOO_NEW;
+ pwallet->LoadMinVersion(nMinVersion);
+ }
+
+ // Get cursor
+ Dbc* pcursor = GetCursor();
+ if (!pcursor)
+ {
+ LogPrintf("Error getting wallet database cursor\n");
+ return DB_CORRUPT;
+ }
+
+ while (true)
+ {
+ // Read next record
+ CDataStream ssKey(SER_DISK, CLIENT_VERSION);
+ CDataStream ssValue(SER_DISK, CLIENT_VERSION);
+ int ret = ReadAtCursor(pcursor, ssKey, ssValue);
+ if (ret == DB_NOTFOUND)
+ break;
+ else if (ret != 0)
+ {
+ LogPrintf("Error reading next record from wallet database\n");
+ return DB_CORRUPT;
+ }
+
+ string strType;
+ ssKey >> strType;
+ if (strType == "tx") {
+ uint256 hash;
+ ssKey >> hash;
+
+ vTxHash.push_back(hash);
+ }
+ }
+ pcursor->close();
+ }
+ catch (boost::thread_interrupted) {
+ throw;
+ }
+ catch (...) {
+ result = DB_CORRUPT;
+ }
+
+ if (fNoncriticalErrors && result == DB_LOAD_OK)
+ result = DB_NONCRITICAL_ERROR;
+
+ return result;
+}
+
+DBErrors CWalletDB::ZapWalletTx(CWallet* pwallet)
+{
+ // build list of wallet TXs
+ vector<uint256> vTxHash;
+ DBErrors err = FindWalletTx(pwallet, vTxHash);
+ if (err != DB_LOAD_OK)
+ return err;
+
+ // erase each wallet TX
+ BOOST_FOREACH (uint256& hash, vTxHash) {
+ if (!EraseTx(hash))
+ return DB_CORRUPT;
+ }
+
+ return DB_LOAD_OK;
+}
+
void ThreadFlushWalletDB(const string& strFile)
{
// Make this thread recognisable as the wallet flushing thread
@@ -767,10 +851,10 @@ bool BackupWallet(const CWallet& wallet, const string& strDest)
#else
filesystem::copy_file(pathSrc, pathDest);
#endif
- LogPrintf("copied wallet.dat to %s\n", pathDest.string().c_str());
+ LogPrintf("copied wallet.dat to %s\n", pathDest.string());
return true;
} catch(const filesystem::filesystem_error &e) {
- LogPrintf("error copying wallet.dat to %s - %s\n", pathDest.string().c_str(), e.what());
+ LogPrintf("error copying wallet.dat to %s - %s\n", pathDest.string(), e.what());
return false;
}
}
@@ -798,10 +882,10 @@ bool CWalletDB::Recover(CDBEnv& dbenv, std::string filename, bool fOnlyKeys)
int result = dbenv.dbenv.dbrename(NULL, filename.c_str(), NULL,
newFilename.c_str(), DB_AUTO_COMMIT);
if (result == 0)
- LogPrintf("Renamed %s to %s\n", filename.c_str(), newFilename.c_str());
+ LogPrintf("Renamed %s to %s\n", filename, newFilename);
else
{
- LogPrintf("Failed to rename %s to %s\n", filename.c_str(), newFilename.c_str());
+ LogPrintf("Failed to rename %s to %s\n", filename, newFilename);
return false;
}
@@ -809,7 +893,7 @@ bool CWalletDB::Recover(CDBEnv& dbenv, std::string filename, bool fOnlyKeys)
bool allOK = dbenv.Salvage(newFilename, true, salvagedData);
if (salvagedData.empty())
{
- LogPrintf("Salvage(aggressive) found no records in %s.\n", newFilename.c_str());
+ LogPrintf("Salvage(aggressive) found no records in %s.\n", newFilename);
return false;
}
LogPrintf("Salvage(aggressive) found %"PRIszu" records\n", salvagedData.size());
@@ -824,7 +908,7 @@ bool CWalletDB::Recover(CDBEnv& dbenv, std::string filename, bool fOnlyKeys)
0);
if (ret > 0)
{
- LogPrintf("Cannot create database file %s\n", filename.c_str());
+ LogPrintf("Cannot create database file %s\n", filename);
return false;
}
CWallet dummyWallet;
@@ -844,7 +928,7 @@ bool CWalletDB::Recover(CDBEnv& dbenv, std::string filename, bool fOnlyKeys)
continue;
if (!fReadOK)
{
- LogPrintf("WARNING: CWalletDB::Recover skipping %s: %s\n", strType.c_str(), strErr.c_str());
+ LogPrintf("WARNING: CWalletDB::Recover skipping %s: %s\n", strType, strErr);
continue;
}
}
@@ -865,3 +949,15 @@ bool CWalletDB::Recover(CDBEnv& dbenv, std::string filename)
{
return CWalletDB::Recover(dbenv, filename, false);
}
+
+bool CWalletDB::WriteDestData(const std::string &address, const std::string &key, const std::string &value)
+{
+ nWalletDBUpdated++;
+ return Write(boost::make_tuple(std::string("destdata"), address, key), value);
+}
+
+bool CWalletDB::EraseDestData(const std::string &address, const std::string &key)
+{
+ nWalletDBUpdated++;
+ return Erase(boost::make_tuple(string("destdata"), address, key));
+}
diff --git a/src/walletdb.h b/src/walletdb.h
index 88ba89f9d5..3bfb436050 100644
--- a/src/walletdb.h
+++ b/src/walletdb.h
@@ -104,26 +104,15 @@ public:
bool WritePool(int64_t nPool, const CKeyPool& keypool);
bool ErasePool(int64_t nPool);
- // Settings are no longer stored in wallet.dat; these are
- // used only for backwards compatibility:
- template<typename T>
- bool ReadSetting(const std::string& strKey, T& value)
- {
- return Read(std::make_pair(std::string("setting"), strKey), value);
- }
- template<typename T>
- bool WriteSetting(const std::string& strKey, const T& value)
- {
- nWalletDBUpdated++;
- return Write(std::make_pair(std::string("setting"), strKey), value);
- }
-
- bool EraseSetting(const std::string& strKey);
-
bool WriteMinVersion(int nVersion);
bool ReadAccount(const std::string& strAccount, CAccount& account);
bool WriteAccount(const std::string& strAccount, const CAccount& account);
+
+ /// Write destination data key,value tuple to database
+ bool WriteDestData(const std::string &address, const std::string &key, const std::string &value);
+ /// Erase destination data tuple from wallet database
+ bool EraseDestData(const std::string &address, const std::string &key);
private:
bool WriteAccountingEntry(const uint64_t nAccEntryNum, const CAccountingEntry& acentry);
public:
@@ -133,6 +122,8 @@ public:
DBErrors ReorderTransactions(CWallet*);
DBErrors LoadWallet(CWallet* pwallet);
+ DBErrors FindWalletTx(CWallet* pwallet, std::vector<uint256>& vTxHash);
+ DBErrors ZapWalletTx(CWallet* pwallet);
static bool Recover(CDBEnv& dbenv, std::string filename, bool fOnlyKeys);
static bool Recover(CDBEnv& dbenv, std::string filename);
};